@cloudbase/weda-ui 3.3.0 → 3.3.1

package/dist/src/web/components/form/form/index.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import classNames from '../../../utils/classnames';
 import { ConfigProvider, Form as TeaForm, message as TeaMessage, } from 'tea-component';
 import { usePlatform, isInIde } from '../../../utils/platform';
-import { callDataSource, callConnector, getDataSourceByName, } from '../../../utils/tcb';
+import { callDataSource, callConnector } from '../../../utils/tcb';
 import weui from '../../../utils/weui';
 import './index.css';
 const formTypeWithInitValue = ['edit', 'read'];
@@ -84,44 +84,48 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
         events,
     ]);
     React.useEffect(() => {
-        var _a, _b, _c, _d;
+        // 因编辑器render时序问题暂不上线
         // 获取字段权限
-        const authValue = {
-            isDataModel,
-            dataSourceFields: [],
-            dataSourceFieldsWidthAuthList: [],
-        };
-        const getDataSourceFieldsWithAuth = async () => {
-            var _a, _b, _c, _d;
-            try {
-                const datasource = await getDataSourceByName(dataSourceName);
-                if (!isInIde()) {
-                    // 判断是否是预览区，编辑器编辑区 dataSourceName 查询的返回一致，编辑区用的本地的数据源数据返回固定
-                    authValue.dataSourceFieldsWidthAuthList =
-                        (_a = datasource === null || datasource === void 0 ? void 0 : datasource.resourceCheckInfos) === null || _a === void 0 ? void 0 : _a.map((item) => item.ReadWrite);
-                    authValue.dataSourceFields = Object.keys(((_b = datasource === null || datasource === void 0 ? void 0 : datasource.schema) === null || _b === void 0 ? void 0 : _b.properties) || {});
-                }
-                (_c = events === null || events === void 0 ? void 0 : events.onInitDataSourceFieldsWithAuth) === null || _c === void 0 ? void 0 : _c.call(events, authValue);
-            }
-            catch (err) {
-                (_d = events === null || events === void 0 ? void 0 : events.onInitDataSourceFieldsWithAuth) === null || _d === void 0 ? void 0 : _d.call(events, authValue);
-                alertError(platform, `获取数据源字段权限信息失败,字段权限可能无法正确展示,错误信息:${err}`);
-                console.error('getDataSourceFieldsWithAuth err', err);
-            }
-        };
-        // 兼容私有环境，新接口不存在的情况，产品策略完善后移除
-        if ((window === null || window === void 0 ? void 0 : window['_isPrivate']) &&
-            !((_b = (_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.cloud) === null || _b === void 0 ? void 0 : _b.getDataSourceProfileAsync)) {
-            (_c = events === null || events === void 0 ? void 0 : events.onInitDataSourceFieldsWithAuth) === null || _c === void 0 ? void 0 : _c.call(events, { isDataModel });
-            return;
-        }
-        if (isDataModel && dataSourceName) {
-            getDataSourceFieldsWithAuth();
-        }
-        else {
-            // 在表单容器里面的表单元素 if 默认是 false，需要通过onInitDataSourceFieldsWithAuth设置为true
-            (_d = events === null || events === void 0 ? void 0 : events.onInitDataSourceFieldsWithAuth) === null || _d === void 0 ? void 0 : _d.call(events, { isDataModel });
-        }
+        // const authValue = {
+        //   isDataModel,
+        //   dataSourceFields: [],
+        //   dataSourceFieldsWidthAuthList: [],
+        // };
+        // const getDataSourceFieldsWithAuth = async () => {
+        //   try {
+        //     const datasource = await getDataSourceByName(dataSourceName);
+        //     if (!isInIde()) {
+        //       // 判断是否是预览区，编辑器编辑区 dataSourceName 查询的返回一致，编辑区用的本地的数据源数据返回固定
+        //       authValue.dataSourceFieldsWidthAuthList =
+        //         datasource?.resourceCheckInfos?.map((item) => item.ReadWrite);
+        //       authValue.dataSourceFields = Object.keys(
+        //         datasource?.schema?.properties || {}
+        //       );
+        //     }
+        //     events?.onInitDataSourceFieldsWithAuth?.(authValue);
+        //   } catch (err) {
+        //     events?.onInitDataSourceFieldsWithAuth?.(authValue);
+        //     alertError(
+        //       platform,
+        //       `获取数据源字段权限信息失败,字段权限可能无法正确展示,错误信息:${err}`
+        //     );
+        //     console.error('getDataSourceFieldsWithAuth err', err);
+        //   }
+        // };
+        // // 兼容私有环境，新接口不存在的情况，产品策略完善后移除
+        // if (
+        //   window?.['_isPrivate'] &&
+        //   !window?.app?.cloud?.getDataSourceProfileAsync
+        // ) {
+        //   events?.onInitDataSourceFieldsWithAuth?.({ isDataModel });
+        //   return;
+        // }
+        // if (isDataModel && dataSourceName) {
+        //   getDataSourceFieldsWithAuth();
+        // } else {
+        //   // 在表单容器里面的表单元素 if 默认是 false，需要通过onInitDataSourceFieldsWithAuth设置为true
+        //   events?.onInitDataSourceFieldsWithAuth?.({ isDataModel });
+        // }
     }, [formType, isDataModel, platform, dataSourceName, events]);
     // pc 渲染
     const renderPc = () => {

package/dist/src/web/components/form/userOrgSelect/departTreeSelect/departTreeSelect.h5.js

@@ -44,13 +44,15 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
             setTitleText('选择部门');
             const resData = (await request('InitRootOrgs', {})) || [];
             const data = dealOrgData(resData);
+            //初始化数据时，默认返回第一层组织结构
+            setCount(1);
             setOrgsTreeData(data);
-            setOriginalOrgData([{ index: count, treeData: data, title: '选择部门' }]);
+            setOriginalOrgData([{ index: 1, treeData: data, title: '选择部门' }]);
         }
         catch (e) {
             setErrorInfo({ errorStatus: true, errorMessage: e });
         }
-    }, [count, request]);
+    }, [request]);
     const handleFocus = (value) => {
         setIsSearch(value);
     };
