@cloudbase/weda-ui 3.4.10 → 3.4.11

package/dist/web/components/form/userOrgSelect/component/userOrgSelect.css

@@ -986,13 +986,10 @@
 
 .weda-select-user-dept .weda-select-user-dept__result-list,
 .weda-select-user-dept__dialog .weda-select-user-dept__result-list {
-  /* flex: 1 1 0px;
+  flex: 1 1 0px;
   display: flex;
   align-items: center;
-  overflow: hidden; */
-  overflow-x: scroll;
-  width: 100%;
-  white-space: nowrap;
+  overflow: hidden;
 }
 
 .weda-select-user-dept .weda-select-user-dept__result-list .wedatea2td-tag,
@@ -1045,9 +1042,6 @@
   font-size: 12px;
   line-height: 20px;
   color: rgba(0, 0, 0, 0.9);
-  position: relative;
-  display: inline-block;
-  margin-left: 6px;
 }
 
 .weda-select-user-dept__dialog

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

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { renderDecorator } from '../../renderDecorator';
 import { IconFont } from 'tdesign-icons-react';
 import classNames from '../../../../utils/classnames';
-import { fetchSearchOrg, getNodeFromTreeByCode } from '../common/utils';
+import { getNode, fetchSearchOrg } from '../common/utils';
 import { Modal, Button, ConfigProvider, Radio, Status, Bubble, } from 'tea-component';
 import { ModalSearchH5 } from '../component/modal-search-h5';
 import { LoadingStatus, ErrorStatus } from '../component/error-tips';
@@ -23,12 +23,24 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
     });
     const [visible, setVisible] = React.useState(false);
     const [isSearch, setIsSearch] = useState(false);
+    // const [showTreeData, setShowTreeData] = useState([]);
     const [showTreeData, setShowTreeData] = useState([]);
