@quansitech/antd-admin 1.2.6 → 1.2.8

package/dist/components/Column/Cascader.js

@@ -37,10 +37,13 @@ export default function (props) {
   var tableContext = useContext(TableContext);
   var itemContext = useContext(ItemContext);
   var findValue = function findValue(options, value) {
+    if (!value) {
+      return [];
+    }
     for (var i = 0; i < options.length; i++) {
       var _option$children;
       var option = options[i];
-      if (option.value === value) {
+      if (option.value == value) {
         return [option.value];
       }
       if ((_option$children = option.children) !== null && _option$children !== void 0 && _option$children.length) {
@@ -70,28 +73,32 @@ export default function (props) {
       }
     }
     var extraData;
-    if ((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.extraRenderValue) {
+    // 表单
+    if (formContext && (_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.extraRenderValue) {
       extraData = props.fieldProps.extraRenderValue;
     }
-    if ((_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.extraRenderValues) {
+    // 表格行数据
+    if (tableContext && (_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.extraRenderValues && props.record) {
       var _props$fieldProps$ext;
       var index = -1;
-      if (tableContext && tableContext !== null && tableContext !== void 0 && tableContext.dataSource && props.record) {
+      if (tableContext !== null && tableContext !== void 0 && tableContext.dataSource && props.record) {
         var key = tableContext.getTableProps().rowKey;
         index = tableContext.dataSource.findIndex(function (item) {
           return item[key] === props.record[key];
         });
       }
-      if (itemContext && (itemContext === null || itemContext === void 0 ? void 0 : itemContext.index) !== undefined) {
-        index = itemContext.index;
-      }
-      extraData = (_props$fieldProps$ext = props.fieldProps.extraRenderValues[index]) !== null && _props$fieldProps$ext !== void 0 ? _props$fieldProps$ext : [];
+      extraData = (_props$fieldProps$ext = props.fieldProps.extraRenderValues[index]) !== null && _props$fieldProps$ext !== void 0 ? _props$fieldProps$ext : {};
     }
-    if (extraData) {
+    // 表单列表
+    if (itemContext && (itemContext === null || itemContext === void 0 ? void 0 : itemContext.index) !== undefined) {
+      var _props$fieldProps$ext2;
+      var _index = -1;
+      _index = itemContext.index;
+      extraData = (_props$fieldProps$ext2 = props.fieldProps.extraRenderValues[_index]) !== null && _props$fieldProps$ext2 !== void 0 ? _props$fieldProps$ext2 : {};
+    }
+    if (extraData && value) {
       setOptions(extraData.options);
-      if (value) {
-        setValues(findValue(extraData.options, value));
-      }
+      setValues(findValue(extraData.options, value));
       return;
     }
 

package/dist/components/Table.js

@@ -33,11 +33,13 @@ import { TabsContext } from "./TabsContext";
 export default function (props) {
   var request = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, sort, filter) {
+      var _formRef$current;
       var data, res, _props;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            data = _objectSpread(_objectSpread(_objectSpread({}, params), filter), {}, {
+            setLoading(true);
+            data = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue()), params), filter), {}, {
               sort: sort
             }); // 兼容 key:value 的写法
             Object.keys(data).forEach(function (key) {
@@ -58,7 +60,7 @@ export default function (props) {
             setEditableValues([]);
             setSelectedRows([]);
             if (modalContext.inModal) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
             // 如果不在 modal 中，则使用 routerNavigateTo
@@ -85,16 +87,16 @@ export default function (props) {
               }
             });
             return _context.abrupt("return");
-          case 9:
-            _context.prev = 9;
-            _context.next = 12;
+          case 10:
+            _context.prev = 10;
+            _context.next = 13;
             return http.get(searchUrl, {
               params: data,
               headers: {
                 'X-Table-Search': '1'
               }
             });
-          case 12:
+          case 13:
             res = _context.sent;
             _props = res.data;
             setToolActions(_props.actions);
@@ -107,15 +109,15 @@ export default function (props) {
               data: res.data.dataSource || [],
               success: true
             });
-          case 21:
-            _context.prev = 21;
+          case 22:
+            _context.prev = 22;
             setLoading(false);
-            return _context.finish(21);
-          case 24:
+            return _context.finish(22);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[9,, 21, 24]]);
+      }, _callee, null, [[10,, 22, 25]]);
     }));
     return function request(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -199,6 +201,14 @@ export default function (props) {
     _useState24 = _slicedToArray(_useState23, 2),
     columns = _useState24[0],
     setColumns = _useState24[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    inited = _useState26[0],
+    setInited = _useState26[1];
+  var _useState27 = useState(props.defaultSearchValue || {}),
+    _useState28 = _slicedToArray(_useState27, 2),
+    initialValues = _useState28[0],
+    setInitialValues = _useState28[1];
   var realColumns = useMemo(function () {
     var _cloneDeep;
     var processedColumns = [];
@@ -297,13 +307,20 @@ export default function (props) {
 
     // 搜索
     if (!searchUrl) {
-      setSearchUrl(window.location.href);
+      var s = window.location.href;
+      s = s.replace(/page=\d+&?/, '');
+      realColumns.filter(function (c) {
+        return c.search !== false;
+      }).map(function (c) {
+        s = s.replace(new RegExp("".concat(c.dataIndex, "=[^&]*&?")), '');
+      });
+      setSearchUrl(s);
     }
     setDataSource(postData(props.dataSource || []));
     if (!modalContext.inModal) {
       var query = qs.parse(window.location.search.replace(/^\?/, ''));
       if (query && Object.keys(query).length) {
-        var _formRef$current;
+        var _formRef$current2;
         Object.keys(query).forEach(function (key) {
           if (typeof query[key] === 'string') {
             /^\d+$/.test(query[key]) && (query[key] = parseInt(query[key]));
@@ -311,16 +328,18 @@ export default function (props) {
         });
         handleSearchRangeValue(query);
         handleSearchArrayKey(query);
-        (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(query);
+        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(query);
+        setInitialValues(query);
         setLastQuery(query);
       }
     }
+    setInited(true);
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     dangerouslySetInnerHTML: {
       __html: props.description
     }
-  }), /*#__PURE__*/React.createElement(TableContext.Provider, {
+  }), inited ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContext.Provider, {
     value: {
       getTableProps: function getTableProps() {
         return props;
@@ -361,9 +380,9 @@ export default function (props) {
       reload: true
     },
     form: {
-      initialValues: props.defaultSearchValue,
+      initialValues: initialValues,
       onValuesChange: function onValuesChange(changedValues, allValues) {
-        var _formRef$current2;
+        var _formRef$current3;
         var submit = realColumns.filter(function (c) {
           if (!c.searchOnChange) {
             return false;
@@ -374,7 +393,7 @@ export default function (props) {
           return;
         }
         // 是否立即搜索
-        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.submit();
+        (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.submit();
       }
     },
     rowSelection: props.rowSelection && {
@@ -439,5 +458,5 @@ export default function (props) {
     actionRef: actionRef,
     search: props.search,
     dateFormatter: props.dateFormatter
-  })));
+  }))) : /*#__PURE__*/React.createElement(React.Fragment, null));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "type": "module",
   "files": [
     "dist"