zmdms-webui 1.2.8 → 1.3.0

package/dist/es/modal/index.css

@@ -1 +1 @@
-.ztxk-modal .ant-modal-content{border-radius:8px}.ztxk-modal .ant-modal-content>.ant-modal-close{color:#333;height:40px;width:40px}.ztxk-modal .ant-modal-content>.ant-modal-close>.ant-modal-close-x{font-weight:400;height:40px;line-height:40px;width:40px}.ztxk-modal .ant-modal-content>.ant-modal-header{border-bottom:1px solid #f0f0f0;border-radius:8px 8px 0 0;padding:9px 20px 9px 24px}.ztxk-modal .ant-modal-content>.ant-modal-header>.ant-modal-title{color:#333;font-weight:400;line-height:22px;text-align:center}.ztxk-modal .ant-modal-content>.ant-modal-body{padding:10px}.ztxk-modal .ant-modal-content>.ant-modal-footer{border-top:0;padding:10px 0;text-align:center}
+.ztxk-modal{top:8vh}.ztxk-modal .ant-modal-content{border-radius:8px}.ztxk-modal .ant-modal-content>.ant-modal-close{color:#333;height:40px;width:40px}.ztxk-modal .ant-modal-content>.ant-modal-close>.ant-modal-close-x{font-weight:400;height:40px;line-height:40px;width:40px}.ztxk-modal .ant-modal-content>.ant-modal-header{border-bottom:1px solid #f0f0f0;border-radius:8px 8px 0 0;padding:9px 20px 9px 24px}.ztxk-modal .ant-modal-content>.ant-modal-header>.ant-modal-title{color:#333;font-weight:400;line-height:22px;text-align:center}.ztxk-modal .ant-modal-content>.ant-modal-body{max-height:75vh;min-height:200px;overflow:auto;padding:10px}.ztxk-modal .ant-modal-content>.ant-modal-footer{border-top:0;padding:10px 0;text-align:center}

package/dist/es/modal/modal.js

@@ -13,7 +13,7 @@ var Modal = function (_a, ref) {
     var _c = useState(defaultTitle), title = _c[0], setTitle = _c[1];
     var _d = useState(), loading = _d[0], setLoading = _d[1];
     // 二次确认框相关配置
-    var _e = useState(false), isConfirm = _e[0], setIsConfirm = _e[1];
+    var _e = useState(confirmOnOk ? true : false), isConfirm = _e[0], setIsConfirm = _e[1];
     var _f = useState(defaultConfirmMsg), confirmMsg = _f[0], setConfirmMsg = _f[1];
     var _g = useState(defaultConfirmOkText), confirmOkText = _g[0], setConfirmOkText = _g[1];
     // 模态框类型

package/dist/es/table/components/EnhanceBodyCell.js

@@ -142,16 +142,21 @@ var EnhanceCell = function (props) {
         if (!onEditableSave) {
             throw Error("如果开启了editable， 那么必须传递 onEditableSave属性 来更改表格数据!");
         }
-        toggleEdit();
-        onEditableSave(__assign(__assign({}, newRecord), (_a = {}, _a[dataIndex] = isIptNumberBooleanRef.current && iptNumberRef.current
+        var currentText = isIptNumberBooleanRef.current && iptNumberRef.current
             ? iptNumberRef.current
-            : val, _a)), index, dataIndex);
+            : val;
+        var resultValue = getTrimVal(editableConfig.trimType, currentText);
+        if (currentText !== resultValue) {
+            setVal(resultValue);
+        }
+        toggleEdit();
+        onEditableSave(__assign(__assign({}, newRecord), (_a = {}, _a[dataIndex] = resultValue, _a)), index, dataIndex);
     };
     // 如果开启编辑 那么内部直接代理
     if (typeof editable === "function" ? editable(newRecord, index) : editable) {
         var _g = editableConfig || {
             type: "input",
-        }, type = _g.type, max = _g.max, min = _g.min, maxHandle = _g.maxHandle, minHandle = _g.minHandle, disabled = _g.disabled, disabledHandle = _g.disabledHandle, resetEditableConfigProps = __rest(_g, ["type", "max", "min", "maxHandle", "minHandle", "disabled", "disabledHandle"]);
+        }, _h = _g.type, type = _h === void 0 ? "input" : _h, max = _g.max, min = _g.min, maxHandle = _g.maxHandle, minHandle = _g.minHandle, disabled = _g.disabled, disabledHandle = _g.disabledHandle; _g.trimType; var resetEditableConfigProps = __rest(_g, ["type", "max", "min", "maxHandle", "minHandle", "disabled", "disabledHandle", "trimType"]);
         var CurrentReactNode = null;
         // 这里将children 替换成val 要显示的值
         // let newChildren: any = children;
@@ -320,6 +325,21 @@ function validateHandle(_a) {
             }
         });
     });