@@ -100,12 +102,14 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
     const onClose = () => {
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setVisible(false);
+        setOrgsTreeData([]);
         initOrgsData();
     };
     const onConfirm = (selectItem) => {
         var _a;
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setValue(selectItem === null || selectItem === void 0 ? void 0 : selectItem.content);
+        setOrgsTreeData([]);
         onChange === null || onChange === void 0 ? void 0 : onChange(selectItem === null || selectItem === void 0 ? void 0 : selectItem.orgId);
         (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: selectItem === null || selectItem === void 0 ? void 0 : selectItem.orgId, data: selectItem });
         setVisible(false);
@@ -143,7 +147,7 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
             prevConfirmRef.current = confirmValue;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [defaultValueType, confirmValue, defaultValue, initOrgsData]);
+    }, [defaultValueType, confirmValue, defaultValue]);
     //点击部门节点，获取子部门节点
     const loadDepartData = async (node, count) => {
         try {
@@ -167,7 +171,11 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
                 const children = dealOrgData(Orgs);
                 setTitleText(node === null || node === void 0 ? void 0 : node.content);
                 setOrgsTreeData(children);
-                originalOrgData.push({ index: count + 1, treeData: children });
+                originalOrgData.push({
+                    index: count + 1,
+                    treeData: children,
+                    title: node === null || node === void 0 ? void 0 : node.content,
+                });
                 setCount(count + 1);
                 setOriginalOrgData(originalOrgData);
             }

package/dist/src/web/components/form/userOrgSelect/userTreeSelect.h5.js

@@ -79,6 +79,7 @@ focus: autoFocus = false, onChange = null, modelOpen = false, request = defaultR
         setVisible(true);
     };
     const onClose = () => {
+        setOrgsTreeData([]);
         initOrgsData();
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setVisible(false);
@@ -93,6 +94,7 @@ focus: autoFocus = false, onChange = null, modelOpen = false, request = defaultR
         (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple
             ? { value: idList, data: selectItem }
             : { value: (_c = selectItem[0]) === null || _c === void 0 ? void 0 : _c.userId, data: selectItem });
+        setOrgsTreeData([]);
         initOrgsData();
         setVisible(false);
     };
