zmdms-webui 1.0.7 → 1.0.9

package/dist/es/button/button.js

@@ -40,13 +40,21 @@ var Button = function (props) {
                     _a.sent();
                     _a.label = 3;
                 case 3:
-                    setLoading(false);
-                    currentBtn.current.canClick = true;
+                    // 防止onClick内部没有开启微任务
+                    // 当连续点击三次按钮：创建了三个任务在队列中
+                    // 如果点击事件中，有同步任务阻塞，但是没有异步任务，那么点击的三个任务还是会依次执行（导致重复点击）
+                    // 此时执行完onClick后 再开启一个宏任务，可以先执行排队中的三个任务，这样 canClick还是false，不会重复执行点击事件
+                    setTimeout(function () {
+                        setLoading(false);
+                        currentBtn.current.canClick = true;
+                    });
                     return [3 /*break*/, 5];
                 case 4:
                     err_1 = _a.sent();
-                    setLoading(false);
-                    currentBtn.current.canClick = true;
+                    setTimeout(function () {
+                        setLoading(false);
+                        currentBtn.current.canClick = true;
+                    });
                     throw err_1;
                 case 5: return [2 /*return*/];
             }

package/dist/es/button/buttonExport.js

@@ -84,6 +84,6 @@ var ButtonExport = function (props) {
     }); };
     return (jsx(ButtonCom, __assign({ type: "default", loading: loading, onClick: onClickHandle }, resetProps)));
 };
-ButtonExport.displayName = "ZTXK_WEBUI_ButtonExport";
+ButtonExport.displayName = "ZTXK_WEBUI_Button.Export";
 
 export { ButtonExport as default };

package/dist/es/button/buttonPreview.js

@@ -29,6 +29,6 @@ var ButtonPreview = function (props) {
     }); };
     return jsx(ButtonCom, __assign({ type: "link", onClick: onClickHandle }, resetProps));
 };
-ButtonPreview.displayName = "ZTXK_WEBUI_ButtonPreview";
+ButtonPreview.displayName = "ZTXK_WEBUI_Button.Preview";
 
 export { ButtonPreview as default };

package/dist/es/select/hooks.js

@@ -34,8 +34,12 @@ var concatHandle = function (arr1, _a) {
     });
 };
 function createRenderItem(item, options) {
-    var _a = options.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = options.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = options.joinKey, _c = options.joinStr, joinStr = _c === void 0 ? "-" : _c, lineFeedKey = options.lineFeedKey, _d = options.lineFeedStr, lineFeedStr = _d === void 0 ? "-" : _d;
-    var key = item[dataKey];
+    var _a = options.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = options.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = options.joinKey, _c = options.joinStr, joinStr = _c === void 0 ? "-" : _c, lineFeedKey = options.lineFeedKey, _d = options.lineFeedStr, lineFeedStr = _d === void 0 ? "-" : _d, createKey = options.createKey, createId = options.createId, index = options.index;
+    // 自定义id值
+    if (createId) {
+        item[dataKey] = createId(item, index);
+    }
+    var key = createKey ? createKey(item, index) : item[dataKey];
     var value = item[dataKey];
     var title = unescapeString(item[titleKey]);
     // 处理拼接展示的数据
@@ -74,7 +78,7 @@ function createRenderItem(item, options) {
     };
 }
 function useRenderChildren(props) {
-    var list = props.list, defaultList = props.defaultList, _a = props.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = props.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = props.joinKey, joinStr = props.joinStr, lineFeedKey = props.lineFeedKey, lineFeedStr = props.lineFeedStr, showAll = props.showAll, children = props.children, disabledValues = props.disabledValues;
+    var list = props.list, defaultList = props.defaultList, _a = props.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = props.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = props.joinKey, joinStr = props.joinStr, lineFeedKey = props.lineFeedKey, lineFeedStr = props.lineFeedStr, showAll = props.showAll, children = props.children, disabledValues = props.disabledValues, createKey = props.createKey, createId = props.createId;
     var resultList = useMemo(function () {
         return concatHandle(list, {
             arr2: defaultList,
@@ -99,6 +103,9 @@ function useRenderChildren(props) {
                             joinStr: joinStr,
                             lineFeedKey: lineFeedKey,
                             lineFeedStr: lineFeedStr,
+                            createKey: createKey,
+                            createId: createId,
+                            index: index,
                         }), key = _a.key, value = _a.value, title = _a.title, joinTitleStr = _a.joinTitleStr, resultTitle = _a.resultTitle, linefeedTitle = _a.linefeedTitle;
                         // 处理是否禁用
                         var disabled = item === null || item === void 0 ? void 0 : item.disabled;
@@ -106,11 +113,11 @@ function useRenderChildren(props) {
                             disabledValues.includes(value)) {
                             disabled = true;
                         }
-                        return (jsxs(MemoSelect.Option
-                        // key={`${key}${index}`}
-                        , __assign({ value: value, 
+                        return (jsxs(MemoSelect.Option, __assign({ 
+                            // key={key}
+                            value: value, 
                             // 原本传入需要显示的title
-                            oldTitle: title, joinTitle: joinTitleStr, title: resultTitle, disabled: disabled }, { children: [resultTitle, Array.isArray(linefeedTitle) && linefeedTitle.length > 0 ? (jsx("div", __assign({ className: "ztxk-select--feed-item" }, { children: linefeedTitle === null || linefeedTitle === void 0 ? void 0 : linefeedTitle.join(lineFeedStr) }))) : ("")] }), key));
+                            oldTitle: title, joinTitle: joinTitleStr, title: resultTitle, disabled: disabled }, { children: [resultTitle, Array.isArray(linefeedTitle) && linefeedTitle.length > 0 ? (jsx("div", __assign({ className: "ztxk-select--feed-item" }, { children: linefeedTitle === null || linefeedTitle === void 0 ? void 0 : linefeedTitle.join(lineFeedStr) }))) : ("")] }), "".concat(key).concat(index)));
                     })] }));
         }
         return null;

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