+}
+function getTrimVal(trimType, value) {
+    if (trimType === "trim") {
+        return typeof value === "string" ? value.trim() : value;
+    }
+    if (trimType === "trimStart") {
+        return typeof value === "string" ? value.trimStart() : value;
+    }
+    if (trimType === "trimEnd") {
+        return typeof value === "string" ? value.trimEnd() : value;
+    }
+    if (trimType === "trimAll") {
+        return typeof value === "string" ? value.replace(/\s+/g, "") : value;
+    }
+    return value;
 }
 
 export { EnhanceCell as default };

package/dist/es/table/interface.d.ts

@@ -10,7 +10,7 @@ interface IEditableConfig extends Partial<IEditableConfigOtherProps> {
     /**
      * 列编辑类型
      */
-    type: "input" | "inputNumber" | "textarea";
+    type?: "input" | "inputNumber" | "textarea";
     /**
      * 最大值函数
      */
@@ -23,6 +23,14 @@ interface IEditableConfig extends Partial<IEditableConfigOtherProps> {
      * 禁用方法
      */
     disabledHandle?: (record: any) => boolean;
+    /**
+     * 去除空格
+     * trim 去除前后空格
+     * trimStart 去除前面空格
+     * trimEnd 去除后面空格
+     * trimAll 去除所有空格
+     */
+    trimType?: "trim" | "trimStart" | "trimEnd" | "trimAll" | ((value: any) => any);
     /**
      * 可以传入对应的input inputNumber的所有相关属性
      */

package/dist/es/treeselect/interface.d.ts

@@ -17,6 +17,10 @@ interface ITreeSelectProps extends Omit<TreeSelectProps, "onChange"> {
      */
     searchType?: "all" | "lazy";
     lazySearchHandle?: (v: string, setExpandKeys?: any) => void;
+    /**
+     * 禁用的选项列表 一个dataKey列表
+     */
+    disabledValues?: string[];
 }
 interface TreeSelectComponent extends React__default.ForwardRefExoticComponent<ITreeSelectProps & React__default.RefAttributes<unknown>> {
     SHOW_ALL: typeof TreeSelect.SHOW_ALL;

package/dist/es/treeselect/treeSelect.js

@@ -1,6 +1,6 @@
 import { __rest, __assign } from '../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
-import { memo, forwardRef } from 'react';
+import { memo, forwardRef, useMemo } from 'react';
 import { TreeSelect as TreeSelect$1 } from 'antd';
 import { useBasicInfo, useAllDataHandle, useChange, useSearchHandle } from './hooks.js';
 
@@ -15,8 +15,8 @@ var DEFAULT_MAX_TAG_COUNT = 3;
  * treeDataSimpleMode treeData是否为简单格式 即树数据为平级 通过pId关联父子节点
  */
 var TreeSelect = function (props, ref) {
-    var onChange = props.onChange, isAllData = props.isAllData, dataHandle = props.dataHandle, searchType = props.searchType, lazySearchHandle = props.lazySearchHandle, resetProps = __rest(props, ["onChange", "isAllData", "dataHandle", "searchType", "lazySearchHandle"]);
-    var fieldNames = resetProps.fieldNames, treeNodeLabelProp = resetProps.treeNodeLabelProp, value = resetProps.value, treeData = resetProps.treeData, treeDataSimpleMode = resetProps.treeDataSimpleMode;
+    var onChange = props.onChange, isAllData = props.isAllData, dataHandle = props.dataHandle, searchType = props.searchType, lazySearchHandle = props.lazySearchHandle, disabledValues = props.disabledValues, treeData = props.treeData, resetProps = __rest(props, ["onChange", "isAllData", "dataHandle", "searchType", "lazySearchHandle", "disabledValues", "treeData"]);
+    var fieldNames = resetProps.fieldNames, treeNodeLabelProp = resetProps.treeNodeLabelProp, value = resetProps.value, treeDataSimpleMode = resetProps.treeDataSimpleMode;
     // 基础数据
     var _a = useBasicInfo({
         fieldNames: fieldNames,
@@ -47,11 +47,52 @@ var TreeSelect = function (props, ref) {
         childrenKey: childrenKey,
         titleKey: titleKey,
     }), searchValue = _b.searchValue, onLazySearchHandle = _b.onLazySearchHandle, filterTreeNode = _b.filterTreeNode, treeExpandedKeys = _b.treeExpandedKeys, onTreeExpand = _b.onTreeExpand;
+    var newTreeData = useMemo(function () {
+        if (!disabledValues) {
+            return treeData;
+        }
+        if (disabledValues.length === 0) {
+            return treeData;
+        }
+        // 如果数据是扁平模式
+        if (treeDataSimpleMode) {
+            return treeData === null || treeData === void 0 ? void 0 : treeData.map(function (item) {
+                if (valueKey && disabledValues.includes(item[valueKey])) {
+                    return __assign(__assign({}, item), { disabled: true, disableCheckbox: true });
+                }
+                return item;
+            });
+        }
+        function cloneAndDisableTree(tree, disabledIds) {
+            var _a;
+            // 递归函数，用于克隆树结构并添加禁用属性
+            function cloneNode(node) {
+                // 创建一个新节点作为克隆
+                var newNode = __assign({}, node);
+                // 如果有子节点，则递归克隆子节点
+                if (node === null || node === void 0 ? void 0 : node[childrenKey]) {
+                    newNode[childrenKey] = node[childrenKey].map(function (child) {
+                        return cloneNode(child);
+                    });
+                }
+                // 检查当前节点的ID是否在禁用列表中
+                if (disabledIds.includes(node[valueKey])) {
+                    // 如果在，则添加禁用属性
+                    newNode.disabled = true;
+                    newNode.disableCheckbox = true;
+                }
+                return newNode;
+            }
+            // 遍历原始树结构，对每个节点调用cloneNode进行克隆和修改
+            return (_a = tree === null || tree === void 0 ? void 0 : tree.map) === null || _a === void 0 ? void 0 : _a.call(tree, function (rootNode) { return cloneNode(rootNode); });
+        }
+        return cloneAndDisableTree(treeData, disabledValues);
+    }, [treeData, valueKey, childrenKey, treeDataSimpleMode, disabledValues]);
     return (jsx(TreeSelect$1, __assign({ onChange: onChangeHandle, 
         // 当多选模式或treeCheckable 定义回填的模式
         showCheckedStrategy: TreeSelect$1.SHOW_ALL, maxTagCount: DEFAULT_MAX_TAG_COUNT, searchValue: searchValue, onSearch: onLazySearchHandle, filterTreeNode: filterTreeNode, 
         // 节点展开逻辑
-        treeExpandedKeys: treeExpandedKeys, onTreeExpand: onTreeExpand, ref: ref }, resetProps)));
+        treeExpandedKeys: treeExpandedKeys, onTreeExpand: onTreeExpand, ref: ref, treeData: newTreeData }, resetProps)));
 };
 var MemoTreeSelect = memo(forwardRef(TreeSelect));
 MemoTreeSelect.displayName = "ZTXK_WEBUI_TreeSelect";

