ztxkui 10.0.92 → 10.0.94

package/dist/DemoCom/TableDemo.js

@@ -931,6 +931,35 @@ var TableDemo = function () {
             React.createElement(Button, { onClick: function () {
                     setRecords(function (state) { return __spreadArray([], state); });
                 } }, "clearKeys")),
+        React.createElement("div", null,
+            React.createElement("button", { onClick: function () { return console.log(records); } }, "\u83B7\u53D6\u6570\u636E"),
+            React.createElement(Button, { loading: btnLoading, onClick: function () {
+                    console.log(111);
+                    (function () {
+                        return __awaiter(this, void 0, void 0, function () {
+                            var err_2, errorFields;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, , 3]);
+                                        return [4 /*yield*/, tableHandleRef.current.validate()];
+                                    case 1:
+                                        _a.sent();
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        err_2 = _a.sent();
+                                        console.log(err_2);
+                                        errorFields = err_2.errorFields;
+                                        if (errorFields) {
+                                            message.warning(errorFields[0].errors + '');
+                                        }
+                                        return [3 /*break*/, 3];
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        });
+                    })();
+                } }, "\u70B9\u51FB")),
         React.createElement(Table
         // 如果需要保留本地偏好，那么这里需要预处理一下columns数据
         // columns={getTableLayoutFullData(columns, tableLayout)}
@@ -946,7 +975,7 @@ var TableDemo = function () {
             showColumnDynamic: true, showColumnDynamicKey: "testkey", 
             // onDynamicChange={onDynamicChange}
             // 表格项可输入
-            // onEditableSave={onEditableSaveHandle}
+            onEditableSave: onEditableSaveHandle, virtualTableKey: "virtualTableKey", 
             // 新增删除行
             onAddAndDelHandle: onAddAndDelHandle, 
             // 表格行拖拽

package/dist/components/EnhanceSelect/index.d.ts

@@ -66,6 +66,12 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
      * 更新只能通过刷新页面来实现，或者查询条件发生改变
      */
     isCatch?: boolean;
+    /**
+     * 通过request做接口缓存的时候 isCatch 还会有一些条件过滤
+     * 比如page结尾的接口不会缓存 需要传入 mustCatch 才会必须缓存
+     * 因为不是所有的接口都是page结尾就不缓存的 所以这里默认使用缓存
+     */
+    mustCatch?: boolean;
     /**
      * 数据加载完毕触发
      */
@@ -170,6 +176,6 @@ export declare function clearCatchData(url: string): void;
  *    { code: 200, data: { records: [] } } || { status: 200, data: { code: 200, data: { records: [] } } }
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
-declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, timeout, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, onSearch, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, isRemoteSearchDataKey, transformData, transformRenderData, joinKey, joinStr, lineFeedKey, lineFeedStr, mustHasParams, disabledValues, searchDeleteKeys, isHandAddItem, isPage, currentSize, isCopy, onBlur, onFocus, isClickRequest, handleRef, isPaste, pasteRule, dropdownRenderBtns, dropdownMatchSelectWidth, onContextMenuCapture, isPinyinSearch, ...restProps }: IProps<VT>): JSX.Element;
+declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, timeout, dataKey, componentKey, titleKey, showAll, isCatch, mustCatch, onCompleted, onChange, onSearch, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, isRemoteSearchDataKey, transformData, transformRenderData, joinKey, joinStr, lineFeedKey, lineFeedStr, mustHasParams, disabledValues, searchDeleteKeys, isHandAddItem, isPage, currentSize, isCopy, onBlur, onFocus, isClickRequest, handleRef, isPaste, pasteRule, dropdownRenderBtns, dropdownMatchSelectWidth, onContextMenuCapture, isPinyinSearch, ...restProps }: IProps<VT>): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof EnhanceSelect>;
 export default _default;

package/dist/components/EnhanceSelect/index.js

