zmdms-webui 0.0.95 → 0.0.96

package/dist/es/form/form.js

@@ -62,14 +62,19 @@ var Form = function (props, ref) {
             var nameKeys = Object.keys(itemsShouldUpdate);
             nameKeys.forEach(function (nameKey) {
                 var _a;
-                var _b;
                 var shouldUpdateClear = itemsShouldUpdate[nameKey]
                     ? itemsShouldUpdate[nameKey]
                     : [];
                 if (keys_1.find(function (key) { return shouldUpdateClear.includes(key); })) {
-                    (_b = form === null || form === void 0 ? void 0 : form.setFieldsValue) === null || _b === void 0 ? void 0 : _b.call(form, (_a = {},
-                        _a[nameKey] = undefined,
-                        _a));
+                    // 这里用undefined当清空值得话，会有点问题。
+                    // https://github.com/react-component/select/commit/305b3dcfe627482686055a1ec9c34705623d807f
+                    // 对于下拉框来说 会报这个警告 `label` of `value` is not same as `label` in Select options.
+                    // 暂时不知道如何消除这个警告 yong null 和 "" 都可以
+                    // TODO: 暂时改成null
+                    (_a = form === null || form === void 0 ? void 0 : form.setFieldValue) === null || _a === void 0 ? void 0 : _a.call(form, nameKey, null);
+                    // form?.setFieldsValue?.({
+                    //   [nameKey]: undefined,
+                    // });
                 }
             });
         }

package/dist/es/select/hooks.js