package/dist/es/uploadlist/hooks.js

@@ -134,7 +134,9 @@ function useOnChange(props) {
             var _b, _c;
             var size = item.size, name = item.name, response = item.response;
             var attachId = ((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.attachId) || (item === null || item === void 0 ? void 0 : item[ATTACH_ID_KEY]);
-            return __assign(__assign((_a = {}, _a[ATTACH_ID_KEY] = attachId, _a[ATTACH_NAME_KEY] = name ? name : (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.originalName, _a[ATTACH_SIZE_KEY] = size, _a[UPLOAD_TIME_KEY] = Date.now(), _a[UPLOAD_USER_KEY] = userName, _a), item), { uid: attachId ? attachId : item.uid });
+            return __assign(__assign((_a = {}, _a[ATTACH_ID_KEY] = attachId, _a[ATTACH_NAME_KEY] = name ? name : (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.originalName, _a[ATTACH_SIZE_KEY] = size, _a[UPLOAD_TIME_KEY] = item.createTime ? item.createTime : Date.now(), _a[UPLOAD_USER_KEY] = item.createUserName
+                ? item.createUserName
+                : userName, _a), item), { uid: attachId ? attachId : item.uid });
         });
         // antd 4 再React 18下的一个bug
         // 暂时先这么修复 强制更新
@@ -156,7 +158,9 @@ function useOnChange(props) {
                 var _b, _c, _d;
                 var size = item.size, name = item.name, response = item.response;
                 var attachId = ((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.attachId) || (item === null || item === void 0 ? void 0 : item[ATTACH_ID_KEY]);
-                return __assign(__assign((_a = {}, _a[ATTACH_ID_KEY] = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.attachId, _a[ATTACH_NAME_KEY] = name ? name : (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.originalName, _a[ATTACH_SIZE_KEY] = size, _a[UPLOAD_TIME_KEY] = Date.now(), _a[UPLOAD_USER_KEY] = userName, _a), item), { uid: attachId ? attachId : item.uid });
+                return __assign(__assign((_a = {}, _a[ATTACH_ID_KEY] = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.attachId, _a[ATTACH_NAME_KEY] = name ? name : (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.originalName, _a[ATTACH_SIZE_KEY] = size, _a[UPLOAD_TIME_KEY] = item.createTime ? item.createTime : Date.now(), _a[UPLOAD_USER_KEY] = item.createUserName
+                    ? item.createUserName
+                    : userName, _a), item), { uid: attachId ? attachId : item.uid });
             });
             var errorFileList = fileList
                 .filter(function (item) { return isErrorFile(item); })
@@ -165,7 +169,9 @@ function useOnChange(props) {
                 var _b, _c;
                 var size = item.size, name = item.name, response = item.response;
                 var attachId = ((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.attachId) || (item === null || item === void 0 ? void 0 : item[ATTACH_ID_KEY]);
-                return __assign(__assign((_a = {}, _a[ATTACH_ID_KEY] = attachId, _a[ATTACH_NAME_KEY] = name ? name : (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.originalName, _a[ATTACH_SIZE_KEY] = size, _a[UPLOAD_TIME_KEY] = Date.now(), _a[UPLOAD_USER_KEY] = userName, _a), item), { uid: attachId ? attachId : item.uid });
+                return __assign(__assign((_a = {}, _a[ATTACH_ID_KEY] = attachId, _a[ATTACH_NAME_KEY] = name ? name : (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.originalName, _a[ATTACH_SIZE_KEY] = size, _a[UPLOAD_TIME_KEY] = item.createTime ? item.createTime : Date.now(), _a[UPLOAD_USER_KEY] = item.createUserName
+                    ? item.createUserName
+                    : userName, _a), item), { uid: attachId ? attachId : item.uid });
             });
             onChange &&
                 onChange({
@@ -272,7 +278,11 @@ function useUploadTableData(props) {
                 // 附件大小 同理
                 attachSize: attachSize ? attachSize : size, 
                 // 上传时间
-                uploadTime: uploadTime ? uploadTime : Date.now(), 
+                uploadTime: uploadTime
+                    ? uploadTime
+                    : item.createTime
+                        ? item.createTime
+                        : Date.now(), 
                 // 上传人
                 uploadUser: uploadUser
                     ? uploadUser

package/dist/es/uploadlist/uploadTable.js

@@ -127,8 +127,9 @@ var UploadTable = function (_a, ref) {
         dataIndex: "uploadTime",
         key: "uploadTime",
         align: "left",
-        render: function (text) {
-            return dayjs(text).format("YYYY-MM-DD HH:mm");
+        render: function (text, record) {
+            var time = text ? text : record.createTime;
+            return dayjs(time).format("YYYY-MM-DD HH:mm");
         },
     };
     var createUserColumn = {