@cloudbase/weda-ui 3.3.0 → 3.3.2

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

@@ -45,6 +45,7 @@
                 "title": "数据源",
                 "x-index": 40,
                 "x-component": "chart-datasource-select",
+                "display": false,
                 "x-props": {
                     "data-hidebind": true
                 },
@@ -80,14 +81,225 @@
                         "condition": "{{ $self.value && $self.value.type ==='database' }}"
                     }
                 ],
-                "remarks": "为统计卡片设置数据源，选择已经建好的数据模型，单击数据源下拉菜单，选择统计"
+                "remarks": "已废弃数据源配置"
+            },
+            "dataSourceType": {
+                "x-index": 42,
+                "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": 43,
+                "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)) }}"
+                    }
+                ],
+                "remarks": "展示模型数据的数据来源"
+            },
+            "datasourceVariable": {
+                "type": "object",
+                "x-index": 44,
+                "title": "数据源变量",
+                "x-category": "基础属性",
+                "remarks": "数据源变量",
+                "display": false,
+                "x-component": "variable-expression"
+            },
+            "connector": {
+                "title": "自定义连接器",
+                "type": "object",
+                "x-component": "connector-select",
+                "x-index": 45,
+                "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": 46,
+                "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": 47,
+                "x-category": "基础属性",
+                "remarks": "对自定义连接器调用方法获取的数据进行筛选过滤。支持对象类型，例如 {name:'',value:''}"
             },
             "filterData": {
                 "title": "数据筛选",
                 "x-index": 50,
                 "x-component": "condition-select",
                 "x-component-props": {
-                    "dataSourceNamePropKey": "dataSource",
+                    "dataSourceNamePropKey": "dataModel",
                     "customRelOptions": {
                         "string": [
                             {
@@ -196,6 +408,14 @@
                 "type": "array",
                 "title": "配色",
                 "x-index": 60,
+                "default": [
+                    "#2A70E2",
+                    "#46B690",
+                    "#EDB539",
+                    "#E46961",
+                    "#4FB3D2",
+                    "#805FDC"
+                ],
                 "x-component": "color-plate",
                 "remarks": "当有多个数值字段或维度字段分组时，不同类别将按照不同配色展示，支持自定义色卡"
             },
@@ -213,28 +433,19 @@
                 "x-index": 80,
                 "x-category": "基础属性",
                 "x-component": "data-source-field-select",
-                "x-datasource-method-reset": "",
                 "x-component-props": {
-                    "dataSourceNamePropKey": "dataSource",
+                    "dataSourceNamePropKey": "dataModel",
                     "isMethod": true
                 },
                 "x-linkages": [
                     {
                         "type": "value:schema",
-                        "condition": "{{ $self.inputed && !!$self.value }}",
+                        "condition": "{{ !!$self.value }}",
                         "target": "xStatistics",
                         "schema": {
                             "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.inputed && !!$self.value }}",
-                        "state": {
-                            "value": "{{$self.value.format ==='datetime' ? 'y':$self.value.format ==='date'?'y':''}}"
-                        }
-                    },
                     {
                         "type": "value:visible",
                         "target": "*(xStatistics)",
@@ -256,7 +467,7 @@
                 "enum": []
             },
             "xIsCountEmpty": {
-                "title": "统计空值",
+                "title": "显示空值坐标",
                 "type": "boolean",
                 "default": false,
                 "x-index": 100
@@ -275,8 +486,9 @@
                 "x-category": "基础属性",
                 "x-component": "chart-y-field-select",
                 "x-component-props": {
+                    "text": "编辑Y轴字段",
                     "isMethod": true,
-                    "dataSourceNamePropKey": "dataSource",
+                    "dataSourceNamePropKey": "dataModel",
                     "maxFieldCount": 1
                 },
                 "remarks": "Y轴数值字段选择"
@@ -303,39 +515,12 @@
                     }
                 ]
             },
-            "legend2": {
-                "title": "图例位置",
-                "type": "string",
-                "default": "bottom",
-                "x-category": "基础属性",
-                "x-index": 140,
-                "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": 150,
-                "x-platforms": ["MOBILEWEB", "MP"],
                 "enum": [
                     {
                         "value": "top",

package/dist/configs/components/dataView.json

@@ -139,7 +139,15 @@
                 "type": "string",
                 "x-index": 18,
                 "x-category": "基础属性",
-                "remarks": "对自定义连接器调用方法获取的数据进行筛选过滤。支持对象类型，例如 {name:'',value:''}"
+                "remarks": "对自定义连接器调用方法获取的数据进行筛选过滤。支持对象类型，例如 {name:'',value:''}",
+                "x-component": "property-object-params-field",
+                "x-component-props": {
+                    "dataSourceKeyName": "bindConnectMetadata",
+                    "dataSourceValuePath": "datasource.name",
+                    "methodNameKeyName": "connectorMethod",
+                    "methodValuePath": "name",
+                    "paramsKeyName": "connectorParams"
+                }
             },
             "where": {
                 "x-index": 20,

package/dist/configs/components/form/form.json

@@ -59,6 +59,10 @@
         {
             "name": "onInitValue",
             "title": "获取初始值"
+        },
+        {
+            "name": "onInitDataSourceFieldsWithAuth",
+            "title": "获取带有权限的数据源字段"
         }
     ],
     "meta": {

package/dist/configs/components/form/select.json

@@ -130,6 +130,24 @@
                     {
                         "label": "年",
                         "value": "year"
+                    },
+                    {
+                        "label": "年-月-日 时:分:秒",
+                        "value": "datetime"
+                    }
+                ],
+                "x-linkages": [
+                    {
+                        "type": "value:schema",
+                        "schema": {
+                            "format": "{{$value}}",
+                            "x-component": "{{$value === 'day' || $value === 'datetime' ? 'date' : $value}}",
+                            "x-component-props": {
+                                "showTime": "{{ $value === 'datetime'}}",
+                                "format": "{{ {'year': 'yyyy', 'month': 'YYYY-MM', 'day': 'YYYY-MM-DD', 'datetime': 'YYYY-MM-DD HH:mm:ss'}[$value] }}"
+                            }
+                        },
+                        "target": "*(defaultDate,startDate,endDate)"
                     }
                 ]
             },

package/dist/docs/common/tableView.js

@@ -2,9 +2,6 @@ import React from 'react';
 import { components } from '../../configs/index';
 import { objFormat } from './format';
 import './tableView.css';
-function createFragment(nodes) {
-    return React.createElement(React.Fragment, {}, ...nodes);
-}
 function getCompsMeta(key, type, origin) {
     let compsMeta;
     try {

package/dist/setupTests.d.ts

@@ -1 +1,2 @@
-export {};
+import 'regenerator-runtime';
+import '@testing-library/jest-dom';

package/dist/setupTests.js

@@ -1,4 +1,5 @@
-require('regenerator-runtime');
+import 'regenerator-runtime';
+import '@testing-library/jest-dom';
 Object.defineProperty(window, 'matchMedia', {
     writable: true,
     value: jest.fn().mockImplementation((query) => ({
@@ -12,3 +13,7 @@ Object.defineProperty(window, 'matchMedia', {
         dispatchEvent: jest.fn(),
     })),
 });
+Object.defineProperty(window, 'ResizeObserver', {
+    writable: true,
+    value: require('resize-observer-polyfill'),
+});

package/dist/web/actions/showModal/index.js

@@ -59,7 +59,6 @@ export default async function showModal({ data }) {
         success && success(res);
         return res;
     }, (e) => {
-        // console.log(e);
         fail && fail();
         complete && complete();
         throw e;

package/dist/web/components/calendar/index.js

@@ -10,7 +10,7 @@ import { emptyArray } from '../../utils/constant';
 // 抽取配置常量
 const blockName = 'weda-calendar'; // 类名前缀
 const minYear = 1970; // 最早选择年份
-const firstDayOfWeek = 1; // 日历从周一开始
+const firstDayOfWeek = 7; // 日历第一列从周日开始
 const format = 'YYYY-MM-DD';
 const controlSectionSize = 'auto'; // 操作栏控件尺寸
 const week = ['一', '二', '三', '四', '五', '六', '日']; // 表头日历星期展示方式
@@ -50,43 +50,45 @@ export default function Calendar({ className, style, initVisible, initValue, con
             });
         }
         return [yearList, monthList];
-    }, [year, month]);
-    // 匹配数据
-    const _dateList = (configList) => {
-        const _map = new Map();
-        const configArr = JSON.parse(JSON.stringify(configData));
-        // 补日期的零
-        configArr &&
-            configArr.length &&
-            configArr.map((item) => {
-                if (item.matchDate === '' || item.matchDate === undefined)
-                    return;
-                const date = item.matchDate.split('-');
-                const day = date[2].split('');
-                if (day.length === 1) {
-                    date[2] = `0${date[2]}`;
-                    item.matchDate = date.join('-');
-                }
-            });
-        for (const item of configArr) {
-            _map.set(item.matchDate, item);
-        }
-        return configList.map((item) => {
-            return item.reduce((res, i) => {
-                if (_map.has(i.formattedDate)) {
-                    const _disabled = _map.get(i.formattedDate)['disabled'];
-                    const _marked = _map.get(i.formattedDate)['marked'];
-                    i['disabled'] =
-                        _disabled !== undefined ? JSON.parse(_disabled) : false;
-                    i['marked'] = _marked;
-                }
-                res.push(i);
-                return res;
-            }, []);
-        });
-    };
+    }, [year]);
     // 日历单元格数据
-    const dateList = useMemo(() => _dateList(createDateList(year, month, firstDayOfWeek, value, format)), [year, month, firstDayOfWeek, format, value, configData]);
+    const dateList = useMemo(() => {
+        // 匹配数据
+        const _dateList = (configList) => {
+            const _map = new Map();
+            const configArr = JSON.parse(JSON.stringify(configData));
+            // 补日期的零
+            configArr &&
+                configArr.length &&
+                configArr.map((item) => {
+                    if (item.matchDate === '' || item.matchDate === undefined)
+                        return;
+                    const date = item.matchDate.split('-');
+                    const day = date[2].split('');
+                    if (day.length === 1) {
+                        date[2] = `0${date[2]}`;
+                        item.matchDate = date.join('-');
+                    }
+                });
+            for (const item of configArr) {
+                _map.set(item.matchDate, item);
+            }
+            return configList.map((item) => {
+                return item.reduce((res, i) => {
+                    if (_map.has(i.formattedDate)) {
+                        const _disabled = _map.get(i.formattedDate)['disabled'];
+                        const _marked = _map.get(i.formattedDate)['marked'];
+                        i['disabled'] =
+                            _disabled !== undefined ? JSON.parse(_disabled) : false;
+                        i['marked'] = _marked;
+                    }
+                    res.push(i);
+                    return res;
+                }, []);
+            });
+        };
+        return _dateList(createDateList(year, month, firstDayOfWeek, value, format));
+    }, [year, month, value, configData]);
     // 表头数组
     const colHeaderList = useMemo(() => {
         const weekTextArr = week;
@@ -112,7 +114,7 @@ export default function Calendar({ className, style, initVisible, initValue, con
             }
         }
         return list;
-    }, [firstDayOfWeek, isShowWeekend, week]);
+    }, []);
     // 补零
     // const fix0 = (num) => {
     //   return num < 10 ? `0${num}` : num;