@@ -40,7 +40,7 @@ function useRenderChildren(props) {
             return children;
         }
         if (Array.isArray(resultList)) {
-            return (jsxs(Fragment, { children: [showAll && (jsx(MemoSelect.Option, __assign({ title: "\u5168\u90E8", value: "" }, { children: "\u5168\u90E8" }))), resultList === null || resultList === void 0 ? void 0 : resultList.map(function (item, index) {
+            return (jsxs(Fragment, { children: [showAll ? (jsx(MemoSelect.Option, __assign({ title: "\u5168\u90E8", value: "" }, { children: "\u5168\u90E8" }))) : null, resultList === null || resultList === void 0 ? void 0 : resultList.map(function (item, index) {
                         if (!item) {
                             console.error("\u9ED8\u8BA4\u6570\u636E\u4E2D\u6709\u7A7A\u503C \u4F4D\u7F6E\u518Dlist\u4E2D\u7B2C".concat(index + 1, "\u9879"));
                             return null;
@@ -77,7 +77,9 @@ function useRenderChildren(props) {
                             disabledValues.includes(value)) {
                             disabled = true;
                         }
-                        return (jsxs(MemoSelect.Option, __assign({ value: value, title: title, disabled: disabled }, { children: [Array.isArray(joinTitle) ? joinTitle === null || joinTitle === void 0 ? void 0 : joinTitle.join(joinStr) : "", 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 (jsxs(MemoSelect.Option
+                        // key={`${key}${index}`}
+                        , __assign({ value: value, title: title, disabled: disabled }, { children: [Array.isArray(joinTitle) ? joinTitle === null || joinTitle === void 0 ? void 0 : joinTitle.join(joinStr) : "", 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));
                     })] }));
         }
         return null;

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

@@ -8,18 +8,21 @@ import MemoInput from '../../input/input.js';
 import InputNumber from '../../inputnumber/inputNumber.js';
 
 var EnhanceCell = function (props) {
-    var record = props.record, propsIndex = props.index, editable = props.editable, editableConfig = props.editableConfig, dataIndex = props.dataIndex; props.title; var onEditableSave = props.onEditableSave; props.onMouseEnter; props.onMouseLeave; var children = props.children, currentPage = props.currentPage, isValidate = props.isValidate, resetProps = __rest(props, ["record", "index", "editable", "editableConfig", "dataIndex", "title", "onEditableSave", "onMouseEnter", "onMouseLeave", "children", "currentPage", "isValidate"]);
+    var _a;
+    var record = props.record, propsIndex = props.index, editable = props.editable, editableConfig = props.editableConfig, dataIndex = props.dataIndex; props.title; var onEditableSave = props.onEditableSave, dataSourceRef = props.dataSourceRef; props.onMouseEnter; props.onMouseLeave; var children = props.children, currentPage = props.currentPage, isValidate = props.isValidate, resetProps = __rest(props, ["record", "index", "editable", "editableConfig", "dataIndex", "title", "onEditableSave", "dataSourceRef", "onMouseEnter", "onMouseLeave", "children", "currentPage", "isValidate"]);
     // 设置最新的index
     var index = getInnerIndex(currentPage, propsIndex);
+    // 最新的record
+    var newRecord = ((_a = dataSourceRef === null || dataSourceRef === void 0 ? void 0 : dataSourceRef.current) === null || _a === void 0 ? void 0 : _a[index]) || record;
     // 当前数据
-    var _a = useState(record ? record[dataIndex] : undefined), val = _a[0], setVal = _a[1];
+    var _b = useState(newRecord ? newRecord[dataIndex] : undefined), val = _b[0], setVal = _b[1];
     // 当前是否是编辑状态 性能优化，显示纯字段比显示一个完整的组件 性能要高出许多
-    var _b = useEditing(), editing = _b.editing, toggleEdit = _b.toggleEdit;
+    var _c = useEditing(), editing = _c.editing, toggleEdit = _c.toggleEdit;
     // 输入框ref对象
     var iptRef = useIptRef(editing);
     // 单元格Ref
-    var _c = useTdRef(), tdRef = _c.tdRef, removeErrorClass = _c.removeErrorClass;
-    var data = record === null || record === void 0 ? void 0 : record[dataIndex];
+    var _d = useTdRef(), tdRef = _d.tdRef, removeErrorClass = _d.removeErrorClass;
+    var data = newRecord === null || newRecord === void 0 ? void 0 : newRecord[dataIndex];
     // 外部更新值时，需要取这个值
     useEffect(function () {
         setVal(data);
@@ -31,17 +34,17 @@ var EnhanceCell = function (props) {
             throw Error("如果开启了editable， 那么必须传递 onEditableSave属性 来更改表格数据!");
         }
         toggleEdit();
-        onEditableSave(__assign(__assign({}, record), (_a = {}, _a[dataIndex] = val, _a)), index, dataIndex);
+        onEditableSave(__assign(__assign({}, newRecord), (_a = {}, _a[dataIndex] = val, _a)), index, dataIndex);
     };
     // 如果开启编辑 那么内部直接代理
-    if (typeof editable === "function" ? editable(record) : editable) {
-        var _d = editableConfig || {
+    if (typeof editable === "function" ? editable(newRecord) : editable) {
+        var _e = editableConfig || {
             type: "input",
-        }, type = _d.type, max = _d.max, min = _d.min, maxHandle = _d.maxHandle, minHandle = _d.minHandle, disabled = _d.disabled, disabledHandle = _d.disabledHandle, resetEditableConfigProps = __rest(_d, ["type", "max", "min", "maxHandle", "minHandle", "disabled", "disabledHandle"]);
+        }, type = _e.type, max = _e.max, min = _e.min, maxHandle = _e.maxHandle, minHandle = _e.minHandle, disabled = _e.disabled, disabledHandle = _e.disabledHandle, resetEditableConfigProps = __rest(_e, ["type", "max", "min", "maxHandle", "minHandle", "disabled", "disabledHandle"]);
         var CurrentReactNode = null;
         var newChildren = children;
         var resultDisabled = disabledHandle
-            ? disabledHandle(record)
+            ? disabledHandle(newRecord)
             : disabled;
         // 输入框处理
         if (type === "input") {
@@ -54,8 +57,8 @@ var EnhanceCell = function (props) {
         }
         // 数字输入框处理
         if (type === "inputNumber") {
-            var resultMax_1 = maxHandle ? maxHandle(record) : max;
-            var resultmin_1 = minHandle ? minHandle(record) : min;
+            var resultMax_1 = maxHandle ? maxHandle(newRecord) : max;
+            var resultmin_1 = minHandle ? minHandle(newRecord) : min;
             CurrentReactNode = (jsx(InputNumber, __assign({ value: val, onChange: function (value) {
                     if (typeof value === "number") {
                         if (typeof resultMax_1 === "number" && value > resultMax_1) {

package/dist/es/table/table.js

@@ -1,6 +1,6 @@
 import { __rest, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { memo, useRef, useEffect, useMemo, useCallback, useImperativeHandle } from 'react';
+import { memo, useMemo, useCallback, useImperativeHandle } from 'react';
 import { Table as Table$1 } from 'antd';
 import { BasicBodyRow, MoveBodyRow } from './components/EnhanceBodyRow.js';
 import EnhanceCell from './components/EnhanceBodyCell.js';
@@ -19,6 +19,7 @@ import { HTML5Backend } from '../node_modules/react-dnd-html5-backend/dist/index
 import { VList, scrollTo } from '../node_modules/virtuallist-antd/dist/index.es.js';
 import useTableValidate, { tableValidate } from './useTableValidate.js';
 import TitleDirectionColumn from './components/TitleDirectionColumn.js';
+import { useLatest } from 'ahooks';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js';
 
@@ -37,10 +38,7 @@ var Table = function (props) {
         "ztxk-table--flex": isFlex,
     });
     // 将表格数据 在 Ref中 存储一份
-    var dataSourceRef = useRef();
-    useEffect(function () {
-        dataSourceRef.current = dataSource;
-    }, [dataSource]);
+    var dataSourceRef = useLatest(dataSource);
     // 得到动态列配置信息
     var _j = useDynamicListByColumns(columns, dynamicKey), defaultDynamicList = _j.defaultDynamicList, onCurrentListChange = _j.onCurrentListChange, currentDynamicList = _j.currentDynamicList, dynamicSettingRef = _j.dynamicSettingRef;
     // 针对SCU和增减行 做特殊处理

package/dist/es/table/useColumns.js

@@ -58,6 +58,7 @@ function useColumns(columns, options) {
                     onEditableSave: onEditableSave,
                     currentPage: currentPage,
                     isValidate: validate ? true : false,
+                    dataSourceRef: dataSourceRef,
                 });
             };
         }