@cloudbase/weda-ui 3.4.12 → 3.4.13

package/dist/web/components/form/select/dropdown-select/index.js

@@ -5,7 +5,7 @@ import { formatNeedDataFetch, PAGE_SIZE, requestEnumOption, requestFatherRelated
 import SelectPickerPc from './pc';
 import { usePlatform } from '../../../../utils/platform';
 import { Status } from '../status';
-import { useDeepCompareEffect } from '@react-hookz/web';
+import { useDebouncedEffect, useDeepCompareEffect } from '@react-hookz/web';
 export function PureSelect({ params, selectedValue, updateValue, placeholder, size, disabled, isShow, }) {
     const isRequestingRef = useRef(false);
     const [status, setStatus] = useState(Status.ALl_EMPTY);
@@ -146,9 +146,9 @@ export function PureSelect({ params, selectedValue, updateValue, placeholder, si
             return () => clearTimeout(timer);
         }
     };
-    useEffect(() => {
+    useDebouncedEffect(() => {
         handleSearch();
-    }, [searchValue]);
+    }, [searchValue], 300);
     // 加载更多
     const loadMore = () => {
         if (!isRequestingRef.current &&

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

@@ -19,7 +19,6 @@ export const moment = (typeof _moment === 'function' ? _moment : _moment.default
 const Select = React.memo(function Select(props) {
     return (_jsx(CommonErrorBoundary, { children: _jsx(SelectImpl, { ...props }) }));
 });
-Select.whyDidYouRender = true;
 export default Select;
 function SelectImpl(props) {
     const { id, style, className, label = '标题', labelVisible = true, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, } = props;

package/dist/web/components/form/userOrgSelect/component/user-select-h5/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { UserSelectPC } from '../user-select-pc/user-select-pc';
 import { UserTreeSelectH5 as UserSelectH5 } from './user-select-h5';
 import '../userOrgSelect.css';
@@ -12,6 +12,7 @@ import { useViewData } from '../../hooks/use-views-data';
 import { useDepartData } from '../../hooks/use-depart-data';
 import { parseStrToArr } from '../../common/utils';
 import { useDeepCompareEffect } from '@react-hookz/web';
+import { getUuid } from '../../../../../utils/tool';
 export default function UserTreeSelect(props) {
     const { events = emptyObject, defaultValue = emptyArray, confirmValue = '', defaultValueType = 'noneUser', onChange = null, multiple = false, request = defaultRequest, where, confirmAction, closeAction, secondDisplay, // 辅助信息
     corpScope, // 展示企业范围
@@ -21,7 +22,9 @@ export default function UserTreeSelect(props) {
      * containerClass: string
      * triggerElement: React.ReactNode
      */
-    naked = false, containerClass = '', triggerElement = null, } = props;
+    naked = false, containerClass = '', triggerElement = null, 
+    /** 是否展示未关联部门用户 */
+    displayUncategorizedUsers = true, } = props;
     const platform = usePlatform();
     const [errInfo, setErrInfo] = useState({
         errorStatus: false,
@@ -29,6 +32,7 @@ export default function UserTreeSelect(props) {
     });
     const [open, setOpen] = useState(false);
     const [selectUserIds, setSelectUserIds] = useSyncValue(defaultValue, isObjectEqual);
+    const fetchRef = useRef({ version: '' });
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef(null);
     // 当前选中的部门id
@@ -55,6 +59,7 @@ export default function UserTreeSelect(props) {
     const { treeData, error } = useDepartData({
         request,
         params: { corpScopes },
+        displayUncategorizedUsers,
     });
     // 默认选中第一个部门
     useEffect(() => {
@@ -90,11 +95,14 @@ export default function UserTreeSelect(props) {
             setErrInfo({ errorStatus: false, errorMessage: null });
             // 避免ide mock值请求数据异常
             if (defaultValue && defaultValue.length !== 0 && !isInIde()) {
+                const fetchVersion = (fetchRef.current.version = getUuid());
                 const userSelectList = await getUserListByIds({
                     selectUserIds: filterStrList(parseStrToArr(defaultValue)) || [],
                     IsNoRelatedOrgFlag: false,
                     request,
                 });
+                if (fetchVersion !== fetchRef.current.version)
+                    return;
                 setConfirmUserList(userSelectList);
             }
             else {
@@ -107,7 +115,8 @@ export default function UserTreeSelect(props) {
     };
     useEffect(() => {
         try {
-            if (!isObjectEqual(prevDefaultRef.current, selectUserIds)) {
+            if (selectUserIds &&
+                !isObjectEqual(prevDefaultRef.current, selectUserIds)) {
                 getDefaultUser(selectUserIds);
                 prevDefaultRef.current = selectUserIds;
             }
@@ -116,10 +125,15 @@ export default function UserTreeSelect(props) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [defaultValueType, selectUserIds]);
     useDeepCompareEffect(() => {
-        var _a;
+        var _a, _b;
         setSelectedUserList(confirmUserList);
-        onChange === null || onChange === void 0 ? void 0 : onChange(setOnChangeValue(multiple, confirmUserList));
-        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, setOnChangeValue(multiple, confirmUserList, true));
+        const _value = (_a = setOnChangeValue(multiple, confirmUserList)) !== null && _a !== void 0 ? _a : null;
+        const _eventValue = setOnChangeValue(multiple, confirmUserList, true);
+        // 值和默认值相同时，不触发 change 事件
+        if (isObjectEqual(_value, defaultValue))
+            return;
+        onChange === null || onChange === void 0 ? void 0 : onChange(_value);
+        (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, _eventValue);
     }, [confirmUserList === null || confirmUserList === void 0 ? void 0 : confirmUserList.map((user) => filterUserInfo(user))]);
     /** 点击确认时获取所选用户，调用confirmAction，将所选用户向外传出 */
     const onConfirmSelectUser = (selectedUserList) => {

package/dist/web/components/form/userOrgSelect/hooks/use-depart-data.js

@@ -64,14 +64,18 @@ const isNoOrgList = {
     icon: Icon,
 };
 export const useDepartData = (props) => {
-    const { request, params } = props;
+    const { request, params, displayUncategorizedUsers } = props;
     const { data: treeData, error } = useSWR(`${DescribeOrgs}_${JSON.stringify(params)}`, async () => {
         const tempList = await DescribeOrgs(request, params);
         const orgsData = destr(tempList);
         const { res: tempTreeData, tempOrgList } = buildTreeData(orgsData);
-        //是否展示非组织节点
-        const res = await fetchUserData({ pageNo: 1, pageSize: 1 }, request);
-        const finalTempTreeData = (res === null || res === void 0 ? void 0 : res.total) > 0
+        // 是否展示非组织节点
+        let userDataTotal = 0;
+        if (displayUncategorizedUsers) {
+            const res = await fetchUserData({ pageNo: 1, pageSize: 1 }, request);
+            userDataTotal = res === null || res === void 0 ? void 0 : res.total;
+        }
+        const finalTempTreeData = userDataTotal > 0
             ? (tempTreeData || []).concat(isNoOrgList)
             : tempTreeData;
         return {

package/dist/web/components/form-input-hooks/index.js

@@ -109,8 +109,9 @@ export function useFormInputTrait(inputParams) {
             setHidden() {
                 setVisible(false);
             },
-            initialDisabled: inputParams.disabled,
-            setDisable(val) {
+            initialDisabled: statusParams.disabled,
+            initialReadOnly: statusParams.readOnly,
+            setDisabled(val) {
                 const originalValue = disabled;
                 const value = convertMethodParam(val);
                 setDisabled(value);

package/dist/web/components/form-upload-file/index.js

@@ -43,5 +43,4 @@ const FormUploadFile = React.forwardRef(function FormUploadFile(props, ref) {
     }
     return (_jsxs(FormItemWrapper, { children: [_jsx(UploaderFile, { id: id, style: style, className: className, events: events, name: name, onChange: onChange, disabled: disabled, label: label, labelVisible: labelVisible, layout: layout, requiredFlag: required && requiredFlag, acceptTypes: acceptTypes, defaultValue: value, deleteVisible: deleteVisible, downloadVisible: downloadVisible, maxSize: maxSize, maxUploadCount: maxUploadCount, single: single }), (validateState === 'error' || validateState === 'warn') && (_jsx(Tips, { tips: validateErrorMsg, type: "warn" }))] }));
 });
-FormUploadFile.whyDidYouRender = true;
 export default FormUploadFile;

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

@@ -206,7 +206,9 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
                     });
                 }
             });
-            parent === null || parent === void 0 ? void 0 : parent.setValue(formDetailItemValue);
+            if (Object.keys(parent.initialValues || {}).length == 0) {
+                parent === null || parent === void 0 ? void 0 : parent.setValue(formDetailItemValue);
+            }
             setIsInit(false);
         }
     }, [

package/dist/web/components/index.js

@@ -1,13 +1,13 @@
-import React from 'react';
-if (process.env.NODE_ENV === 'development') {
-    // eslint-disable-next-line rulesdir/no-phantom-deps, @typescript-eslint/no-var-requires
-    import('@welldone-software/why-did-you-render').then((whyDidYouRender) => {
-        whyDidYouRender.default(React, {
-            trackHooks: false,
-            trackAllPureComponents: true,
-        });
-    });
-}
+// import React from 'react';
+// if (process.env.NODE_ENV === 'development') {
+//   // eslint-disable-next-line rulesdir/no-phantom-deps, @typescript-eslint/no-var-requires
+//   import('@welldone-software/why-did-you-render').then((whyDidYouRender) => {
+//     whyDidYouRender.default(React, {
+//       trackHooks: false,
+//       trackAllPureComponents: true,
+//     });
+//   });
+// }
 import '@tcwd/style-wedatheme/index.css';
 import loadable from '@loadable/component';
 import { fallback } from '../utils/loading-fallback';

package/dist/web/components/navigationBar/common.js

@@ -6,7 +6,7 @@ const CLASS_PREFIX = 'weda-menu';
 // 标题
 export const renderTitle = (navigationStyle) => {
     const { title, titleColor, showTitle, titleFontSize } = navigationStyle;
-    return (showTitle && (_jsx("span", { "data-testid": "navigationBar-title", style: {
+    return (showTitle && (_jsx("span", { "data-testid": "navigationBar-title", className: "weda-menu__title_text", style: {
             display: 'inline-block',
             color: titleColor,
             fontSize: titleFontSize,

package/dist/web/components/navigationBar/horizontalMenu.js

@@ -64,7 +64,7 @@ const HorizontalMenu = ({ menuData, navigationStyle, selected, setSelected, navi
                     }, children: renderMenuTitle(navigationStyle, { title }, false) }, key)) : (_jsx(List.SubMenu, { className: `${CLASS_PREFIX}__dropdown-list-item`, label: renderMenuTitle(navigationStyle, { title }, false), children: renderMenuList(children, navigationStyle) }, key));
             }) }));
     };
-    return (_jsx(NavMenu, { style: menuStyle, className: `${CLASS_PREFIX}__nav`, left: _jsxs(_Fragment, { children: [_jsx(NavMenu.Item, { type: "logo", className: `${CLASS_PREFIX}__nav-logo`, children: _jsx(MenuLogo, { navigationStyle: navigationStyle, className: `${CLASS_PREFIX}__nav-logo--img` }) }), _jsx(NavMenu.Item, { className: `${CLASS_PREFIX}__nav-title`, children: _jsx("span", { className: `${CLASS_PREFIX}__title`, children: renderTitle(navigationStyle) }) })] }), right: _jsxs("div", { className: `${CLASS_PREFIX}__nav-wrap`, children: [_jsxs(_Fragment, { children: [showButton && position.index > 0 && (_jsxs("div", { className: `${CLASS_PREFIX}__nav-shadow leftButton`, onClick: () => {
+    return (_jsx(NavMenu, { style: menuStyle, className: `${CLASS_PREFIX}__nav`, left: _jsxs(_Fragment, { children: [navigationStyle.showLogo && (_jsx(NavMenu.Item, { type: "logo", className: `${CLASS_PREFIX}__nav-logo`, children: _jsx(MenuLogo, { navigationStyle: navigationStyle, className: `${CLASS_PREFIX}__nav-logo--img` }) })), _jsx(NavMenu.Item, { className: `${CLASS_PREFIX}__nav-title`, children: _jsx("span", { className: `${CLASS_PREFIX}__title`, children: renderTitle(navigationStyle) }) })] }), right: _jsxs("div", { className: `${CLASS_PREFIX}__nav-wrap`, children: [_jsxs(_Fragment, { children: [showButton && position.index > 0 && (_jsxs("div", { className: `${CLASS_PREFIX}__nav-shadow leftButton`, onClick: () => {
                                 const result = position.offset + menuOffset[position.index];
                                 setPosition({ index: position.index - 1, offset: result });
                             }, children: [_jsx("div", { className: `${CLASS_PREFIX}__shadow--icon` }), _jsx("div", { className: `${CLASS_PREFIX}__shadow` }), _jsx("div", { className: `${CLASS_PREFIX}__shadow--white` })] })), _jsx("div", { className: `${CLASS_PREFIX}__nav-content box`, children: _jsx("div", { ref: navWrapRef, className: `${CLASS_PREFIX}__nav-content`, style: { transform: `translate(${position.offset}px, 0px)` }, children: menuData === null || menuData === void 0 ? void 0 : menuData.map((i) => {

package/dist/web/components/navigationBar/index.css

@@ -301,6 +301,17 @@
   font-size: 16px;
   color: #000000;
   margin-left: 12px;
+  display: flex;
+}
+.weda-menu-horizontal
+  .weda-menu__nav
+  .weda-menu__nav-title
+  .weda-menu__title
+  .weda-menu__title_text {
+  white-space: nowrap;
+  max-width: 300px;
+  text-overflow: ellipsis;
+  overflow: hidden;
 }
 
 .weda-menu-horizontal .weda-menu__nav .wedatea2td-nav__flex-end {

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

@@ -155,7 +155,14 @@ export default function NavigationBar({ navigationbar, contentSlot, navigationSl
     const MenuRender = () => {
         return (_jsxs("div", { className: `${CLASS_PREFIX}__wrapper`, style: {
                 background: (navigationStyle === null || navigationStyle === void 0 ? void 0 : navigationStyle.menuBackgroundColor) || '#fff',
-            }, children: [platform !== 'h5' && !isHorizontal && (_jsx(VerticalMenu, { menuData: menuData, navigationStyle: navigationStyle, setMenuData: setMenuData, selected: selected, setSelected: setSelected, navigationSlot: navigationSlot })), platform !== 'h5' && isHorizontal && (_jsx(HorizontalMenu, { menuData: menuData, navigationStyle: navigationStyle, selected: selected, setSelected: setSelected, navigationSlot: navigationSlot })), platform === 'h5' && (_jsx(H5Menu, { menuData: isMultiTerminal ? mobileMenuData : menuData, navigationStyle: navigationStyle, setMenuData: setMenuData, className: className, selected: selected, setSelected: setSelected, navigationSlot: navigationSlot, visible: visible, setVisible: setVisible }))] }));
+            }, children: [platform !== 'h5' && !isHorizontal && (_jsx(VerticalMenu, { menuData: menuData, navigationStyle: navigationStyle, setMenuData: setMenuData, selected: selected, setSelected: setSelected, navigationSlot: navigationSlot })), platform !== 'h5' && isHorizontal && (_jsx(HorizontalMenu, { menuData: menuData, navigationStyle: navigationStyle, selected: selected, setSelected: setSelected, navigationSlot: navigationSlot })), platform === 'h5' && (_jsx(H5Menu, { menuData: isMultiTerminal ? mobileMenuData : menuData, navigationStyle: navigationStyle, setMenuData: (menus) => {
+                        if (isMultiTerminal) {
+                            setMobileMenuData(menus);
+                        }
+                        else {
+                            setMenuData(menus);
+                        }
+                    }, className: className, selected: selected, setSelected: setSelected, navigationSlot: navigationSlot, visible: visible, setVisible: setVisible }))] }));
     };
     return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: cls, style: navigationWrapStyle, "data-testid": "navigationBar", children: [showNav && _jsx(MenuRender, {}), _jsx("div", { className: "menu-solt", children: contentSlot })] }) }));
 }

package/dist/web/components/table/ImportFileModalByApi/uploadCSVFile.js

@@ -87,5 +87,5 @@ export function UploadCSVFile({ parseFile, fields, datasourceTitle, dbName, setD
                                             setDisableNext(true);
                                         }, children: "\u5220\u9664" })] }) }), children: isDragging ? ('释放鼠标') : (_jsx(Status, { className: "upload-file", icon: 'blank', size: 's', operation: _jsxs(_Fragment, { children: [_jsx("a", { onClick: open, children: "\u70B9\u51FB\u4E0A\u4F20" }), " /", ' ', _jsx(Text, { theme: "weak", children: "\u62D6\u62FD\u5230\u6B64\u533A\u57DF" })] }) })) })) }) }), _jsx("div", { className: "modal-upload-text-wrap", children: _jsxs("ul", { children: [_jsxs("li", { children: ["1\u3001\u8BF7\u4E0B\u8F7D\u4F7F\u7528", _jsx("span", { onClick: () => {
                                         getCSVTemplate(fields, datasourceTitle);
-                                    }, children: "\u00A0 \u5BFC\u5165\u6A21\u7248" }), "\uFF0C\u5E76\u6309\u7167\u793A\u4F8B\u586B\u5199\u6570\u636E\uFF0C\u4EE5\u4FDD\u8BC1\u6570\u636E\u5BFC\u5165\u987A\u5229"] }), _jsx("li", { children: "2\u3001\u652F\u6301xlsx\u7C7B\u578B\u6587\u4EF6\uFF0C\u8981\u6C42\u6587\u4EF6\u5927\u5C0F2M\u4EE5\u5185\uFF0C\u4E0D\u80FD\u8D85\u8FC710000\u884C" }), _jsxs("li", { children: [_jsx("div", { children: "3\u3001\u5BFC\u5165\u66F4\u65B0\u8BF4\u660E" }), _jsx("div", { children: "\u00A01\uFF09\u652F\u6301\u9009\u62E9\u5F00\u542F\u552F\u4E00\u5C5E\u6027\u7684\u5B57\u6BB5\uFF0C\u7528\u4E8E\u5339\u914D\u5E76\u66F4\u65B0\u5DF2\u6709\u7684\u6570\u636E\u8BB0\u5F55" }), _jsx("div", { children: "\u00A02\uFF09\u5BFC\u5165\u6A21\u5F0F\u4E3A\u300C\u65B0\u589E\u6216\u66F4\u65B0\u300D\u65F6\uFF0C\u5982\u300C\u6570\u636E\u6807\u8BC6\u300D\u5217\u4E3A\u7A7A\uFF0C\u8BE5\u884C\u6570\u636E\u4F1A\u6267\u884C\u65B0\u589E\u64CD\u4F5C" })] }), _jsxs("li", { children: [_jsx("div", { children: "4\u3001\u6570\u636E\u683C\u5F0F\u8BF4\u660E" }), _jsx("div", { children: "\u00A0 1\uFF09\u679A\u4E3E\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u9009\u62E9\u9009\u9879\u6807\u8BC6\u6216\u9009\u9879\u503C\u8FDB\u884C\u5BFC\u5165\uFF1A\u9009\u9879\u6807\u8BC6\u4E3A\u8868\u683C\u4E2D\u5C55\u793A\u7684\u4E1A\u52A1\u540D\u79F0\uFF1B\u9009\u9879\u503C\u4E3A\u9009\u9879\u7684\u7CFB\u7EDF\u552F\u4E00\u6807\u8BC6" }), _jsx("div", { children: "\u00A02\uFF09\u5173\u8054\u5173\u7CFB\u3001\u4E3B\u5B50\u660E\u7EC6\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u9009\u62E9\u4E3B\u5217\u5B57\u6BB5\u6216\u6570\u636E\u6807\u8BC6\u8FDB\u884C\u5BFC\u5165\uFF1A\u4E3B\u5217\u5B57\u6BB5\u4E3A\u8868\u683C\u4E2D\u5C55\u793A\u7684\u5173\u8054\u6570\u636E\u4E1A\u52A1\u540D\u79F0\uFF1B\u6570\u636E\u6807\u8BC6\u4E3A\u5173\u8054\u6570\u636E\u7684\u7CFB\u7EDF\u552F\u4E00\u6807\u8BC6" }), _jsx("div", { children: "\u00A03\uFF09\u5E03\u5C14\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u5BFC\u5165\u300C\u662F/\u5426\u300D\u6216\u300Ctrue/false\u300D" }), _jsx("div", { children: "\u00A04\uFF09\u56FE\u7247\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u5BFC\u5165https\u6216cloud\u534F\u8BAE\u7684\u56FE\u7247\u5730\u5740" }), _jsx("div", { children: "\u00A05\uFF09\u6587\u4EF6\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301cloud\u534F\u8BAE\u7684\u6587\u4EF6\u5730\u5740" }), _jsx("div", { children: "\u00A06\uFF09\u5730\u7406\u4F4D\u7F6E\u7C7B\u578B\u6570\u636E\uFF1A\u6570\u636E\u683C\u5F0F\u8981\u6C42\u4E3A\u5730\u70B9\u540D\u79F0(\u5750\u6807\u7ECF\u5EA6\uFF0C\u5750\u6807\u7EF4\u5EA6)" })] })] }) })] }));
+                                    }, children: "\u00A0 \u5BFC\u5165\u6A21\u7248" }), "\uFF0C\u5E76\u6309\u7167\u793A\u4F8B\u586B\u5199\u6570\u636E\uFF0C\u4EE5\u4FDD\u8BC1\u6570\u636E\u5BFC\u5165\u987A\u5229"] }), _jsx("li", { children: "2\u3001\u652F\u6301xlsx\u7C7B\u578B\u6587\u4EF6\uFF0C\u8981\u6C42\u6587\u4EF6\u5927\u5C0F2M\u4EE5\u5185\uFF0C\u4E0D\u80FD\u8D85\u8FC710000\u884C" }), _jsxs("li", { children: [_jsx("div", { children: "3\u3001\u5BFC\u5165\u66F4\u65B0\u8BF4\u660E" }), _jsx("div", { children: "\u00A01\uFF09\u652F\u6301\u9009\u62E9\u5F00\u542F\u552F\u4E00\u5C5E\u6027\u7684\u5B57\u6BB5\uFF0C\u7528\u4E8E\u5339\u914D\u5E76\u66F4\u65B0\u5DF2\u6709\u7684\u6570\u636E\u8BB0\u5F55" }), _jsx("div", { children: "\u00A02\uFF09\u5BFC\u5165\u6A21\u5F0F\u4E3A\u300C\u65B0\u589E\u6216\u66F4\u65B0\u300D\u65F6\uFF0C\u5982\u300C\u6570\u636E\u6807\u8BC6\u300D\u5217\u4E3A\u7A7A\uFF0C\u8BE5\u884C\u6570\u636E\u4F1A\u6267\u884C\u65B0\u589E\u64CD\u4F5C" }), _jsx("div", { children: "\u00A03\uFF09\u5355\u5143\u683C\u5185\u5BB9\u4E3A\u7A7A\u65F6\uFF0C\u8BE5\u7A7A\u503C\u5C06\u8986\u76D6\u539F\u6709\u6570\u636E\uFF0C\u8BF7\u8C28\u614E\u64CD\u4F5C" })] }), _jsxs("li", { children: [_jsx("div", { children: "4\u3001\u6570\u636E\u683C\u5F0F\u8BF4\u660E" }), _jsx("div", { children: "\u00A0 1\uFF09\u679A\u4E3E\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u9009\u62E9\u9009\u9879\u6807\u8BC6\u6216\u9009\u9879\u503C\u8FDB\u884C\u5BFC\u5165\uFF1A\u9009\u9879\u6807\u8BC6\u4E3A\u8868\u683C\u4E2D\u5C55\u793A\u7684\u4E1A\u52A1\u540D\u79F0\uFF1B\u9009\u9879\u503C\u4E3A\u9009\u9879\u7684\u7CFB\u7EDF\u552F\u4E00\u6807\u8BC6" }), _jsx("div", { children: "\u00A02\uFF09\u5173\u8054\u5173\u7CFB\u3001\u4E3B\u5B50\u660E\u7EC6\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u9009\u62E9\u4E3B\u5217\u5B57\u6BB5\u6216\u6570\u636E\u6807\u8BC6\u8FDB\u884C\u5BFC\u5165\uFF1A\u4E3B\u5217\u5B57\u6BB5\u4E3A\u8868\u683C\u4E2D\u5C55\u793A\u7684\u5173\u8054\u6570\u636E\u4E1A\u52A1\u540D\u79F0\uFF1B\u6570\u636E\u6807\u8BC6\u4E3A\u5173\u8054\u6570\u636E\u7684\u7CFB\u7EDF\u552F\u4E00\u6807\u8BC6" }), _jsx("div", { children: "\u00A03\uFF09\u5E03\u5C14\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u5BFC\u5165\u300C\u662F/\u5426\u300D\u6216\u300Ctrue/false\u300D" }), _jsx("div", { children: "\u00A04\uFF09\u56FE\u7247\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u5BFC\u5165https\u6216cloud\u534F\u8BAE\u7684\u56FE\u7247\u5730\u5740" }), _jsx("div", { children: "\u00A05\uFF09\u6587\u4EF6\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301cloud\u534F\u8BAE\u7684\u6587\u4EF6\u5730\u5740" }), _jsx("div", { children: "\u00A06\uFF09\u5730\u7406\u4F4D\u7F6E\u7C7B\u578B\u6570\u636E\uFF1A\u6570\u636E\u683C\u5F0F\u8981\u6C42\u4E3A\u5730\u70B9\u540D\u79F0(\u5750\u6807\u7ECF\u5EA6\uFF0C\u5750\u6807\u7EF4\u5EA6)" })] })] }) })] }));
 }

package/dist/web/components/wd-form/hooks/use-remote-value.js

@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import { useCallback, useEffect } from 'react';
 import { debug } from '../../../utils/console';
 import { usePlatform } from '../../../utils/platform';
 import { alertError } from '../../form/form';
@@ -19,7 +19,7 @@ methodGetItem, paramGetItem, appCloud, isDataModel, }) {
         console.error(err);
         alertError(platform, '表单容器数据查询失败');
     }, [platform]);
-    const { data: remoteValue, error, isLoading, } = useSWR(() => {
+    const { data: remoteValue, error, isLoading, mutate, } = useSWR(() => {
         if (!formTypeWithInitValue.includes(formType) || !dataSourceName) {
             logger.debug('formType没有初始值或者，没配数据源', {
                 formType,
@@ -70,10 +70,17 @@ methodGetItem, paramGetItem, appCloud, isDataModel, }) {
         }, true);
     }, {
         onError: onInitialValuesError,
+        revalidateOnFocus: false,
     });
+    useEffect(() => {
+        return () => {
+            mutate();
+        };
+    }, [mutate]);
     return {
         remoteValue,
         error,
         isLoading,
+        mutate,
     };
 }

package/dist/web/components/wd-form/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-/* eslint max-lines: [error, 500] */
+/* eslint max-lines: [error, 600] */
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, } from 'react';
 import { useDebouncedCallback, useDebouncedEffect, useMap, useMountEffect, useSyncedRef, } from '@react-hookz/web';
 import { isInIde, usePlatform } from '../../utils/platform';
@@ -16,6 +16,7 @@ import lodashGet from 'lodash.get';
 import isObjectEqual from '../../utils/isObjectEqual';
 import { useDataSource } from '../../utils/hooks/useDataSource';
 import { WdForm as FormUi } from './wd-form';
+const SET_VALUE_DEBOUNCE_TIMEOUT = 200;
 const logger = debug('wd-form');
 const WdForm = React.forwardRef(function WdForm(props, ref) {
     var _a;
@@ -39,6 +40,8 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         'gsd-h5-react-form-pc': platform === 'pc',
         'wedatea2td-form': platform === 'pc',
     }, className);
+    const isDataModel = !['connector', 'custom-connector'].includes(datasourceType); // 是否为数据模型，兼容历史 undefined
+    const hasSetInitValueRef = useRef(false);
     const [initialValues, setInitialValues] = useState((_a = props.initialValues) !== null && _a !== void 0 ? _a : emptyObject);
     const eventsRef = useSyncedRef(props.events);
     const validate = useCallback(async () => {
@@ -71,6 +74,17 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         return errObj;
     }, [formItemMap]);
     const [errors, setErrors] = useState(undefined);
+    const { remoteValue: fetchedInitialValues, isLoading: isLoadingInitValues, error: initValueFetchError, } = useRemoteValue({
+        appCloud,
+        formType,
+        _id,
+        // methodCreate,
+        methodGetItem,
+        // methodUpdate,
+        paramGetItem,
+        dataSourceName,
+        isDataModel,
+    });
     const submit = useCallback(async () => {
         const { submit } = eventsRef.current;
         const errorObj = await validate();
@@ -96,7 +110,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             }
         });
     }, [eventsRef, formItemMap]);
