fix: 网格、蜂窝图层配置

antvis · Sep 20, 2023 · 8100853 · 8100853
1 parent b9f06e4
commit 8100853
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/packages/li-core-assets/src/layers/GridLayer/register-form/coordinate-schema.ts b/packages/li-core-assets/src/layers/GridLayer/register-form/coordinate-schema.ts
@@ -98,7 +98,6 @@ export default (fieldList: FieldSelectOptionType[]) => {
             aggregateField: {
               type: 'string',
               title: '聚合字段',
-              required: true,
               'x-decorator': 'FormItem',
               'x-component': 'FieldSelect',
               'x-component-props': {
@@ -110,11 +109,11 @@ export default (fieldList: FieldSelectOptionType[]) => {
             aggregateMethod: {
               type: 'string',
               title: '聚合方法',
-              required: true,
               default: 'sum',
               'x-decorator': 'FormItem',
               'x-component': 'Select',
               'x-component-props': {
+                allowClear: true,
                 placeholder: '请选择字段',
               },
               enum: [

diff --git a/packages/li-core-assets/src/layers/HexbinLayer/register-form/coordinate-schema.ts b/packages/li-core-assets/src/layers/HexbinLayer/register-form/coordinate-schema.ts
@@ -102,7 +102,6 @@ export default (fieldList: FieldSelectOptionType[]) => {
             aggregateField: {
               type: 'string',
               title: '聚合字段',
-              required: true,
               'x-decorator': 'FormItem',
               'x-component': 'FieldSelect',
               'x-component-props': {
@@ -114,11 +113,11 @@ export default (fieldList: FieldSelectOptionType[]) => {
             aggregateMethod: {
               type: 'string',
               title: '聚合方法',
-              required: true,
               default: 'sum',
               'x-decorator': 'FormItem',
               'x-component': 'Select',
               'x-component-props': {
+                allowClear: true,
                 placeholder: '请选择字段',
               },
               enum: [

diff --git a/packages/li-p2/src/LayerAttribute/common-schema/grid-hexbin-color-collapse.ts b/packages/li-p2/src/LayerAttribute/common-schema/grid-hexbin-color-collapse.ts
@@ -32,6 +32,15 @@ export default (options: AttributeSchemaOptions) => {
               placeholder: '请选择字段',
             },
             enum: [{ value: 'count', label: 'count' }],
+            'x-reactions': [
+              {
+                dependencies: ['aggregateMethod'],
+                fulfill: {
+                  run:
+                    "$form.setFieldState('fillColorField',state=>{ state.dataSource = $form.getFieldState( 'aggregateMethod' ,state => { return [{value:'count',label:'count'},{label:state.value,value:state.value}] } ) })",
+                },
+              },
+            ],
           },
 
           fillColorScale: {