@@ -11,6 +11,14 @@ interface ISelectProps extends SelectProps {
      * 默认渲染的列表
      */
     defaultList?: any[];
+    /**
+     * 遍历数据的key值
+     */
+    createKey?: (data: any, index?: number) => string;
+    /**
+     * 自定义id键值
+     */
+    createId?: (data: any, index?: number) => string;
     /**
      * data key
      */

package/dist/es/select/select.js

@@ -24,7 +24,7 @@ function textContent(children) {
     return "";
 }
 var Select = function (props, ref) {
-    var list = props.list, defaultList = props.defaultList, _a = props.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = props.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = props.joinKey, _c = props.joinStr, joinStr = _c === void 0 ? "-" : _c, lineFeedKey = props.lineFeedKey, _d = props.lineFeedStr, lineFeedStr = _d === void 0 ? "-" : _d, showAll = props.showAll, children = props.children, disabledValues = props.disabledValues, _e = props.dropdownMatchSelectWidth, dropdownMatchSelectWidth = _e === void 0 ? 100 : _e, onChange = props.onChange, onSearch = props.onSearch, isRemoteSearch = props.isRemoteSearch, dropdownButton = props.dropdownButton, dropdownRender = props.dropdownRender, resetProps = __rest(props, ["list", "defaultList", "dataKey", "titleKey", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "showAll", "children", "disabledValues", "dropdownMatchSelectWidth", "onChange", "onSearch", "isRemoteSearch", "dropdownButton", "dropdownRender"]);
+    var list = props.list, defaultList = props.defaultList, createKey = props.createKey, createId = props.createId, _a = props.dataKey, dataKey = _a === void 0 ? "id" : _a, _b = props.titleKey, titleKey = _b === void 0 ? "name" : _b, joinKey = props.joinKey, _c = props.joinStr, joinStr = _c === void 0 ? "-" : _c, lineFeedKey = props.lineFeedKey, _d = props.lineFeedStr, lineFeedStr = _d === void 0 ? "-" : _d, showAll = props.showAll, children = props.children, disabledValues = props.disabledValues, _e = props.dropdownMatchSelectWidth, dropdownMatchSelectWidth = _e === void 0 ? 100 : _e, onChange = props.onChange, onSearch = props.onSearch, isRemoteSearch = props.isRemoteSearch, dropdownButton = props.dropdownButton, dropdownRender = props.dropdownRender, resetProps = __rest(props, ["list", "defaultList", "createKey", "createId", "dataKey", "titleKey", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "showAll", "children", "disabledValues", "dropdownMatchSelectWidth", "onChange", "onSearch", "isRemoteSearch", "dropdownButton", "dropdownRender"]);
     // 记录当前选中项 只有当多选模式下 才需要用到这个选项
     var _f = useRemeberCheckedValues(), parseCheckedValues = _f.parseCheckedValues, currentCheckedValuesRef = _f.currentCheckedValuesRef;
     /**
@@ -44,6 +44,8 @@ var Select = function (props, ref) {
         disabledValues: disabledValues,
         value: resetProps.value,
         mode: resetProps.mode,
+        createKey: createKey,
+        createId: createId,
     }), renderChildren = _g.renderChildren, resultList = _g.resultList;
     // 非change触发记录下选中项
     var _h = useInitRemeberCheckedValues({

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

@@ -295,7 +295,7 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
     innerPaginationPageSize?: number;
     innerPaginationPosition?: string[];
     innerPaginationPageSizeOptions?: TablePaginationConfig["pageSizeOptions"];
-    innerPaginationConfig?: Omit<TablePaginationConfig, "pageSizeOptions" | "pageSize" | "position">;
+    innerPaginationConfig?: TablePaginationConfig;
     tableRefHandle?: React.MutableRefObject<ITableRefHandel>;
     /**
      * 表格的名字 一个页面存在多个表格时 发起表格验证时，可以提示哪个表格出现问题

package/dist/es/table/useInnerPagination.js

@@ -52,7 +52,7 @@ function useInnerPagination(isInnerPagination, innerPaginationPageSize, options)
             }
         }
     }, [dataSource, isInnerPagination]);
-    var paginationConfig = useMemo(function () { return (__assign(__assign({}, innerPaginationConfig), { className: "ztxk-pagination ztxk-table-pagination", current: current, pageSize: pageSize, onChange: function (page, pageSize) {
+    var paginationConfig = useMemo(function () { return (__assign({ className: "ztxk-pagination ztxk-table-pagination", current: current, pageSize: pageSize, onChange: function (page, pageSize) {
             if (isInnerPagination) {
                 setCurrent(page);
                 setPageSize(pageSize);
@@ -62,7 +62,7 @@ function useInnerPagination(isInnerPagination, innerPaginationPageSize, options)
                     pageSize: Number(pageSize),
                 };
             }
-        }, hideOnSinglePage: true, position: innerPaginationPosition, defaultPageSize: pageSize, pageSizeOptions: innerPaginationPageSizeOptions })); }, [
+        }, hideOnSinglePage: true, position: innerPaginationPosition, defaultPageSize: pageSize, pageSizeOptions: innerPaginationPageSizeOptions }, innerPaginationConfig)); }, [
         isInnerPagination,
         current,
         pageSize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",