-    // currentItem：到达当前页面是从currentItem部门点击来的
-    const [currentItem, setCurrentItem] = useState(null);
+    const [originalOrgData, setOriginalOrgData] = useState([]);
+    const [count, setCount] = useState(1); //计数弹窗显示层级
     const [searchValue, setSearchValue] = useState('');
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const [loading, setLoading] = useState({ id: null, status: false });
+    const [titleText, setTitleText] = useState('');
+    const treeNode = getNode(treeData, 'root', 'id');
+    useEffect(() => {
+        // 仅执行一次
+        if (treeData) {
+            setShowTreeData(treeNode);
+            setOriginalOrgData([{ index: 1, treeData: treeNode, title: '选择部门' }]);
+            setTitleText('选择部门');
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [treeData]);
     const handleFocus = (value) => {
         setIsSearch(value);
     };
@@ -36,7 +48,8 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
         setErrorInfo({ errorStatus: false, errorMessage: null });
         handleFocus(false);
         setSearchValue('');
-        setShowTreeData(treeData);
+        setShowTreeData(treeNode);
+        // initOrgsData();
     };
     const onSearch = debounce((key) => {
         try {
@@ -46,7 +59,7 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
                 setShowTreeData(res);
             }
             else {
-                setShowTreeData(treeData);
+                setShowTreeData(treeNode);
             }
         }
         catch (e) {
@@ -56,45 +69,58 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
     const onFocus = function () {
         setSearchValue('');
         setVisible(true);
-        setShowTreeData(treeData);
+        setShowTreeData(treeNode);
     };
     const onClose = () => {
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setVisible(false);
-        setShowTreeData(treeData);
+        setShowTreeData(treeNode);
+        setShowTreeData(treeNode);
     };
     const onConfirm = (selectedOrgList = []) => {
         setConfirmOrgList(selectedOrgList);
         setErrorInfo({ errorStatus: false, errorMessage: null });
-        setShowTreeData(treeData);
+        setShowTreeData(treeNode);
         setVisible(false);
     };
     // 获取某节点子部门
     const loadItem = (item) => {
         setShowTreeData((item === null || item === void 0 ? void 0 : item.children) ? [].concat(item === null || item === void 0 ? void 0 : item.children) : []);
-        setCurrentItem(item);
+        originalOrgData.push({
+            index: count + 1,
+            treeData: item === null || item === void 0 ? void 0 : item.children,
+            title: item === null || item === void 0 ? void 0 : item.content,
+        });
+        setCount(count + 1);
+        setOriginalOrgData(originalOrgData);
+        setTitleText(item === null || item === void 0 ? void 0 : item.content);
     };
-    // 返回targetItem节点所在的层级
-    const returnToLevelOfNode = (targetItem) => {
-        if (!targetItem) {
-            return;
-        }
-        // 已经返回到根节点层级
-        if (!targetItem.parentcode || targetItem.parentcode === '!!ROOT') {
-            setShowTreeData(treeData);
-            setCurrentItem(null);
+    //判断当前页结构为第几层，如首次渲染则添加至orgsTreeData，二次进入刷新index数据
+    const retLevel = (count) => {
+        const storageOriTreeData = [];
+        if (count !== 1) {
+            originalOrgData.map((item) => {
+                if ((item === null || item === void 0 ? void 0 : item.index) < count) {
+                    storageOriTreeData.push(item);
+                    if ((item === null || item === void 0 ? void 0 : item.index) === count - 1) {
+                        setCount(count - 1);
+                        setTitleText(item.title);
+                        setShowTreeData((item === null || item === void 0 ? void 0 : item.treeData) || []);
+                    }
+                }
+                else {
+                    return;
+                }
+            });
+            setOriginalOrgData(storageOriTreeData);
         }
         else {
-            // 要返回targetItem所在的层级，需要找到targetItem的父节点parent，再显示parent的子节点即可
-            const parent = getNodeFromTreeByCode(treeData, targetItem.parentcode);
-            setShowTreeData((parent === null || parent === void 0 ? void 0 : parent.children) || []);
-            // 标记当前是从根节点进到这一层
-            setCurrentItem(parent);
+            onClose();
         }
     };
     return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: subCls, children: [_jsx("div", { className: "weui-cell__bd weui-flex", children: _jsx("input", { className: "weui-input", placeholder: placeholder, 
                         //value={value}
-                        value: (confirmOrgList || []).map((e) => e === null || e === void 0 ? void 0 : e.content).join(','), disabled: disabled, name: name, autoFocus: autoFocus, onClick: onFocus, readOnly: true, role: "input" }) }), _jsxs(Modal, { disableEscape: true, maskClosable: false, visible: visible, onClose: onClose, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog`, children: [_jsxs(Modal.Body, { className: ((_a = selectedOrgList[0]) === null || _a === void 0 ? void 0 : _a.id) ? 'is-selected-value' : '', children: [_jsxs("div", { className: "weda-select-user-dept__dialog-header", children: [_jsx("div", { className: !currentItem ? '' : 'arrow-left', onClick: () => returnToLevelOfNode(currentItem) }), currentItem ? currentItem.content : '选择部门'] }), _jsx(ModalSearchH5, { value: searchValue, onChange: (key) => {
+                        value: (confirmOrgList || []).map((e) => e === null || e === void 0 ? void 0 : e.content).join(','), disabled: disabled, name: name, autoFocus: autoFocus, onClick: onFocus, readOnly: true, role: "input" }) }), _jsxs(Modal, { visible: visible, onClose: onClose, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog`, children: [_jsxs(Modal.Body, { className: ((_a = selectedOrgList[0]) === null || _a === void 0 ? void 0 : _a.id) ? 'is-selected-value' : '', children: [_jsxs("div", { className: "weda-select-user-dept__dialog-header", id: count.toString(), children: [_jsx("div", { className: count == 1 ? '' : 'arrow-left', onClick: () => retLevel(count) }), titleText] }), _jsx(ModalSearchH5, { value: searchValue, onChange: (key) => {
                                         onSearch(key);
                                         setSearchValue(key);
                                     }, onCancel: cancleSearch, isSearch: isSearch, onFocus: () => {

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

@@ -35,13 +35,14 @@ export function useParentForm($widget) {
     return data;
 }
 export function useFormInputTrait(inputParams) {
+    var _a;
     const { value, $widget, inputRef, required, requiredMsg, rules = emptyArray, events, layout: currentLayout, setInnerHandle = noop, onChange: outerOnChange = noop, $node, } = inputParams;
     if (isNil($widget)) {
         throw new Error('$widget 没传入');
     }
     const eventsRef = useSyncedRef(events);
     const [name] = useSyncValue(inputParams.name);
-    const [disabled, setDisabled] = useSyncValue(inputParams.disabled);
+    const [disabled, setDisabled] = useSyncValue((_a = inputParams.disabled) !== null && _a !== void 0 ? _a : false);
     const [readOnly] = useSyncValue(inputParams.readOnly);
     const [validateState, setValidateState] = useState(inputParams.validateStatus);
     const [validateErrorMsg, setValidateErrorMsg] = useState('');

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

@@ -1,4 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
 import * as PropTypes from 'prop-types';
 export default function Repeater({ children }) {
     return _jsx(_Fragment, { children: children });

package/dist/web/components/repeater-item/index.js

@@ -1,4 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
 export default function RepeaterItem({ children }) {
     return _jsx(_Fragment, { children: children });
 }

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

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
 import './index.css';
 const BLOCK_NAME = 'weda-list-view';
 export default function StatusContent(props) {

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\u4EE5\u300C\u6570\u636E\u6807\u8BC6\u300D\u4F5C\u4E3A\u4F9D\u636E\u5B57\u6BB5\uFF0C\u5BF9\u5DF2\u6709\u6570\u636E\u8FDB\u884C\u5339\u914D\u66F4\u65B0" }), _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" })] }), _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/index.js

@@ -143,7 +143,8 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             }
             else {
                 formItemMap.forEach((item) => {
-                    item.setReadOnly(item.initialDisabled);
+                    var _a;
+                    item.setReadOnly((_a = item.initialDisabled) !== null && _a !== void 0 ? _a : false);
                 });
             }
         });
@@ -176,7 +177,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             setValue(fetchedInitialValues, true);
         }
     }, [fetchedInitialValues, initValueFetchError, isLoadingInitValues, setValue]);
-    const { data: dataSourceProfile } = useDataSource();
+    const { data: dataSourceProfile } = useDataSource(dataSourceName);
     const authValue = useAuthValue({
         appCloud,
         isDataModel,

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

@@ -47,10 +47,7 @@ export function getFieldRender(field = {}, extra = {}) {
     }
     // render 方法
     const FieldRender = (val) => {
-        var _a;
-        if (isValueEmpty(val) ||
-            (type === 'array' && !(val === null || val === void 0 ? void 0 : val.length)) ||
-            (type === 'array' && (val === null || val === void 0 ? void 0 : val.length) && !((_a = Object.keys(val[0])) === null || _a === void 0 ? void 0 : _a.length))) {
+        if (isValueEmpty(val) || (type === 'array' && !(val === null || val === void 0 ? void 0 : val.length))) {
             return '-';
         }
         // fieldValue 值转换，如布尔/时间/枚举等
@@ -576,6 +573,19 @@ export const getFieldValue = (name, _record) => {
     return record[name];
 };
 export const slotRender = (slot, props = {}) => typeof slot === 'function' ? slot(props) : slot;
+const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, slot, }) => {
+    const component = React.useMemo(() => {
+        // 计算单元格的值
+        return slotRender(slot, {
+            record,
+            rowKey,
+            recordIndex,
+            column,
+            columnIndex,
+        });
+    }, [record, rowKey, recordIndex, column, columnIndex]);
+    return _jsx(_Fragment, { children: component });
+};
 /**
  * 根据列管理，过滤表格列信息
  * columns: { key, header, width, align, render,fixed }[] Tea Table 的列
@@ -610,20 +620,7 @@ export const filterCustomColumns = ({ columns, columnSets, slots }) => {
         if (genre === 'slot') {
             // 拿到列对应的插槽
             const slot = slots[`${TABLE_SLOT_PREFIX}${(item2 === null || item2 === void 0 ? void 0 : item2.slotKey) || key}`];
-            const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, }) => {
-                const component = React.useMemo(() => {
-                    // 计算单元格的值
-                    return slotRender(slot, {
-                        record,
-                        rowKey,
-                        recordIndex,
-                        column,
-                        columnIndex,
-                    });
-                }, [record, rowKey, recordIndex, column, columnIndex]);
-                return _jsx(_Fragment, { children: component });
-            };
-            customColumn.render = (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableSlotCell, { record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex }));
+            customColumn.render = (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableSlotCell, { record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex, slot: slot }));
         }
         return customColumn;
     });

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable max-lines */
-import { useRef, useEffect, useState, useMemo, memo, useImperativeHandle, forwardRef, } from 'react';
+import { useRef, useEffect, useState, useMemo, useImperativeHandle, forwardRef, } from 'react';
 import { ConfigProvider } from 'tea-component';
 import { Table, ExportFileModal, ImportFileModal, InOrOutRecordModal, deleteRecord, importHandleByApi, exportHandleByApi, exportHandle, FilterFieldsPanel, ToolBar, } from './components';
 import classNames from '../../utils/classnames';
@@ -24,6 +24,22 @@ import Modal from '../modal';
 import { WdButton } from '../wd-button';
 const _defaultPageIndex = 1;
 const _defaultPageSize = 10;
+const TableOption = ({ record, rowKey, recordIndex, column, columnIndex, slots, classPrefix, }) => {
+    const component = useMemo(() => {
+        // 计算单元格的值
+        return slotRender(slots[CELL_CUSTOM_OPTION], {
+            record,
+            rowKey,
+            recordIndex,
+            column,
+            columnIndex,
+        });
+    }, [column, columnIndex, record, recordIndex, rowKey, slots]);
+    return (_jsx("div", { className: `${classPrefix}-pc-table-option-btn-wrap`, children: component }));
+};
+const GlobalButton = function GlobalButtonDom({ classPrefix, slots, }) {
+    return _jsx("div", { className: `${classPrefix}-global-btn`, children: slotRender(slots) });
+};
 // eslint-disable-next-line complexity
 export const WdTable = forwardRef(function TableComp({ className, style, dataSourceType, bindConnectMetadata = {
     datasource: { id: '', name: '', title: '' },
@@ -202,19 +218,6 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         });
         // 操作列
         if (enableCellCustomOption && !isH5) {
-            const TableOption = ({ record, rowKey, recordIndex, column, columnIndex, }) => {
-                const component = useMemo(() => {
-                    // 计算单元格的值
-                    return slotRender(slots[CELL_CUSTOM_OPTION], {
-                        record,
-                        rowKey,
-                        recordIndex,
-                        column,
-                        columnIndex,
-                    });
-                }, [column, columnIndex, record, recordIndex, rowKey]);
-                return (_jsx("div", { className: `${classPrefix}-pc-table-option-btn-wrap`, children: component }));
-            };
             // 展示插槽操作列
             baseColumns.push({
                 key: 'button',
@@ -222,7 +225,7 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
                 width: 150,
                 align: 'left',
                 fixed: 'right',
-                render: (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableOption, { record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex })),
+                render: (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableOption, { slots: slots, classPrefix: classPrefix, record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex })),
             });
         }
         // 选择列
@@ -401,9 +404,6 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         // 仅当切换小屏的时候重新请求
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isH5]);
-    const GlobalButton = memo(function GlobalButtonDom({ classPrefix, slots, }) {
-        return (_jsx("div", { className: `${classPrefix}-global-btn`, children: slotRender(slots) }));
-    });
     const hasFilterButton = !!filterFieldsData.length;
     const recordKey = isInIde() ? undefined : '_id';
     return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(EnumHoc, { fields: authFields, children: _jsxs("div", { className: classNames(wrapClassList, className), style: style, id: id, children: [_jsx(FilterFieldsPanel, { openMobileFilter: openMobileFilter, setOpenMobileFilter: setOpenMobileFilter, filterFields: filterFieldsData, fetchData: (searchValues = []) => {

package/dist/web/utils/datasource.js

@@ -1,5 +1,4 @@
 import { isInIde, alertErrorMessage, isSystemField } from './platform';
-import { deepClone } from './tool';
 /* **** 数据源相关方法 **** */
 const callWedaApi = (...args) => { var _a, _b; return (_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.callWedaApi(...args); };
 export class DataSource {
@@ -350,22 +349,29 @@ export const resolveFieldsFromDatasource = async ({ dbName, enabledFieldNames, d
  * 获取主列字段标识并展示主列字段
  */
 export const getPrimaryField = (_data) => {
-    const data = deepClone(_data);
-    const keys = Object.keys(data).filter((item) => item.includes('@'));
-    keys.forEach((item) => {
-        var _a, _b, _c, _d, _e;
-        const field = item.replace('@', '');
-        const record = (_a = data[item]) === null || _a === void 0 ? void 0 : _a.v1.record;
-        const name = (_b = data[item]) === null || _b === void 0 ? void 0 : _b.v1.primaryColumn;
-        if (name) {
-            // 系统主列字段当record不存在时，默认展示最外层owner、createBy、updateBy字段，与其他列字段逻辑一致
-            if (record && record._id === data[field]) {
-                // 当record下主列字段没有值时，默认返回主列id
-                record[name]
-                    ? (data[field] = record[name])
-                    : (data[field] = ((_e = (_d = (_c = data[item]) === null || _c === void 0 ? void 0 : _c.v1) === null || _d === void 0 ? void 0 : _d.record) === null || _e === void 0 ? void 0 : _e._id) || '-');
+    let data = {};
+    try {
+        data = JSON.parse(JSON.stringify(_data));
+        const keys = Object.keys(data).filter((item) => item.includes('@'));
+        keys.forEach((item) => {
+            var _a, _b, _c, _d, _e, _f, _g;
+            const field = item.replace('@', '');
+            const record = (_b = (_a = data[item]) === null || _a === void 0 ? void 0 : _a.v1) === null || _b === void 0 ? void 0 : _b.record;
+            const name = (_d = (_c = data[item]) === null || _c === void 0 ? void 0 : _c.v1) === null || _d === void 0 ? void 0 : _d.primaryColumn;
+            if (name) {
+                // 系统主列字段当record不存在时，默认展示最外层owner、createBy、updateBy字段，与其他列字段逻辑一致
+                if (record && record._id === data[field]) {
+                    // 当record下主列字段没有值时，默认返回主列id
+                    record[name]
+                        ? (data[field] = record[name])
+                        : (data[field] = ((_g = (_f = (_e = data[item]) === null || _e === void 0 ? void 0 : _e.v1) === null || _f === void 0 ? void 0 : _f.record) === null || _g === void 0 ? void 0 : _g._id) || '-');
+                }
             }
-        }
-    });
+        });
+    }
+    catch (error) {
+        console.error('主列字段数据转换出错', error);
+        return _data;
+    }
     return data;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.4.10",
+  "version": "3.4.11",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",

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

@@ -1,46 +0,0 @@
-import React from 'react';
-import './index.css';
-const BLOCK_NAME = 'weda-list-view';
-export default function EmptyContent(props) {
-    const { emptyText, component, isH5 } = props;
-    return (React.createElement("div", { className: `${BLOCK_NAME}__empty` },
-        React.createElement("div", { className: `${BLOCK_NAME}__empty__content test
-        ${component === 'table' && 'table'}
-        ${isH5 && 'isH5'}` },
-            React.createElement("svg", { width: "120", height: "80", viewBox: "0 0 120 80", fill: "none", xmlns: "http://www.w3.org/2000/svg" },
-                React.createElement("rect", { x: "14", y: "8", width: "80", height: "50", fill: "url(#paint0_linear_810_13830)" }),
-                React.createElement("path", { d: "M28 22H20", stroke: "black", strokeOpacity: "0.9" }),
-                React.createElement("path", { d: "M44 27H20", stroke: "black", strokeOpacity: "0.9" }),
-                React.createElement("path", { d: "M44 32H20", stroke: "black", strokeOpacity: "0.9" }),
-                React.createElement("g", { filter: "url(#filter0_b_810_13830)" },
-                    React.createElement("path", { d: "M14 8H94V14H14V8Z", fill: "black", fillOpacity: "0.9" })),
-                React.createElement("path", { d: "M19 11H18", stroke: "white" }),
-                React.createElement("path", { d: "M23 11H22", stroke: "white" }),
-                React.createElement("path", { d: "M27 11H26", stroke: "white" }),
-                React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M78 18H62V34H78V18ZM97 18H81V34H97V18Z", fill: "url(#paint1_linear_810_13830)" }),
-                React.createElement("g", { filter: "url(#filter1_b_810_13830)" },
-                    React.createElement("path", { d: "M50 72H105V32H50V72Z", fill: "url(#paint2_linear_810_13830)", fillOpacity: "0.9" })),
-                React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M79.5244 57.9636C79.5244 58.483 79.2697 58.9325 78.9038 59.2929C78.5397 59.6516 78.0384 59.9517 77.4594 60.1929C76.2991 60.6764 74.7308 60.9636 73.0244 60.9636C71.318 60.9636 69.7498 60.6764 68.5895 60.1929C68.0104 59.9517 67.5092 59.6516 67.145 59.2929C66.7791 58.9325 66.5244 58.483 66.5244 57.9636V50.9636C66.5244 50.4443 66.7791 49.9948 67.145 49.6343C67.5092 49.2756 68.0104 48.9756 68.5895 48.7343C69.7498 48.2509 71.318 47.9636 73.0244 47.9636C74.7308 47.9636 76.2991 48.2509 77.4594 48.7343C78.0384 48.9756 78.5397 49.2756 78.9038 49.6343C79.2697 49.9948 79.5244 50.4443 79.5244 50.9636V57.9636ZM67.8468 50.3467C67.6055 50.5845 67.5244 50.7926 67.5244 50.9636C67.5244 51.1346 67.6055 51.3428 67.8468 51.5805C68.0899 51.82 68.4674 52.0587 68.9741 52.2699C69.9854 52.6912 71.4171 52.9636 73.0244 52.9636C74.6318 52.9636 76.0635 52.6912 77.0747 52.2699C77.5815 52.0587 77.9589 51.82 78.202 51.5805C78.4434 51.3428 78.5244 51.1346 78.5244 50.9636C78.5244 50.7926 78.4434 50.5845 78.202 50.3467C77.9589 50.1072 77.5815 49.8685 77.0747 49.6574C76.0635 49.236 74.6318 48.9636 73.0244 48.9636C71.4171 48.9636 69.9854 49.236 68.9741 49.6574C68.4674 49.8685 68.0899 50.1072 67.8468 50.3467ZM78.5244 52.6118V54.4636C78.5244 54.6346 78.4434 54.8428 78.202 55.0805C77.9589 55.32 77.5815 55.5587 77.0747 55.7699C76.0635 56.1912 74.6318 56.4636 73.0244 56.4636C71.4171 56.4636 69.9854 56.1912 68.9741 55.7699C68.4674 55.5587 68.0899 55.32 67.8468 55.0805C67.6055 54.8428 67.5244 54.6346 67.5244 54.4636V52.6118C67.8298 52.8333 68.1912 53.027 68.5895 53.1929C69.7498 53.6764 71.318 53.9636 73.0244 53.9636C74.7308 53.9636 76.2991 53.6764 77.4594 53.1929C77.8576 53.027 78.2191 52.8333 78.5244 52.6118ZM78.5244 57.9636V56.1118C78.2191 56.3333 77.8576 56.527 77.4594 56.6929C76.2991 57.1764 74.7308 57.4636 73.0244 57.4636C71.318 57.4636 69.7498 57.1764 68.5895 56.6929C68.1912 56.527 67.8298 56.3333 67.5244 56.1118V57.9636C67.5244 58.1346 67.6055 58.3428 67.8468 58.5805C68.0899 58.82 68.4674 59.0587 68.9741 59.2699C69.9854 59.6912 71.4171 59.9636 73.0244 59.9636C74.6318 59.9636 76.0635 59.6912 77.0747 59.2699C77.5815 59.0587 77.9589 58.82 78.202 58.5805C78.4434 58.3428 78.5244 58.1346 78.5244 57.9636Z", fill: "white" }),
-                React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M86.9038 53.2932C87.2697 52.9327 87.5244 52.4832 87.5244 51.9639V44.9639C87.5244 44.4445 87.2697 43.995 86.9038 43.6346C86.5397 43.2759 86.0384 42.9758 85.4594 42.7346C84.2991 42.2511 82.7308 41.9639 81.0244 41.9639C79.318 41.9639 77.7498 42.2511 76.5895 42.7346C76.0104 42.9758 75.5092 43.2759 75.145 43.6346C74.7791 43.995 74.5244 44.4445 74.5244 44.9639V48.0786C74.8689 48.1148 75.2032 48.1631 75.5244 48.2225V46.612C75.8298 46.8335 76.1912 47.0272 76.5895 47.1932C77.7498 47.6766 79.318 47.9639 81.0244 47.9639C82.7308 47.9639 84.2991 47.6766 85.4594 47.1932C85.8576 47.0272 86.2191 46.8335 86.5244 46.612V48.4639C86.5244 48.6349 86.4434 48.843 86.202 49.0808C85.9589 49.3203 85.5815 49.559 85.0747 49.7701C84.0635 50.1915 82.6318 50.4639 81.0244 50.4639C80.4454 50.4639 79.8891 50.4285 79.3671 50.3636C79.4517 50.5615 79.4999 50.7741 79.4999 51V51.3853C79.9898 51.4368 80.5006 51.4639 81.0244 51.4639C82.7308 51.4639 84.2991 51.1766 85.4594 50.6932C85.8576 50.5272 86.2191 50.3335 86.5244 50.112V51.9639C86.5244 52.1349 86.4434 52.343 86.202 52.5808C85.9589 52.8203 85.5815 53.059 85.0747 53.2701C84.0635 53.6915 82.6318 53.9639 81.0244 53.9639C80.4942 53.9639 79.9831 53.9342 79.4999 53.8794V54.8853C79.9898 54.9368 80.5006 54.9639 81.0244 54.9639C82.7308 54.9639 84.2991 54.6766 85.4594 54.1932C86.0384 53.9519 86.5397 53.6519 86.9038 53.2932ZM75.5244 44.9639C75.5244 44.7929 75.6055 44.5847 75.8468 44.3469C76.0899 44.1075 76.4674 43.8688 76.9741 43.6576C77.9854 43.2363 79.4171 42.9639 81.0244 42.9639C82.6318 42.9639 84.0635 43.2363 85.0747 43.6576C85.5815 43.8688 85.9589 44.1075 86.202 44.3469C86.4434 44.5847 86.5244 44.7929 86.5244 44.9639C86.5244 45.1349 86.4434 45.343 86.202 45.5808C85.9589 45.8203 85.5815 46.059 85.0747 46.2701C84.0635 46.6915 82.6318 46.9639 81.0244 46.9639C79.4171 46.9639 77.9854 46.6915 76.9741 46.2701C76.4674 46.059 76.0899 45.8203 75.8468 45.5808C75.6055 45.343 75.5244 45.1349 75.5244 44.9639Z", fill: "white" }),
-                React.createElement("defs", null,
-                    React.createElement("filter", { id: "filter0_b_810_13830", x: "10", y: "4", width: "88", height: "14", filterUnits: "userSpaceOnUse", colorInterpolationFilters: "sRGB" },
-                        React.createElement("feFlood", { floodOpacity: "0", result: "BackgroundImageFix" }),
-                        React.createElement("feGaussianBlur", { in: "BackgroundImageFix", stdDeviation: "2" }),
-                        React.createElement("feComposite", { in2: "SourceAlpha", operator: "in", result: "effect1_backgroundBlur_810_13830" }),
-                        React.createElement("feBlend", { mode: "normal", in: "SourceGraphic", in2: "effect1_backgroundBlur_810_13830", result: "shape" })),
-                    React.createElement("filter", { id: "filter1_b_810_13830", x: "44.6667", y: "26.6667", width: "65.6667", height: "50.6667", filterUnits: "userSpaceOnUse", colorInterpolationFilters: "sRGB" },
-                        React.createElement("feFlood", { floodOpacity: "0", result: "BackgroundImageFix" }),
-                        React.createElement("feGaussianBlur", { in: "BackgroundImageFix", stdDeviation: "2.66667" }),
-                        React.createElement("feComposite", { in2: "SourceAlpha", operator: "in", result: "effect1_backgroundBlur_810_13830" }),
-                        React.createElement("feBlend", { mode: "normal", in: "SourceGraphic", in2: "effect1_backgroundBlur_810_13830", result: "shape" })),
-                    React.createElement("linearGradient", { id: "paint0_linear_810_13830", x1: "54", y1: "8", x2: "54", y2: "58", gradientUnits: "userSpaceOnUse" },
-                        React.createElement("stop", { stopColor: "#E7E7E7" }),
-                        React.createElement("stop", { offset: "1", stopColor: "#DCDCDC" })),
-                    React.createElement("linearGradient", { id: "paint1_linear_810_13830", x1: "84.6042", y1: "18", x2: "84.6042", y2: "34", gradientUnits: "userSpaceOnUse" },
-                        React.createElement("stop", { stopColor: "white" }),
-                        React.createElement("stop", { offset: "1", stopColor: "white", stopOpacity: "0.2" })),
-                    React.createElement("linearGradient", { id: "paint2_linear_810_13830", x1: "74.8387", y1: "66.7826", x2: "74.8387", y2: "33.6563", gradientUnits: "userSpaceOnUse" },
-                        React.createElement("stop", { stopColor: "#939393", stopOpacity: "0.7" }),
-                        React.createElement("stop", { offset: "1", stopColor: "#939393" })))),
-            emptyText)));
-}

package/dist/web/components/flow/components/FlowModuleText/Content.js

@@ -1,6 +0,0 @@
-import React from 'react';
-import { getModuleContentStyle } from './utils';
-export function Content(props) {
-    const { className, children } = props;
-    return (React.createElement("span", { className: className, style: getModuleContentStyle(props) }, children));
-}

package/dist/web/components/flow/components/FlowModuleText/Title.js

@@ -1,16 +0,0 @@
-import React from 'react';
-import { getLineHeight } from './utils';
-import './index.css';
-export function Title(props) {
-    const { className, moduleTitle, moduleTitleColor, moduleTitleFontSize, moduleTitleFontWeight, moduleTitleLineHeight, moduleTitleVisible, } = props;
-    if (moduleTitleVisible) {
-        const style = {
-            color: moduleTitleColor,
-            fontSize: moduleTitleFontSize,
-            fontWeight: moduleTitleFontWeight,
-            lineHeight: getLineHeight(moduleTitleLineHeight),
-        };
-        return (React.createElement("div", { className: `model-flow-module-title ${className}`, style: style }, moduleTitle));
-    }
-    return null;
-}

package/dist/web/components/flow/components/FlowModuleText/index.js

@@ -1,7 +0,0 @@
-import { Title } from './Title';
-import { Content } from './Content';
-export * from './utils';
-export const FlowModuleText = {
-    Content,
-    Title,
-};

package/dist/web/components/flow/components/FlowModuleText/utils.js

@@ -1,34 +0,0 @@
-export function getModuleTextProps(props) {
-    const moduleProps = {};
-    Object.entries(props).forEach(([key, value]) => {
-        if (key.startsWith('module')) {
-            moduleProps[key] = value;
-        }
-    });
-    return moduleProps;
-}
-export function getLineHeight(lineHeight) {
-    const realLineHeight = +lineHeight;
-    if (typeof realLineHeight === 'number') {
-        return `${realLineHeight}rem`;
-    }
-    return lineHeight;
-}
-export function getModuleContentStyle(props) {
-    const style = {
-        color: props.moduleContentColor,
-        fontSize: props.moduleContentFontSize,
-        fontWeight: props.moduleContentFontWeight,
-        lineHeight: getLineHeight(props.moduleContentLineHeight),
-    };
-    return style;
-}
-export function getModuleTitleStyle(props) {
-    const style = {
-        color: props.moduleTitleColor,
-        fontSize: props.moduleTitleFontSize,
-        fontWeight: props.moduleTitleFontWeight,
-        lineHeight: getLineHeight(props.moduleTitleLineHeight),
-    };
-    return style;
-}

package/dist/web/components/flow/components/FlowStatusText/index.js

@@ -1,37 +0,0 @@
-import React from 'react';
-import { Text } from 'tea-component';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const omit = (prop, { [prop]: _, ...rest }) => rest;
-export const FlowStatusText = (props) => {
-    const { isCompleted, status, userTaskType } = props.flow || {};
-    const getTagProps = () => {
-        const props = {
-            theme: 'warning',
-            text: '审批中',
-        };
-        if (userTaskType === 2) {
-            props.text = '处理中';
-        }
-        if (isCompleted) {
-            if (status === 1) {
-                props.theme = 'danger';
-                props.text = '已终止';
-            }
-            else if (status === 2) {
-                props.theme = 'danger';
-                props.text = '已驳回';
-            }
-            else if (status === 4) {
-                props.theme = 'danger';
-                props.text = '已作废';
-            }
-            else {
-                props.theme = 'success';
-                props.text = userTaskType === 2 ? '已处理' : '审批通过';
-            }
-        }
-        return props;
-    };
-    const { text, ...rest } = getTagProps();
-    return (React.createElement(Text, { ...rest, style: omit('color', props.style) }, text));
-};

package/dist/web/components/flow/components/HighLightComment/index.js

@@ -1,31 +0,0 @@
-import React from 'react';
-import { safeJsonParse } from '../../../../utils/tool';
-export const HighLightComment = ({ details }) => {
-    const text = (details === null || details === void 0 ? void 0 : details.operationComment) || '';
-    let dom = '';
-    const positionMap = (details === null || details === void 0 ? void 0 : details.highlightPositionList) || '{}';
-    const obj = safeJsonParse(positionMap);
-    let startIndex = 0;
-    const arr = Object.entries(obj);
-    if (arr.length === 0) {
-        return text;
-    }
-    for (const [start, end] of arr) {
-        const name = text.substring(Number(start) + 1, end);
-        const domTemp = (React.createElement(React.Fragment, null,
-            text.substring(startIndex, Number(start)),
-            React.createElement("span", { style: { color: '#2473F2' } },
-                "@",
-                name)));
-        dom = (React.createElement(React.Fragment, null,
-            dom,
-            domTemp));
-        startIndex = end;
-    }
-    if (startIndex < text.length) {
-        dom = (React.createElement(React.Fragment, null,
-            dom,
-            text.substring(startIndex, text.length)));
-    }
-    return React.createElement("span", null, dom);
-};

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

@@ -1,3 +0,0 @@
-export * from './HighLightComment';
-export * from './FlowStatusText';
-export * from './FlowModuleText';