@@ -168,7 +168,7 @@ function clearNullData(arr, dataKey, titleKey) {
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
 function EnhanceSelect(_a) {
-    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.timeout, timeout = _c === void 0 ? 60000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, onSearch = _a.onSearch, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, transformRenderData = _a.transformRenderData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, lineFeedKey = _a.lineFeedKey, _h = _a.lineFeedStr, lineFeedStr = _h === void 0 ? '-' : _h, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, searchDeleteKeys = _a.searchDeleteKeys, isHandAddItem = _a.isHandAddItem, isPage = _a.isPage, _j = _a.currentSize, currentSize = _j === void 0 ? 30 : _j, isCopy = _a.isCopy, onBlur = _a.onBlur, onFocus = _a.onFocus, isClickRequest = _a.isClickRequest, handleRef = _a.handleRef, isPaste = _a.isPaste, _k = _a.pasteRule, pasteRule = _k === void 0 ? [',', '-', '\r\n', '\r', '\n', ' '] : _k, dropdownRenderBtns = _a.dropdownRenderBtns, _l = _a.dropdownMatchSelectWidth, dropdownMatchSelectWidth = _l === void 0 ? 150 : _l, onContextMenuCapture = _a.onContextMenuCapture, _m = _a.isPinyinSearch, isPinyinSearch = _m === void 0 ? true : _m, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "onSearch", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "transformRenderData", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "mustHasParams", "disabledValues", "searchDeleteKeys", "isHandAddItem", "isPage", "currentSize", "isCopy", "onBlur", "onFocus", "isClickRequest", "handleRef", "isPaste", "pasteRule", "dropdownRenderBtns", "dropdownMatchSelectWidth", "onContextMenuCapture", "isPinyinSearch"]);
+    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.timeout, timeout = _c === void 0 ? 60000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, mustCatch = _a.mustCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, onSearch = _a.onSearch, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, transformRenderData = _a.transformRenderData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, lineFeedKey = _a.lineFeedKey, _h = _a.lineFeedStr, lineFeedStr = _h === void 0 ? '-' : _h, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, searchDeleteKeys = _a.searchDeleteKeys, isHandAddItem = _a.isHandAddItem, isPage = _a.isPage, _j = _a.currentSize, currentSize = _j === void 0 ? 30 : _j, isCopy = _a.isCopy, onBlur = _a.onBlur, onFocus = _a.onFocus, isClickRequest = _a.isClickRequest, handleRef = _a.handleRef, isPaste = _a.isPaste, _k = _a.pasteRule, pasteRule = _k === void 0 ? [',', '-', '\r\n', '\r', '\n', ' '] : _k, dropdownRenderBtns = _a.dropdownRenderBtns, _l = _a.dropdownMatchSelectWidth, dropdownMatchSelectWidth = _l === void 0 ? 150 : _l, onContextMenuCapture = _a.onContextMenuCapture, _m = _a.isPinyinSearch, isPinyinSearch = _m === void 0 ? true : _m, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "mustCatch", "onCompleted", "onChange", "onSearch", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "transformRenderData", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "mustHasParams", "disabledValues", "searchDeleteKeys", "isHandAddItem", "isPage", "currentSize", "isCopy", "onBlur", "onFocus", "isClickRequest", "handleRef", "isPaste", "pasteRule", "dropdownRenderBtns", "dropdownMatchSelectWidth", "onContextMenuCapture", "isPinyinSearch"]);
     // TODO: 注释动态设置open逻辑 start
     // const currentClick = useRef<boolean>(true);
     // TODO: 注释动态设置open逻辑 end
@@ -250,7 +250,7 @@ function EnhanceSelect(_a) {
         // 利用闭包，存到当前请求的id
         fetchId.current++;
         var fetchIdClosure = fetchId.current;
-        getData(request, options)
+        getData(request, __assign(__assign({}, options), { mustCatch: mustCatch }))
             .then(function (resData) {
             var _a, _b;
             (_a = otherObj === null || otherObj === void 0 ? void 0 : otherObj.successCallback) === null || _a === void 0 ? void 0 : _a.call(otherObj);
@@ -291,7 +291,7 @@ function EnhanceSelect(_a) {
     }, 
     // 去掉 transformData 作为依赖，这个会触发副作用
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [setSelectList, setLoading, mustHasParams]);
+    [setSelectList, setLoading, mustHasParams, mustCatch]);
     // 分词粘贴
     function pasteHandle(value) {
         if (isPaste && restProps.mode === 'multiple') {
@@ -361,7 +361,8 @@ function EnhanceSelect(_a) {
             searchParams[searchDataKey] = dataKeyValue + '';
         }
         getData(request, __assign({ url: url,
-            method: method, params: __assign(__assign({ size: Array.isArray(dataKeyValue) && dataKeyValue.length > currentSize
+            method: method,
+            mustCatch: mustCatch, params: __assign(__assign({ size: Array.isArray(dataKeyValue) && dataKeyValue.length > currentSize
                     ? dataKeyValue.length
                     : currentSize, current: (otherObj === null || otherObj === void 0 ? void 0 : otherObj.currentPage) ? otherObj === null || otherObj === void 0 ? void 0 : otherObj.currentPage : 1 }, outParams), searchParams) }, ((otherObj === null || otherObj === void 0 ? void 0 : otherObj.options) || {})))
             .then(function (resData) {
@@ -427,6 +428,7 @@ function EnhanceSelect(_a) {
         setMultipleList,
         searchDeleteKeys,
         currentSize,
+        mustCatch,
     ]);
     var searchHandle = function (value) {
         var _a;

package/dist/components/Table/table.js

@@ -719,8 +719,7 @@ function Table(props) {
         return myScroll;
     }, [scroll, isFlex, virtual]);
     useEffect(function () {
-        if (onEditableSave)
-            return;
+        // if (onEditableSave) return;
         if (virtualTableKey) {
             if (isVirtialInit.current) {
                 setVirtual(virtualTableKey);
@@ -728,7 +727,9 @@ function Table(props) {
                 isVirtialInit.current = false;
             }
         }
-        else if (expandableDataSource && (expandableDataSource === null || expandableDataSource === void 0 ? void 0 : expandableDataSource.length) > 400) {
+        else if (expandableDataSource &&
+            (expandableDataSource === null || expandableDataSource === void 0 ? void 0 : expandableDataSource.length) > 400 &&
+            !onEditableSave) {
             var key_1 = Math.random().toString(36).slice(-10);
             setVirtual(function (item) {
                 return item || key_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "10.0.92",
+  "version": "10.0.94",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",