@@ -160,14 +162,16 @@ focus: autoFocus = false, onChange = null, modelOpen = false, request = defaultR
                 UserType: 'internalUser',
             });
             const data = dealOrgData(resData).concat(dealUserData(noOrgUserData === null || noOrgUserData === void 0 ? void 0 : noOrgUserData.UserList));
+            //关闭弹窗时，默认返回第一层组织结构
+            setCount(1);
             setTitleText('选择成员');
             setOrgsTreeData(destr(data));
-            setOriginalOrgData([{ index: count, treeData: data, title: '选择成员' }]);
+            setOriginalOrgData([{ index: 1, treeData: data, title: '选择成员' }]);
         }
         catch (e) {
             setErrorInfo({ errorStatus: true, errorMessage: e });
         }
-    }, [request, count]);
+    }, [request]);
     //点击部门节点，获取子部门节点
     const loadDepartData = async (node, count) => {
         setTitleText(node === null || node === void 0 ? void 0 : node.content);

package/dist/src/web/components/navigationBar/index.js

@@ -8,6 +8,7 @@ import VerticalMenu from './verticalMenu';
 import HorizontalMenu from './horizontalMenu';
 import H5Menu from './h5Menu';
 import { expandMenu, findMenuItemByPath } from './common';
+import isObjectEqual from '../../utils/isObjectEqual';
 import destr from 'destr';
 /**
  * Web端
@@ -55,6 +56,7 @@ const defaultSelectedMenu = (menu) => {
 const defaultCallApi = { getAppCustomNav };
 export default function NavigationBar({ navigationbar, contentSlot, className, style, callApi = defaultCallApi, }) {
     const platform = usePlatform();
+    const [preNavigationbar, setPreNavigationbar] = useState(navigationbar);
     const [menuData, setMenuData] = useState([]);
     const [mobileMenuData, setMobileMenuData] = useState([]);
     // 是否启用多端
@@ -86,6 +88,7 @@ export default function NavigationBar({ navigationbar, contentSlot, className, s
             var _a;
             const { Content } = res;
             const navigationData = destr(Content);
+            setPreNavigationbar(navigationData);
             if (navigationData === null || navigationData === void 0 ? void 0 : navigationData.navigationStyle) {
                 // 设置默认选中
                 let selectedKey = '';
@@ -118,14 +121,16 @@ export default function NavigationBar({ navigationbar, contentSlot, className, s
      * 每次渲染组件通过接口拉取数据
      */
     useEffect(() => {
+        // 仅执行一次
         updateNavigationData();
-    }, [updateNavigationData]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     useEffect(() => {
-        if (isInIde()) {
-            // setMenuData(navigationbar?.menuData);
-            // setNavigationStyle(navigationbar?.navigationStyle);
+        if (!isObjectEqual(navigationbar, preNavigationbar)) {
             updateNavigationData();
         }
+        // 检查navigationbar更新之后，重新渲染
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [navigationbar, updateNavigationData]);
     // 初始化css变量
     useEffect(() => {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.3.0",
-  "main": "./dist/index.js",
-  "module": "./dist/index",
+  "version": "3.3.1",
+  "main": "./dist/src/index.js",
+  "module": "./dist/src/index",
   "miniprogram": "mpdist",
   "engines": {
     "node": "^14.13.1 || >=16.0.0"

package/dist/configs/actions/showModal.json

@@ -1,48 +0,0 @@
-{
-    "$schema": "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/schema/lcds_action.json",
-    "data": {
-        "properties": {
-            "title": {
-                "title": "标题",
-                "default": "弹窗标题",
-                "type": "string"
-            },
-            "content": {
-                "title": "内容",
-                "default": "请输入弹窗内容",
-                "type": "string"
-            },
-            "showCancel": {
-                "title": "是否显示取消按钮",
-                "type": "boolean",
-                "default": true
-            },
-            "cancelText": {
-                "type": "string",
-                "title": "取消按钮的文字",
-                "description": "最多 4 个字符",
-                "default": "取消"
-            },
-            "cancelColor": {
-                "title": "取消按钮的文字颜色",
-                "type": "color",
-                "default": "#000000"
-            },
-            "confirmText": {
-                "type": "string",
-                "title": "确认按钮的文字",
-                "description": "最多 4 个字符",
-                "default": "确认"
-            },
-            "confirmColor": {
-                "title": "确认按钮的文字颜色",
-                "type": "color",
-                "default": "#576B95"
-            }
-        }
-    },
-    "meta": {
-        "title": "showModal",
-        "description": "showModal 弹窗"
-    }
-}

package/dist/configs/actions/showToast.json

@@ -1,41 +0,0 @@
-{
-    "$schema": "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/schema/lcds_action.json",
-    "data": {
-        "properties": {
-            "title": {
-                "title": "标题",
-                "type": "string",
-                "default": "提示的内容"
-            },
-            "icon": {
-                "title": "图标",
-                "type": "string",
-                "default": "success",
-                "x-component": "radio",
-                "enum": [
-                    {
-                        "label": "success",
-                        "value": "success"
-                    },
-                    {
-                        "label": "loading",
-                        "value": "loading"
-                    },
-                    {
-                        "label": "none",
-                        "value": "none"
-                    }
-                ]
-            },
-            "duration": {
-                "title": "提示的延迟时间",
-                "type": "number",
-                "default": 1500
-            }
-        }
-    },
-    "meta": {
-        "title": "showToast",
-        "description": "自定义提示"
-    }
-}

package/dist/configs/components/auth.json

@@ -1,16 +0,0 @@
-{
-    "$schema": "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/schema/lcds_component.json",
-    "data": {
-        "properties": {}
-    },
-    "events": [],
-    "meta": {
-        "name": "Auth",
-        "title": "登录",
-        "description": "登录组件",
-        "icon": "./auth.svg",
-        "category": "开放能力",
-        "categoryOrder": 1,
-        "componentOrder": 1
-    }
-}

package/dist/configs/components/button.json

@@ -1,239 +0,0 @@
-{
-    "$schema": "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/schema/lcds_component.json",
-    "data": {
-        "properties": {
-            "text": {
-                "title": "文字",
-                "default": "按钮",
-                "type": "string",
-                "x-category": "基础属性"
-            },
-            "size": {
-                "title": "大小",
-                "type": "string",
-                "default": "default",
-                "x-component": "radio",
-                "enum": [
-                    {
-                        "label": "中",
-                        "value": "default"
-                    },
-                    {
-                        "label": "小",
-                        "value": "mini"
-                    },
-                    {
-                        "label": "大",
-                        "value": "large"
-                    }
-                ],
-                "x-category": "基础属性"
-            },
-            "type": {
-                "title": "展示类型",
-                "type": "string",
-                "default": "primary",
-                "x-component": "radio",
-                "enum": [
-                    {
-                        "label": "default",
-                        "value": "default"
-                    },
-                    {
-                        "label": "primary",
-                        "value": "primary"
-                    },
-                    {
-                        "label": "warn",
-                        "value": "warn"
-                    }
-                ],
-                "x-category": "基础属性"
-            },
-            "loading": {
-                "title": "加载中",
-                "type": "boolean",
-                "default": false,
-                "x-category": "基础属性"
-            },
-            "disabled": {
-                "title": "禁用",
-                "type": "boolean",
-                "default": false,
-                "x-category": "基础属性"
-            },
-            "formType": {
-                "title": "表单类型",
-                "type": "string",
-                "enum": [
-                    {
-                        "label": "button",
-                        "value": "button"
-                    },
-                    {
-                        "label": "submit",
-                        "value": "submit"
-                    },
-                    {
-                        "label": "reset",
-                        "value": "reset"
-                    }
-                ],
-                "x-category": "基础属性"
-            },
-            "openType": {
-                "title": "微信开放能力",
-                "type": "string",
-                "x-linkages": [
-                    {
-                        "type": "value:visible",
-                        "target": "*(sessionFrom,sendMessageTitle,sendMessageImg,sendMessagePath,showMessageCard)",
-                        "condition": "{{ $self.value === 'contact' }}"
-                    },
-                    {
-                        "type": "value:visible",
-                        "target": "appParameter",
-                        "condition": "{{ $self.value === 'launchApp' }}"
-                    },
-                    {
-                        "type": "value:visible",
-                        "target": "categoryId",
-                        "condition": "{{ $self.value === 'getRealnameAuthInfo' }}"
-                    }
-                ],
-                "enum": [
-                    {
-                        "label": "无",
-                        "value": ""
-                    },
-                    {
-                        "label": "打开客服会话",
-                        "value": "contact"
-                    },
-                    {
-                        "label": "转发",
-                        "value": "share"
-                    },
-                    {
-                        "label": "打开App",
-                        "value": "launchApp"
-                    },
-                    {
-                        "label": "打开授权设置",
-                        "value": "openSetting"
-                    },
-                    {
-                        "label": "打开意见反馈",
-                        "value": "feedback"
-                    }
-                ],
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
-            },
-            "contentSlot": {
-                "type": "slot"
-            },
-            "categoryId": {
-                "title": "类目ID",
-                "type": "array",
-                "items": {
-                    "title": "初始值",
-                    "type": "number"
-                },
-                "maxLength": 2,
-                "minLength": 2,
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
-            },
-            "sessionFrom": {
-                "title": "会话来源",
-                "type": "string",
-                "default": "",
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
-            },
-            "sendMessageTitle": {
-                "title": "会话内消息卡片标题",
-                "type": "string",
-                "default": "",
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
-            },
-            "sendMessagePath": {
-                "title": "会话内消息卡片点击跳转小程序路径",
-                "type": "string",
-                "default": "",
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
-            },
-            "sendMessageImg": {
-                "title": "会话内消息卡片图片",
-                "type": "string",
-                "x-component": "image",
-                "x-rules": [
-                    {
-                        "message": "请输入合法的图片地址",
-                        "pattern": "^(((https?)://)|/resources/)[^\\s]+$"
-                    }
-                ],
-                "default": "",
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
-            },
-            "showMessageCard": {
-                "title": "是否显示会话内消息卡片",
-                "type": "boolean",
-                "default": false,
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
-            },
-            "appParameter": {
-                "title": "打开APP时,向APP传递的参数",
-                "default": "",
-                "type": "string",
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
-            }
-        }
-    },
-    "events": [
-        {
-            "title": "点击",
-            "name": "tap"
-        },
-        {
-            "title": "获取手机号",
-            "name": "getPhoneNumber",
-            "x-platforms": ["MP"]
-        },
-        {
-            "title": "打开客服会话",
-            "name": "contact",
-            "x-platforms": ["MP"]
-        },
-        {
-            "title": "获取用户信息",
-            "name": "getUserInfo",
-            "x-platforms": ["MP"]
-        },
-        {
-            "title": "打开App",
-            "name": "launchApp",
-            "x-platforms": ["MP"]
-        },
-        {
-            "title": "打开授权设置",
-            "name": "openSetting",
-            "x-platforms": ["MP"]
-        }
-    ],
-    "meta": {
-        "name": "Button",
-        "title": "按钮",
-        "description": "按钮组件",
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/Button.svg",
-        "category": "展示",
-        "categoryOrder": 1,
-        "componentOrder": 1
-    }
-}