zmdms-webui 1.3.4 → 1.3.6

package/dist/es/button/buttonExport.js

@@ -24,32 +24,32 @@ var ButtonExport = function (props) {
     var _a = useState(false), loading = _a[0], setLoading = _a[1];
     // const { apiBaseUrl } = useBaseContext();
     var onClickHandle = function (e) { return __awaiter(void 0, void 0, void 0, function () {
-        var res, err_2, blob;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var res, err_2, blob, _a, errorFields, errors, msg, errorMsg;
+        var _b, _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     setLoading(true);
                     if (!beforeExportHandle) return [3 /*break*/, 4];
-                    _c.label = 1;
+                    _f.label = 1;
                 case 1:
-                    _c.trys.push([1, 3, , 4]);
+                    _f.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, beforeExportHandle()];
                 case 2:
-                    _c.sent();
+                    _f.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    _c.sent();
+                    _f.sent();
                     onClick && onClick(e, { result: false });
                     setLoading(false);
                     return [2 /*return*/];
                 case 4:
-                    _c.trys.push([4, 7, , 8]);
+                    _f.trys.push([4, 7, , 8]);
                     res = void 0;
                     if (!fetchHandle) return [3 /*break*/, 6];
                     return [4 /*yield*/, fetchHandle()];
                 case 5:
-                    res = _c.sent();
+                    res = _f.sent();
                     return [3 /*break*/, 6];
                 case 6:
                     exportBolb(res, fileName)
@@ -67,10 +67,10 @@ var ButtonExport = function (props) {
                     setLoading(false);
                     return [3 /*break*/, 8];
                 case 7:
-                    err_2 = _c.sent();
+                    err_2 = _f.sent();
                     setLoading(false);
-                    if (Object.prototype.toString.call((_a = err_2 === null || err_2 === void 0 ? void 0 : err_2.response) === null || _a === void 0 ? void 0 : _a.data) === "[object Blob]") {
-                        blob = (_b = err_2 === null || err_2 === void 0 ? void 0 : err_2.response) === null || _b === void 0 ? void 0 : _b.data;
+                    if (Object.prototype.toString.call((_b = err_2 === null || err_2 === void 0 ? void 0 : err_2.response) === null || _b === void 0 ? void 0 : _b.data) === "[object Blob]") {
+                        blob = (_c = err_2 === null || err_2 === void 0 ? void 0 : err_2.response) === null || _c === void 0 ? void 0 : _c.data;
                         blob
                             .text()
                             .then(function (text) {
@@ -87,7 +87,9 @@ var ButtonExport = function (props) {
                         message.error(err_2);
                     }
                     else {
-                        message.error((err_2 === null || err_2 === void 0 ? void 0 : err_2.msg) || "导出失败!");
+                        _a = err_2 || {}, errorFields = _a.errorFields, errors = _a.errors, msg = _a.msg;
+                        errorMsg = errors || ((_e = (_d = errorFields === null || errorFields === void 0 ? void 0 : errorFields[0]) === null || _d === void 0 ? void 0 : _d.errors) === null || _e === void 0 ? void 0 : _e[0]) || msg;
+                        message.error(errorMsg || "导出失败!");
                     }
                     return [2 /*return*/, err_2];
                 case 8: return [2 /*return*/];

package/dist/es/detaillist/index.css

@@ -1 +1 @@
-.ztxk-grid.ztxk-grid--default .ztxk-grid-item{line-height:18px}.ztxk-grid.ztxk-grid--large .ztxk-grid-item{line-height:32px}.ztxk-grid.ztxk-grid--border{border-left:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border:first-child{border-top:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border .ztxk-grid-item{border-bottom:1px solid #ebebeb;border-right:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border .ztxk-grid-item.ztxk-grid-item--text{padding:2px 4px}.ztxk-grid .ztxk-grid-item--flex,.ztxk-grid.ztxk-grid--flex .ztxk-grid-item{align-items:center;display:flex}.ztxk-grid.ztxk-grid--background .ztxk-grid-item--title{background:#eff5fe}.ztxk-grid.ztxk-grid--background .ztxk-grid-item--title .ztxk-grid-item--title-text{color:#333}.ztxk-grid .ztxk-grid-item{font-size:12px;line-height:18px;overflow:hidden}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title{word-wrap:break-word;color:#888;display:flex;padding:2px 0 2px 4px;text-align:right}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-text{display:inline-block;flex:1}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-colon{padding:0 0 0 1px}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-required{color:#ff4d4f!important;font-family:SimSun,sans-serif;font-size:14px;margin:1px 2px 0 0}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title-vertical-center{align-items:center}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--diff{background-color:#fdfd19}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text{word-wrap:break-word;color:#333;padding:3px 0}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text-noellipsis{white-space:pre-line}.ztxk-grid .ztxk-grid-item--merge{display:flex}.ztxk-grid .ztxk-grid-item--merge .ztxk-grid-item--text{flex:1}
+.ztxk-grid.ztxk-grid--default .ztxk-grid-item{line-height:18px}.ztxk-grid.ztxk-grid--large .ztxk-grid-item{line-height:32px}.ztxk-grid.ztxk-grid--border{border-left:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border:first-child{border-top:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border .ztxk-grid-item{border-bottom:1px solid #ebebeb;border-right:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border .ztxk-grid-item.ztxk-grid-item--text{padding:2px 4px}.ztxk-grid .ztxk-grid-item--flex,.ztxk-grid.ztxk-grid--flex .ztxk-grid-item{align-items:center;display:flex}.ztxk-grid.ztxk-grid--background .ztxk-grid-item--title{background:#eff5fe}.ztxk-grid.ztxk-grid--background .ztxk-grid-item--title .ztxk-grid-item--title-text{color:#333}.ztxk-grid .ztxk-grid-item{font-size:12px;line-height:18px;overflow:hidden}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title{word-wrap:break-word;color:#888;display:flex;justify-content:flex-end;padding:2px 0 2px 4px}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-text{display:inline-block}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-colon{padding:0 0 0 1px}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-required{color:#ff4d4f!important;font-family:SimSun,sans-serif;font-size:14px;margin:1px 2px 0 0}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title-vertical-center{align-items:center}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--diff{background-color:#fdfd19}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text{word-wrap:break-word;color:#333;padding:3px 0}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text-noellipsis{white-space:pre-line}.ztxk-grid .ztxk-grid-item--merge{display:flex}.ztxk-grid .ztxk-grid-item--merge .ztxk-grid-item--text{flex:1}

package/dist/es/dynamicsetting/useDynamic.js

@@ -184,6 +184,51 @@ function getSetDynamicKey(LOCALSTORAGE_KEY, LOCALSTORAGE_LRU_KEY) {
         localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
     };
 }
+/**
+ * @description 获取版本号信息
+ * @param LOCALSTORAGE_KEY 这一类dynamicKey标识
+ * @param dynamicKey 当前的KEY值
+ */
+function getDynamicVersionByKey(LOCALSTORAGE_KEY, dynamicKey) {
+    if (!dynamicKey) {
+        return 0;
+    }
+    var obj = {};
+    try {
+        obj =
+            JSON.parse(localStorage.getItem("".concat(LOCALSTORAGE_KEY, "_version")) || "{}") ||
+                {};
+    }
+    catch (err) {
+        console.error("\u83B7\u53D6\u52A8\u6001\u5217".concat(dynamicKey, "\u7248\u672C\u4FE1\u606F\u5931\u8D25!"), err);
+    }
+    return obj[dynamicKey] ? Number(obj[dynamicKey]) : 0;
+}
+/**
+ * @description 设置版本号信息
+ * @param LOCALSTORAGE_KEY 这一类dynamicKey标识
+ * @param dynamicKey 当前的KEY值
+ */
+function setDynamicVersionByKey(LOCALSTORAGE_KEY, dynamicKey, version) {
+    var obj = {};
+    try {
+        obj =
+            JSON.parse(localStorage.getItem("".concat(LOCALSTORAGE_KEY, "_version")) || "{}") ||
+                {};
+    }
+    catch (err) {
+        console.error(err);
+    }
+    if (!obj[dynamicKey]) {
+        obj[dynamicKey] = version;
+    }
+    try {
+        localStorage.setItem("".concat(LOCALSTORAGE_KEY, "_version"), JSON.stringify(obj));
+    }
+    catch (err) {
+        console.error("\u8BBE\u7F6E\u52A8\u6001\u5217".concat(dynamicKey, "\u7248\u672C\u4FE1\u606F\u5931\u8D25!"), err);
+    }
+}
 function useDynamic(dynamicKey, parentDynamicKey, list) {
     // 内部可操作的动态列配置
     var currentDynamicListMemo = useMemo(function () {
@@ -205,4 +250,4 @@ function useDynamic(dynamicKey, parentDynamicKey, list) {
     };
 }
 
-export { getCurrentDynamicItems, getSetDynamicKey, useDynamic };
+export { getCurrentDynamicItems, getDynamicVersionByKey, getSetDynamicKey, setDynamicVersionByKey, useDynamic };

package/dist/es/form/form.js

@@ -21,11 +21,15 @@ var FORM_DYNAMIC_KEY = "ztxk-webui-dynamic-form";
 // 用户配置优先，先从远端获取到 表单配置信息。
 // 给子元素设置好了表单配置信息后 接下来的内容 交给动态列配置接管
 var Form = function (props, ref) {
-    var form = props.form, bottomBorder = props.bottomBorder, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName; props.itemClassName; var rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, children = props.children, dynamicKey = props.dynamicKey, formPreferences = props.formPreferences, items = props.items, outsideState = props.outsideState, onValuesChange = props.onValuesChange, isResetAndClear = props.isResetAndClear, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, type = props.type, directionColumn = props.directionColumn, isToggle = props.isToggle, toggleNum = props.toggleNum, defaultToggle = props.defaultToggle, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "formPreferences", "items", "outsideState", "onValuesChange", "isResetAndClear", "onResetHandle", "onSearchHandle", "type", "directionColumn", "isToggle", "toggleNum", "defaultToggle"]);
+    var form = props.form, bottomBorder = props.bottomBorder, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName; props.itemClassName; var rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, children = props.children, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, formPreferences = props.formPreferences, items = props.items, outsideState = props.outsideState, onValuesChange = props.onValuesChange, isResetAndClear = props.isResetAndClear, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, type = props.type, directionColumn = props.directionColumn, isToggle = props.isToggle, toggleNum = props.toggleNum, defaultToggle = props.defaultToggle, restProps = __rest(props, ["form", "bottomBorder", "isFlex", "wrapClassName", "leftClassName", "itemClassName", "rightWrapVisible", "rightClassName", "children", "dynamicKey", "dynamicVersion", "formPreferences", "items", "outsideState", "onValuesChange", "isResetAndClear", "onResetHandle", "onSearchHandle", "type", "directionColumn", "isToggle", "toggleNum", "defaultToggle"]);
     // 获取新的items 如果传入了配置项的话，配置项优先
     var configInfoItems = useFormPreferencesCreateNewItems(formPreferences, items).configInfoItems;
     // 根据items 和 dynamicKey 获取到动态列配置信息
-    var _b = useDynamicListByItems(configInfoItems, dynamicKey, formPreferences), dynamicList = _b.dynamicList, onCurrentListChange = _b.onCurrentListChange, newItems = _b.newItems, dynamicSettingRef = _b.dynamicSettingRef;
+    var _b = useDynamicListByItems(configInfoItems, {
+        dynamicKey: dynamicKey,
+        formPreferences: formPreferences,
+        dynamicVersion: dynamicVersion,
+    }), dynamicList = _b.dynamicList, onCurrentListChange = _b.onCurrentListChange, newItems = _b.newItems, dynamicSettingRef = _b.dynamicSettingRef;
     // 主容器类名
     var wrapClasses = classNames("ztxk-form", wrapClassName, {
         "ztxk-form--bottom-border": bottomBorder,

package/dist/es/form/hooks.js

@@ -1,6 +1,6 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { useMemo, useRef, useEffect, useState, useCallback } from 'react';
-import { getCurrentDynamicItems } from '../dynamicsetting/useDynamic.js';
+import { getCurrentDynamicItems, getDynamicVersionByKey, setDynamicVersionByKey } from '../dynamicsetting/useDynamic.js';
 import { FORM_DYNAMIC_KEY } from './form.js';
 import cloneDeep from 'lodash/cloneDeep';
 
@@ -20,7 +20,8 @@ function useFormPreferencesCreateNewItems(formPreferences, items) {
     return { configInfoItems: configInfoItems };
 }
 // 根据新的表单项items 经过 dynamic处理后 得到最新的配置信息
-function useDynamicListByItems(items, dynamicKey, formPreferences) {
+function useDynamicListByItems(items, options) {
+    var dynamicKey = options.dynamicKey, dynamicVersion = options.dynamicVersion, formPreferences = options.formPreferences;
     // 动态列配置手动刷新基础配置
     var dynamicSettingRef = useRef({});
     // 根据子元素生成动态列配置信息
@@ -85,6 +86,25 @@ function useDynamicListByItems(items, dynamicKey, formPreferences) {
         }
         return result;
     }, [items, currentDynamicList]);
+    // 对比版本号，如果版本号较新那么需要重置表格列配置。如果版本号本来不存在，是新增的 也需要重置表格列配置。
+    useEffect(function () {
+        var _a, _b;
+        // 如果不需要版本比对
+        if (typeof dynamicVersion !== "number") {
+            return;
+        }
+        // 如果没有列配置缓存
+        if (!dynamicKey) {
+            return;
+        }
+        // 取到本地版本号
+        var localDynamicVersion = getDynamicVersionByKey(FORM_DYNAMIC_KEY, dynamicKey);
+        // 如果本地版本号小于传入版本号，需要更新
+        if (localDynamicVersion < dynamicVersion) {
+            (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.resetList) === null || _b === void 0 ? void 0 : _b.call(_a);
+            setDynamicVersionByKey(FORM_DYNAMIC_KEY, dynamicKey, dynamicVersion);
+        }
+    }, [dynamicKey, dynamicVersion]);
     return {
         dynamicList: dynamicList,
         currentDynamicList: currentDynamicList,

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

@@ -61,6 +61,11 @@ interface IProFormProps extends FormProps {
      * 动态列配置
      */
     dynamicKey?: string;
+    /**
+     * 动态列配置版本。版本号高的可以覆盖用户本地配置。
+     * 就按数字往上递增的规则就行 1 2 3 4 5这种
+     */
+    dynamicVersion?: number;
     /** 表单布局 默认是横向 设置为true后 为纵向布局 */
     directionColumn?: boolean;
     /**

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

@@ -261,6 +261,11 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 是否开启动态列配置
      */
     dynamicKey?: string;
+    /**
+     * 动态列配置版本。版本号高的可以覆盖用户本地配置。
+     * 就按数字往上递增的规则就行 1 2 3 4 5这种
+     */
+    dynamicVersion?: number;
     /**
      * 增加了column的表头过滤功能；如果想要过滤功能持久化，可以配置这个属性
      * 同时也需要配置dynamicKey配置。

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

@@ -1,5 +1,11 @@
 import { TableComponent } from './interface.js';
 
-declare const MemoTable: TableComponent<any>;
+declare const MemoTable: TableComponent<any>;
+/**
+ * BUG: 之前在业务处遇到一个很奇怪的bug。
+ * 业务通过isDisplay来控制表格列的显隐，导致newColumns的数据少了好几个。
+ * 但是页面的显示的列却是正常。这个在组件库中无法复现。
+ * 导致的问题是验证的时候，这些数据中没有的列无法得到验证
+ */
 
 export { MemoTable as default };

package/dist/es/table/table.js

@@ -35,10 +35,10 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // completed: 实现表头自定义伸缩
 // completed: 排序功能优化
 // completed: 过滤功能
-// TODO: 实现从execl复制到表格中的功能
+// completed: 实现从execl复制到表格中的功能
 var Table = function (props) {
     // console.log("表格渲染");
-    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom"]);
+    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -48,7 +48,7 @@ var Table = function (props) {
     // 比如过滤某些列 不做展示
     var columns = useParseColumns(_columns);
     // 得到动态列配置信息
-    var _p = useDynamicListByColumns(columns, dynamicKey), defaultDynamicList = _p.defaultDynamicList, onCurrentListChange = _p.onCurrentListChange, currentDynamicList = _p.currentDynamicList, dynamicSettingRef = _p.dynamicSettingRef;
+    var _p = useDynamicListByColumns(columns, { dynamicKey: dynamicKey, dynamicVersion: dynamicVersion }), defaultDynamicList = _p.defaultDynamicList, onCurrentListChange = _p.onCurrentListChange, currentDynamicList = _p.currentDynamicList, dynamicSettingRef = _p.dynamicSettingRef;
     // 因为内部分页需要知晓当前页面的数据展示，要不然数据排序就跟内部分页没关系了
     // 自定义排序方法
     var _q = useCustomSort(dataSource, onTableChange, {

package/dist/es/table/useDynamicListByColumns.js

@@ -1,5 +1,5 @@
 import { useRef, useMemo, useState, useEffect, useCallback } from 'react';
-import { getCurrentDynamicItems } from '../dynamicsetting/useDynamic.js';
+import { getCurrentDynamicItems, getDynamicVersionByKey, setDynamicVersionByKey } from '../dynamicsetting/useDynamic.js';
 import { TABLE_DYNAMIC_KEY } from './constant.js';
 import isEqual from 'lodash/isEqual';
 
@@ -60,7 +60,8 @@ function getDynamicList(dynamicKey, columns) {
     }
     return result;
 }
-function useDynamicListByColumns(columns, dynamicKey) {
+function useDynamicListByColumns(columns, options) {
+    var dynamicKey = options.dynamicKey, dynamicVersion = options.dynamicVersion;
     // 动态列配置手动刷新基础配置
     var dynamicSettingRef = useRef(null);
     // 初始化list
@@ -91,6 +92,25 @@ function useDynamicListByColumns(columns, dynamicKey) {
             return defaultDynamicList;
         });
     }, [dynamicKey, columns]);
+    // 对比版本号，如果版本号较新那么需要重置表格列配置。如果版本号本来不存在，是新增的 也需要重置表格列配置。
+    useEffect(function () {
+        var _a, _b;
+        // 如果不需要版本比对
+        if (typeof dynamicVersion !== "number") {
+            return;
+        }
+        // 如果没有列配置缓存
+        if (!dynamicKey) {
+            return;
+        }
+        // 取到本地版本号
+        var localDynamicVersion = getDynamicVersionByKey(TABLE_DYNAMIC_KEY, dynamicKey);
+        // 如果本地版本号小于传入版本号，需要更新
+        if (localDynamicVersion < dynamicVersion) {
+            (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.resetList) === null || _b === void 0 ? void 0 : _b.call(_a);
+            setDynamicVersionByKey(TABLE_DYNAMIC_KEY, dynamicKey, dynamicVersion);
+        }
+    }, [dynamicKey, dynamicVersion]);
     var onCurrentListChange = useCallback(function (newDynamicList) {
         // console.log(newDynamicList);
         setCurrentDynamicList(newDynamicList);

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

@@ -57,6 +57,8 @@ interface IUploadListProps extends Omit<UploadProps, "onChange"> {
     fieldNames?: IUploadFieldNames;
     /** 表格列自定义 */
     tableColumns?: (IColumnsTypeProp<any> | string)[];
+    /** 选择文件前的校验 */
+    onBeforeSelectFileValidate?: () => Promise<boolean>;
 }
 interface IUploadFieldNames {
     attachId?: string;