-    const setValue = useCallback((data, setNull) => {
+    const setValue = useDebouncedCallback((data, setNull) => {
         if (typeof data !== 'object' || typeof data === null) {
             console.warn('setValue data need expect a object but got', data);
             return;
@@ -115,7 +129,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             }
         });
         updateFormContext();
-    }, [formItemMap, updateFormContext]);
+    }, [formItemMap, updateFormContext], SET_VALUE_DEBOUNCE_TIMEOUT);
     const clearValidate = useCallback(() => {
         formItemMap.forEach((item) => {
             if (!item.clearValidate || typeof item.clearValidate !== 'function') {
@@ -128,6 +142,10 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     // useWhatChanged([formItemMap, initialValues, submit, validate]);
     useLoopRenderDetect();
     const { ready } = useWedaAppContext();
+    const [visible, setVisible] = React.useState(false);
+    React.useEffect(() => {
+        setVisible(true);
+    }, []);
     const previousFormType = useRef(null);
     useEffect(() => {
         if (!ready) {
@@ -144,8 +162,16 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             }
             else {
                 formItemMap.forEach((item) => {
-                    var _a;
-                    item.setReadOnly((_a = item.initialDisabled) !== null && _a !== void 0 ? _a : false);
+                    const { initialReadOnly, initialDisabled } = item || {};
+                    if (initialReadOnly) {
+                        item.setReadOnly(true);
+                    }
+                    else if (initialDisabled) {
+                        item.setDisabled(true);
+                    }
+                    else {
+                        item.setReadOnly(false);
+                    }
                 });
             }
         });
@@ -153,18 +179,6 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     useMountEffect(() => {
         logger.debug('formItemMap', formItemMap);
     });
-    const isDataModel = !['connector', 'custom-connector'].includes(datasourceType); // 是否为数据模型，兼容历史 undefined
-    const { remoteValue: fetchedInitialValues, isLoading: isLoadingInitValues, error: initValueFetchError, } = useRemoteValue({
-        appCloud,
-        formType,
-        _id,
-        // methodCreate,
-        methodGetItem,
-        // methodUpdate,
-        paramGetItem,
-        dataSourceName,
-        isDataModel,
-    });
     useEffect(() => {
         if (isLoadingInitValues)
             return;
@@ -173,8 +187,13 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
              错误处理放在了 @link {onInitialValuesError}
              下面是可以拿到data了
              */
-            // TODO: 有哪些key可以暴露
-            setInitialValues(fetchedInitialValues);
+            setInitialValues((original) => {
+                if (hasSetInitValueRef.current) {
+                    return original;
+                }
+                hasSetInitValueRef.current = true;
+                return fetchedInitialValues;
+            });
             setValue(fetchedInitialValues, true);
         }
     }, [fetchedInitialValues, initValueFetchError, isLoadingInitValues, setValue]);
@@ -323,10 +342,12 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             }
         }
         updateFormContext();
-    }, [formItemMap, initialValues, updateFormContext], 
-    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-    200);
+    }, [formItemMap, initialValues, updateFormContext], SET_VALUE_DEBOUNCE_TIMEOUT);
+    const lastInitValueRef = useRef(null);
     React.useEffect(() => {
+        if (isObjectEqual(lastInitValueRef.current, initialValues)) {
+            return;
+        }
         // 单向 Form向下设置值
         let setValueReady = false;
         const timeout = 30;
@@ -346,6 +367,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             setInitValue();
         };
         setValueUntilReady();
+        lastInitValueRef.current = initialValues;
         return () => {
             if (id) {
                 clearTimeout(id);
@@ -381,7 +403,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         }
         return 'vertical-left';
     }, [layout]);
