@cloudbase/weda-ui 3.3.0 → 3.3.2

package/dist/configs/components/chart/bar.json

@@ -91,8 +91,9 @@
             },
             "dataSource": {
                 "type": "object",
-                "title": "数据源",
-                "x-index": 50,
+                "title": "数据源(废弃)",
+                "display": false,
+                "x-index": 43,
                 "x-component": "chart-datasource-select",
                 "x-props": {
                     "data-hidebind": true
@@ -137,14 +138,233 @@
                         }
                     }
                 ],
-                "remarks": "为统计卡片设置数据源，选择已经建好的 数据模型，单击数据源下拉菜单，选择统计"
+                "remarks": "已废弃数据源配置"
+            },
+            "dataSourceType": {
+                "x-index": 45,
+                "title": "数据源类型",
+                "x-category": "基础属性",
+                "type": "string",
+                "default": "data-model",
+                "enum": [
+                    {
+                        "label": "数据模型",
+                        "value": "data-model"
+                    },
+                    {
+                        "label": "自定义连接器",
+                        "value": "custom-connector"
+                    },
+                    {
+                        "label": "变量",
+                        "value": "variable"
+                    }
+                ],
+                "x-linkages": [
+                    {
+                        "_comment": "数据模型才显示的",
+                        "type": "value:state",
+                        "condition": "{{$self.value === 'data-model'}}",
+                        "target": "*(dataModel,filterData,xFieldShow,xField,xStatistics,xIsCountEmpty,yFieldSubTitle,yField,groupKey)",
+                        "state": {
+                            "display": true
+                        }
+                    },
+                    {
+                        "_comment": "数据模型不显示的",
+                        "type": "value:state",
+                        "condition": "{{$self.value === 'data-model'}}",
+                        "target": "*(connector,connectorMethod,connectorParams,datasourceVariable)",
+                        "state": {
+                            "display": false
+                        }
+                    },
+                    {
+                        "_comment": "自定义连接器才显示的",
+                        "type": "value:state",
+                        "target": "*(connector,connectorMethod,connectorParams)",
+                        "condition": "{{$self.value === 'custom-connector'}}",
+                        "state": {
+                            "display": true
+                        }
+                    },
+                    {
+                        "_comment": "自定义连接器隐藏的",
+                        "type": "value:state",
+                        "target": "*(groupKey,filterData,xFieldShow,xField,yFieldSubTitle,yField,datasourceVariable,dataModel,xStatistics)",
+                        "condition": "{{$self.value === 'custom-connector'}}",
+                        "state": {
+                            "display": false
+                        }
+                    },
+                    {
+                        "_comment": "变量时才显示",
+                        "type": "value:state",
+                        "target": "*(datasourceVariable)",
+                        "condition": "{{$self.value === 'variable'}}",
+                        "state": {
+                            "display": true
+                        }
+                    },
+                    {
+                        "_comment": "变量时不显示",
+                        "type": "value:state",
+                        "target": "*(connector,dataModel,xStatistics,groupKey,filterData,xFieldShow,xField,yFieldSubTitle,yField,connectorMethod,connectorParams)",
+                        "condition": "{{$self.value === 'variable'}}",
+                        "state": {
+                            "display": false
+                        }
+                    },
+                    {
+                        "_comment": "给 connector-selector 设value属性",
+                        "type": "value:schema",
+                        "target": "connector",
+                        "schema": {
+                            "x-component-props": "{{{value:$value}}}"
+                        }
+                    }
+                ],
+                "x-props": {
+                    "data-hidebind": true
+                },
+                "remarks": "数据源类型选择"
+            },
+            "dataModel": {
+                "x-index": 50,
+                "title": "数据模型",
+                "type": "object",
+                "x-category": "基础属性",
+                "properties": {
+                    "name": {
+                        "title": "数据模型名",
+                        "type": "string"
+                    },
+                    "extra": {
+                        "title": "数据模型属性",
+                        "type": "object",
+                        "properties": {
+                            "viewId": {
+                                "title": "数据模型视图id",
+                                "type": "string"
+                            },
+                            "methodName": {
+                                "title": "数据模型方法名",
+                                "type": "object"
+                            }
+                        }
+                    }
+                },
+                "x-component": "datasource-selector",
+                "x-component-props": {
+                    "methodName": "wedaAggregateData"
+                },
+                "x-props": {
+                    "data-hidebind": true
+                },
+                "x-linkages": [
+                    {
+                        "type": "value:visible",
+                        "target": "*(filterData)",
+                        "condition": "{{ Boolean($self.value && $self.value.extra)}}"
+                    },
+                    {
+                        "type": "value:schema",
+                        "condition": "{{ $self.value && !!$self.value.name }}",
+                        "target": "filterData",
+                        "schema": {
+                            "x-component-props": "{{{selectedDataSourceName: $self.value.name}}}"
+                        }
+                    },
+                    {
+                        "type": "value:visible",
+                        "target": "*(xFieldShow,xField,xStatistics,xIsCountEmpty,yField)",
+                        "condition": "{{ (Boolean($self.value && $self.value.extra)) }}"
+                    },
+                    {
+                        "type": "value:state",
+                        "condition": "{{ !!$self.value }}",
+                        "target": "yField",
+                        "state": {
+                            "__datasourceName": "{{$self.value.name}}"
+                        }
+                    }
+                ],
+                "remarks": "展示模型数据的数据来源"
+            },
+            "datasourceVariable": {
+                "type": "object",
+                "x-index": 53,
+                "title": "数据源变量",
+                "x-category": "基础属性",
+                "remarks": "数据源变量",
+                "display": false,
+                "x-component": "variable-expression"
+            },
+            "connector": {
+                "title": "自定义连接器",
+                "type": "object",
+                "x-component": "connector-select",
+                "x-index": 54,
+                "x-category": "基础属性",
+                "x-linkages": [
+                    {
+                        "type": "value:schema",
+                        "target": "connectorMethod",
+                        "schema": {
+                            "x-component-props": "{{{value:$value}}}"
+                        }
+                    }
+                ],
+                "remarks": "展示数据的自定义连接器来源选择",
+                "properties": {
+                    "datasource": {
+                        "type": "object",
+                        "properties": {
+                            "title": {
+                                "type": "string",
+                                "title": "连接器名"
+                            },
+                            "id": {
+                                "type": "string",
+                                "title": "ID"
+                            },
+                            "name": {
+                                "type": "string",
+                                "title": "数据源标识"
+                            }
+                        }
+                    }
+                }
+            },
+            "connectorMethod": {
+                "title": "调用方法",
+                "type": "object",
+                "x-component": "connector-method-select",
+                "x-index": 55,
+                "x-category": "基础属性",
+                "remarks": "展示数据的自定义连接器调用方法选择"
+            },
+            "connectorParams": {
+                "title": "查询入参",
+                "type": "string",
+                "x-component": "property-object-params-field",
+                "x-component-props": {
+                    "dataSourceKeyName": "connector",
+                    "dataSourceValuePath": "datasource.name",
+                    "methodNameKeyName": "connectorMethod",
+                    "methodValuePath": "name",
+                    "paramsKeyName": "connectorParams"
+                },
+                "x-index": 56,
+                "x-category": "基础属性",
+                "remarks": "对自定义连接器调用方法获取的数据进行筛选过滤。支持对象类型，例如 {name:'',value:''}"
             },
             "filterData": {
                 "title": "数据筛选",
                 "x-index": 60,
                 "x-component": "condition-select",
                 "x-component-props": {
-                    "dataSourceNamePropKey": "dataSource",
+                    "dataSourceNamePropKey": "dataModel",
                     "customRelOptions": {
                         "string": [
                             {
@@ -253,6 +473,14 @@
                 "type": "array",
                 "title": "配色",
                 "x-index": 70,
+                "default": [
+                    "#2A70E2",
+                    "#46B690",
+                    "#EDB539",
+                    "#E46961",
+                    "#4FB3D2",
+                    "#805FDC"
+                ],
                 "x-component": "color-plate",
                 "remarks": "当有多个数值字段或维度字段分组时，不同类别将按照不同配色展示，支持自定义色卡"
             },
@@ -271,9 +499,8 @@
                 "x-index": 90,
                 "x-category": "基础属性",
                 "x-component": "data-source-field-select",
-                "x-datasource-method-reset": "",
                 "x-component-props": {
-                    "dataSourceNamePropKey": "dataSource",
+                    "dataSourceNamePropKey": "dataModel",
                     "isMethod": true,
                     "disabledTypes": ["time"]
                 },
@@ -286,14 +513,6 @@
                             "enum": "{{$self.value.format ==='datetime' ? [{'label':'年','value':'y'},{'label':'月','value':'m'},{'label':'周','value':'w'},{'label':'日','value':'d'},{'label':'时','value':'h'},{'label':'分','value':'min'}] : ($self.value.format ==='date'? [{'label':'年','value':'y'},{'label':'月','value':'m'},{'label':'周','value':'w'},{'label':'日','value':'d'}] : []) }}"
                         }
                     },
-                    {
-                        "type": "value:state",
-                        "target": "xStatistics",
-                        "condition": "{{ !!$self.value }}",
-                        "state": {
-                            "value": "{{$self.value.format ==='datetime' ? 'y':$self.value.format ==='date'?'y':''}}"
-                        }
-                    },
                     {
                         "type": "value:visible",
                         "target": "*(xStatistics)",
@@ -315,7 +534,7 @@
                 "enum": []
             },
             "xIsCountEmpty": {
-                "title": "统计空值",
+                "title": "显示空值坐标",
                 "type": "boolean",
                 "default": false,
                 "x-index": 110
@@ -335,10 +554,9 @@
                 "x-component": "chart-y-field-select",
                 "x-component-props": {
                     "isMethod": true,
-                    "text": "添加字段",
-                    "dataSourceNamePropKey": "dataSource"
+                    "text": "编辑Y轴字段",
+                    "dataSourceNamePropKey": "dataModel"
                 },
-                "x-datasource-method-reset": {},
                 "x-linkages": [
                     {
                         "type": "value:visible",
@@ -354,9 +572,8 @@
                 "x-index": 130,
                 "x-category": "基础属性",
                 "x-component": "data-source-field-select",
-                "x-datasource-method-reset": "",
                 "x-component-props": {
-                    "dataSourceNamePropKey": "dataSource",
+                    "dataSourceNamePropKey": "dataModel",
                     "isMethod": true,
                     "clearable": true
                 },
@@ -414,39 +631,12 @@
                     }
                 ]
             },
-            "legend2": {
-                "title": "图例位置",
-                "type": "string",
-                "default": "bottom",
-                "x-category": "基础属性",
-                "x-index": 160,
-                "x-platforms": ["PCWEB"],
-                "enum": [
-                    {
-                        "value": "top",
-                        "label": "上方"
-                    },
-                    {
-                        "value": "bottom",
-                        "label": "下方"
-                    },
-                    {
-                        "value": "left",
-                        "label": "左侧"
-                    },
-                    {
-                        "value": "right",
-                        "label": "右侧"
-                    }
-                ]
-            },
             "legend": {
                 "title": "图例位置",
                 "type": "string",
                 "default": "bottom",
                 "x-category": "基础属性",
                 "x-index": 170,
-                "x-platforms": ["MOBILEWEB", "MP"],
                 "enum": [
                     {
                         "value": "top",
@@ -614,6 +804,9 @@
                 "title": "显示单位",
                 "type": "boolean",
                 "x-index": 350,
+                "x-props": {
+                    "data-hidebind": true
+                },
                 "default": false,
                 "x-linkages": [
                     {
@@ -628,6 +821,7 @@
                 "title": "数值量级",
                 "x-index": "360",
                 "default": 1,
+                "x-component": "select",
                 "enum": [
                     {
                         "label": "个",
@@ -666,6 +860,46 @@
                         "value": 100000000
                     }
                 ],
+                "x-component-props": {
+                    "options": [
+                        {
+                            "label": "个",
+                            "value": 1
+                        },
+                        {
+                            "label": "十",
+                            "value": 10
+                        },
+                        {
+                            "label": "百",
+                            "value": 100
+                        },
+                        {
+                            "label": "千",
+                            "value": 1000
+                        },
+                        {
+                            "label": "万",
+                            "value": 10000
+                        },
+                        {
+                            "label": "十万",
+                            "value": 100000
+                        },
+                        {
+                            "label": "百万",
+                            "value": 1000000
+                        },
+                        {
+                            "label": "千万",
+                            "value": 10000000
+                        },
+                        {
+                            "label": "亿",
+                            "value": 100000000
+                        }
+                    ]
+                },
                 "x-linkages": [
                     {
                         "type": "value:state",