-    return (_jsx(FormUi, { layout: layout, className: cls, style: style, id: id, labelPosition: labelPosition, children: contentSlot }));
+    return (_jsx(FormUi, { layout: layout, className: cls, style: style, id: id, labelPosition: labelPosition, children: visible && contentSlot }));
 });
 function getFormDataFromItemMap(formItemMap) {
     const formData = {};

package/dist/web/components/wd-icon/wd-icon.js

@@ -1,12 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { forwardRef, useImperativeHandle } from 'react';
+import React, { forwardRef, useImperativeHandle, useState } from 'react';
 import classNames from '../../utils/classnames';
 import { emptyObject } from '../../utils/constant';
 import { useConfig } from '../../utils/config-context';
 import { usePlatform } from '../../utils/platform';
 import { convertLegacyEnum } from '../../utils/tool';
 import { WD_ICON_TYPE, WD_ICON_SIZE } from '../../../enum';
+// eslint-disable-next-line complexity
 export const WdIcon = forwardRef(function WdIcon({ type: _type = 'inner', name, src, size: _size, events = emptyObject, className, style: _style, id, color: _color, ...props }, ref) {
+    const [isError, setIsError] = useState(false);
     const platform = usePlatform();
     // 兼容旧版组件的属性值 size/color
     const remdiff = 2;
@@ -27,6 +29,7 @@ export const WdIcon = forwardRef(function WdIcon({ type: _type = 'inner', name,
     const isTdIcon = /td/.test(name) && type === 'inner';
     const isLegacyIcon = !isTdIcon && type === 'inner';
     const iconName = name === null || name === void 0 ? void 0 : name.split(':')[1];
+    const showErrorIcon = isError && type === 'custom';
     // 响应式css api
     const platformCss = `${classPrefix}-${platform}-icon`;
     const classes = {
@@ -40,6 +43,7 @@ export const WdIcon = forwardRef(function WdIcon({ type: _type = 'inner', name,
         // 尺寸
         [`${compClassName}--${size}`]: !!size,
         [platformCss]: true,
+        [`${classPrefix}-icon-error`]: showErrorIcon,
     };
     const onClick = (e) => {
         var _a;
@@ -68,6 +72,10 @@ export const WdIcon = forwardRef(function WdIcon({ type: _type = 'inner', name,
     else {
         return (_jsx("img", { className: classNames(classes, className), style: style, id: id, src: src
                 ? src
-                : 'https://qcloudimg.tencent-cloud.cn/raw/4a29d51b504f12b4933ce4490110b4dc.svg', onClick: onClick, ...propsStartWithOn }));
+                : 'https://qcloudimg.tencent-cloud.cn/raw/4a29d51b504f12b4933ce4490110b4dc.svg', onLoad: () => {
+                setIsError(false);
+            }, onError: () => {
+                setIsError(true);
+            }, onClick: onClick, ...propsStartWithOn }));
     }
 });

package/dist/web/components/wd-table/components/FilterFieldsPanel/FilterFieldItem.js

@@ -40,6 +40,10 @@ export const FilterFieldItem = ({ updateFilterData, ...filterFieldItemConfig })
     const { filterType, isRange, label, options, fieldCalculation, value } = filterFieldItemConfig;
     const updateFilterConfig = (value) => {
         const lastFilterConfig = { ...filterFieldItemConfig, ...value };
+        // 选择为空不为空，则清空数据
+        if (['$empty', '$nempty'].includes(lastFilterConfig === null || lastFilterConfig === void 0 ? void 0 : lastFilterConfig.fieldCalculation.value)) {
+            lastFilterConfig.value = '';
+        }
         updateFilterData(lastFilterConfig);
     };
     useEffect(() => {

package/dist/web/components/wd-table/components/Table/index.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/* eslint max-lines: [error, 350] */
 import React, { useRef, useEffect } from 'react';
 import { Icon, Table, StatusTip, ConfigProvider } from 'tea-component';
 import { useResizeObserver } from '@react-hookz/web';
@@ -15,6 +16,16 @@ const miniPageSize = 10;
 // h5 端表格高度
 const tableHeight = { sm: 500, md: 580, lg: 880 };
 const tableHeaderHeight = 51;
+const renderStatus = ({ isH5, status, classPrefix, refreshTable, isNoDataSourceBind, _emptyText, }) => {
+    const text = {
+        loading: '数据加载中,请稍候...',
+        error: (_jsxs("p", { children: ["\u6570\u636E\u52A0\u8F7D\u5931\u8D25,", _jsx("span", { className: `${classPrefix}-empty-retry-text`, onClick: () => {
+                        refreshTable();
+                    }, children: "\u8BF7\u91CD\u8BD5" })] })),
+        empty: isNoDataSourceBind ? '请绑定数据源' : _emptyText,
+    };
+    return (_jsx(StatusContent, { emptyText: text[`${status}`], component: "table", icon: status, isH5: isH5 }));
+};
 // eslint-disable-next-line complexity
 export const BaseTableCom = ({ recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, isLoading, queryParams, total = defaultTotal, refreshTable, onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, }) => {
     var _a;
@@ -25,8 +36,11 @@ export const BaseTableCom = ({ recordKey, className, columns, setColumns, record
         ? (queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageIndex) === pageIndexSpan && isLoading
         : isLoading;
     // table状态样式
+    const showStatus = isShowLoading || isError || !(records === null || records === void 0 ? void 0 : records.length);
     const classes = {
-        [`${classPrefix}-table--status`]: isShowLoading || isError || !(records === null || records === void 0 ? void 0 : records.length),
+        [`${classPrefix}-table-scroll-wrap`]: true,
+        [`${classPrefix}-table--status`]: showStatus,
+        [`${classPrefix}-table--without-pagination`]: !enablePagination,
     };
     // table 插件
     const tableAddons = [
@@ -48,11 +62,9 @@ export const BaseTableCom = ({ recordKey, className, columns, setColumns, record
         autotip({
             isLoading: isShowLoading,
             isError,
-            loadingText: (_jsx(StatusContent, { emptyText: '数据加载中,请稍候...', component: "table", icon: "loading", isH5: isH5 })),
-            emptyText: (_jsx(StatusContent, { emptyText: isNoDataSourceBind ? '请绑定数据源' : _emptyText, component: "table", icon: "empty", isH5: isH5 })),
-            errorText: (_jsx(StatusContent, { emptyText: _jsxs("p", { children: ["\u6570\u636E\u52A0\u8F7D\u5931\u8D25,", _jsx("span", { className: `${classPrefix}-empty-retry-text`, onClick: () => {
-                                refreshTable();
-                            }, children: "\u8BF7\u91CD\u8BD5" })] }), component: "table", icon: "error", isH5: isH5 })),
+            loadingText: null,
+            emptyText: null,
+            errorText: null,
         }),
         // 行背景色
         injectable({
@@ -177,6 +189,15 @@ export const BaseTableCom = ({ recordKey, className, columns, setColumns, record
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [queryParams.pageIndex, currentSize, isLoading, isH5, total]);
-    return (_jsx("div", { className: `${classPrefix}-table-scroll-wrap`, children: _jsx(Table, { ref: tableRef, className: classNames(className, classes), bordered: true, recordKey: recordKey, columns: columns, records: records, addons: tableAddons, bottomTip: bottomTipCompRender() }) }));
+    const status = isShowLoading ? 'loading' : isError ? 'error' : 'empty';
+    return (_jsxs("div", { className: classNames(className, classes), children: [_jsx(Table, { ref: tableRef, className: className, bordered: true, recordKey: recordKey, columns: columns, records: records, addons: tableAddons, bottomTip: bottomTipCompRender() }), showStatus &&
+                renderStatus({
+                    isH5,
+                    status,
+                    classPrefix,
+                    refreshTable,
+                    isNoDataSourceBind,
+                    _emptyText,
+                })] }));
 };
 export const BaseTable = React.memo(BaseTableCom);

package/dist/web/components/wd-table/hooks/useTableData.js

@@ -1,13 +1,18 @@
 import { useEffect, useCallback, useState } from 'react';
 const defaultPageNo = 1;
-export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, isModel, dbName, isH5, isNoDataSourceBind, }) => {
+export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, isModel, dbName, isH5, isNoDataSourceBind, viewFieldsData, isViewTable, }) => {
     const [total, setTotal] = useState(0);
     const [tableLoading, setTableLoading] = useState(true);
     const [tableData, setTableData] = useState([]);
     const fetch = useCallback(async () => {
+        var _a;
         if (isNoDataSourceBind) {
             return;
         }
+        // 视图配置请求返回查询参数，配置视图时，等待视图返回成功后再查询，避免多次查询
+        if (isModel && isViewTable && !((_a = viewFieldsData === null || viewFieldsData === void 0 ? void 0 : viewFieldsData.viewList) === null || _a === void 0 ? void 0 : _a.length)) {
+            return;
+        }
         let data = { records: [], total: 0 };
         setTableLoading(true);
         if (isModel) {

package/dist/web/components/wd-table/hooks/useViewFields.js

@@ -15,6 +15,6 @@ export const useViewFields = ({ selectedView, selectedViewIds, dbName, isModel,
         },
         viewFields: (data === null || data === void 0 ? void 0 : data.fields) || authFields,
         isError: error,
-        loading: !error && !data,
+        viewLoading: !error && !data,
     };
 };