@arim-aisdc/public-components 1.0.1 → 1.0.2

package/dist/components/QueryFilter/QueryFilter.js

@@ -71,8 +71,9 @@ var QueryFilter = function QueryFilter(_ref) {
     _ref$submitLoading = _ref.submitLoading,
     submitLoading = _ref$submitLoading === void 0 ? false : _ref$submitLoading,
     _ref$renderButton = _ref.renderButton,
-    renderButton = _ref$renderButton === void 0 ? null : _ref$renderButton;
-  var _Form$useForm = _Form.useForm(),
+    renderButton = _ref$renderButton === void 0 ? null : _ref$renderButton,
+    initForm = _ref.initForm;
+  var _Form$useForm = _Form.useForm(initForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var Option = _Select.Option;
@@ -84,10 +85,6 @@ var QueryFilter = function QueryFilter(_ref) {
   var displayRender = function displayRender(labels) {
     return labels[labels.length - 1];
   };
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isCancel = _useState4[0],
-    setIsCancel = _useState4[1];
   // 处理初始值格式问题，主要是日期数据的格式，字符串处理为date格式
   var getHandledInitValues = function getHandledInitValues() {
     var newFormValues = {};
@@ -107,32 +104,22 @@ var QueryFilter = function QueryFilter(_ref) {
     var newValues = _objectSpread(_objectSpread({}, values), newFormValues);
     return newValues;
   };
+  var handledInitValues = getHandledInitValues();
 
   /**初始化表单 */
   var FormRef = useRef(null);
-  useEffect(function () {
-    // 修改 重置时set初始值
-    if (isCancel) {
-      var handledInitValues = getHandledInitValues();
-      if (FormRef && FormRef.current) {
-        FormRef.current.setFieldsValue(handledInitValues);
-      }
-      setFormValues(handledInitValues);
-      setIsCancel(false);
-    }
-  }, [isCancel, initialValues]);
   useEffect(function () {
     /**回显异步初始值 */
     // FormRef && FormRef.current && FormRef.current.resetFields();
     var handledInitValues = getHandledInitValues();
-    if (FormRef && FormRef.current) {
-      FormRef.current.setFieldsValue(handledInitValues);
-    }
+    // if (FormRef && FormRef.current) {
+    //   FormRef.current.setFieldsValue(handledInitValues);
+    // }
     // console.log('handledInitValues :>> ', handledInitValues);
 
     // 更新表单数据
     setFormValues(handledInitValues);
-  }, []);
+  }, [initialValues]);
 
   // 表单提交时保留数据
   var onFinish = function onFinish(values) {
@@ -179,7 +166,7 @@ var QueryFilter = function QueryFilter(_ref) {
   var _useDebounceFn = useDebounceFn(function (e, item, valueType) {
       commonChange(e, item, valueType);
     }, {
-      wait: 500
+      wait: 200
     }),
     run = _useDebounceFn.run;
   var getElement = function getElement(item) {
@@ -242,7 +229,7 @@ var QueryFilter = function QueryFilter(_ref) {
           onSearch: item.showSearch ? debounce(function (value) {
             var _item$handleSearch;
             return (_item$handleSearch = item.handleSearch) === null || _item$handleSearch === void 0 ? void 0 : _item$handleSearch.call(item, value);
-          }, 500) : undefined,
+          }, 200) : undefined,
           onChange: function onChange(e) {
             commonChange(e, item);
           },
@@ -257,7 +244,7 @@ var QueryFilter = function QueryFilter(_ref) {
           onSelect: item.showSelect ? debounce(function (value) {
             var _item$handleSelect;
             return (_item$handleSelect = item.handleSelect) === null || _item$handleSelect === void 0 ? void 0 : _item$handleSelect.call(item, value);
-          }, 500) : undefined,
+          }, 200) : undefined,
           notFoundContent: ((_item$setting = item.setting) === null || _item$setting === void 0 ? void 0 : _item$setting.length) >= 0 ? null : /*#__PURE__*/_jsx(_Spin, {
             size: "small"
           }),
@@ -304,7 +291,7 @@ var QueryFilter = function QueryFilter(_ref) {
           onSearch: debounce(function (value) {
             var _item$handleSearch3;
             return (_item$handleSearch3 = item.handleSearch) === null || _item$handleSearch3 === void 0 ? void 0 : _item$handleSearch3.call(item, value, item.isInitGetOptions);
-          }, 500),
+          }, 200),
           onFocus: function onFocus() {
             var _item$handleSearch4;
             return (_item$handleSearch4 = item.handleSearch) === null || _item$handleSearch4 === void 0 ? void 0 : _item$handleSearch4.call(item, '', item.isInitGetOptions);
@@ -481,7 +468,7 @@ var QueryFilter = function QueryFilter(_ref) {
               onSearch: item.showSearch ? debounce(function (value) {
                 var _item$handleSearch5;
                 return (_item$handleSearch5 = item.handleSearch) === null || _item$handleSearch5 === void 0 ? void 0 : _item$handleSearch5.call(item, value);
-              }, 500) : undefined,
+              }, 200) : undefined,
               onChange: function onChange(e) {
                 run(e, item, typeList.start);
               },
@@ -492,7 +479,7 @@ var QueryFilter = function QueryFilter(_ref) {
               onSelect: item.showSelect ? debounce(function (value) {
                 var _item$handleSelect2;
                 return (_item$handleSelect2 = item.handleSelect) === null || _item$handleSelect2 === void 0 ? void 0 : _item$handleSelect2.call(item, value);
-              }, 500) : undefined,
+              }, 200) : undefined,
               notFoundContent: ((_item$setting2 = item.setting) === null || _item$setting2 === void 0 ? void 0 : _item$setting2.length) >= 0 ? null : /*#__PURE__*/_jsx(_Spin, {
                 size: "small"
               }),
@@ -527,7 +514,7 @@ var QueryFilter = function QueryFilter(_ref) {
               onSearch: item.showSearch ? debounce(function (value) {
                 var _item$handleSearch6;
                 return (_item$handleSearch6 = item.handleSearch) === null || _item$handleSearch6 === void 0 ? void 0 : _item$handleSearch6.call(item, value);
-              }, 500) : undefined,
+              }, 200) : undefined,
               onChange: function onChange(e) {
                 run(e, item, typeList.end);
               },
@@ -538,7 +525,7 @@ var QueryFilter = function QueryFilter(_ref) {
               onSelect: item.showSelect ? debounce(function (value) {
                 var _item$handleSelect3;
                 return (_item$handleSelect3 = item.handleSelect) === null || _item$handleSelect3 === void 0 ? void 0 : _item$handleSelect3.call(item, value);
-              }, 500) : undefined,
+              }, 200) : undefined,
               notFoundContent: ((_item$setting3 = item.setting) === null || _item$setting3 === void 0 ? void 0 : _item$setting3.length) >= 0 ? null : /*#__PURE__*/_jsx(_Spin, {
                 size: "small"
               }),
@@ -599,8 +586,8 @@ var QueryFilter = function QueryFilter(_ref) {
       ref: FormRef,
       form: form
       // name={styles.customForm}
-      // initialValues={initialValues}
       ,
+      initialValues: handledInitValues,
       labelAlign: "left",
       autoComplete: "off",
       onFinish: onFinish,
@@ -641,10 +628,11 @@ var QueryFilter = function QueryFilter(_ref) {
             className: "xmTtn xmTtnDefault",
             onClick: function onClick(e) {
               handleCancel(e);
-              form.resetFields();
-              setIsCancel(true);
               // 重置后 再次筛选 会带有上一次的记录（修改）
               setFormValues({});
+              setTimeout(function () {
+                form.resetFields();
+              }, 200);
             },
             children: cancelText
           }), /*#__PURE__*/_jsx(_Button, {
@@ -676,7 +664,7 @@ var QueryFilter = function QueryFilter(_ref) {
  * @returns
  */
 export function useDynamicSearchFiled(searchField, dynamicField) {
-  var _useState5 = useState(function () {
+  var _useState3 = useState(function () {
       return searchField.map(function (item) {
         var tartget = dynamicField.find(function (dynamicFieldItem) {
           return dynamicFieldItem.field === item.field;
@@ -750,9 +738,9 @@ export function useDynamicSearchFiled(searchField, dynamicField) {
         return item;
       });
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    wrapSearchField = _useState6[0],
-    setWrapSearchField = _useState6[1];
+    _useState4 = _slicedToArray(_useState3, 2),
+    wrapSearchField = _useState4[0],
+    setWrapSearchField = _useState4[1];
   return wrapSearchField;
 }
 export default /*#__PURE__*/React.memo(QueryFilter);

package/dist/components/QueryFilter/type.d.ts

@@ -1,4 +1,4 @@
-import { FormProps } from 'antd';
+import { FormInstance, FormProps } from 'antd';
 import { MouseEventHandler } from 'react';
 export declare enum FormItemType {
     Text = "text",
@@ -114,4 +114,5 @@ export interface QueryFilterProps {
     submitLoading?: boolean;
     buttonRender?: any;
     renderButton?: any;
+    initForm?: FormInstance;
 }

package/package.json

@@ -1,102 +1,104 @@
-{
-  "name": "@arim-aisdc/public-components",
-  "version": "1.0.1",
-  "description": "前端组件库",
-  "license": "MIT",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "local": "dumi dev",
-    "prepare": "husky install && dumi setup",
-    "prepublishOnly": "father doctor && npm run build",
-    "start": "npm run dev"
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "lint-staged": {
-    "*.{md,json}": [
-      "prettier --write --no-error-on-unmatched-pattern"
-    ],
-    "*.{css,less}": [
-      "stylelint --fix",
-      "prettier --write"
-    ],
-    "*.{js,jsx}": [
-      "eslint --fix",
-      "prettier --write"
-    ],
-    "*.{ts,tsx}": [
-      "eslint --fix",
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-components": "2.6.51",
-    "@tanstack/match-sorter-utils": "^8.8.4",
-    "@tanstack/react-table": "^8.9.1",
-    "ahooks": "^3.7.8",
-    "antd": "^4.24.15",
-    "classnames": "^2.5.1",
-    "css-vars-ponyfill": "^2.4.8",
-    "fs": "^0.0.1-security",
-    "immer": "^10.0.3",
-    "jsep": "^1.3.8",
-    "lodash": "^4.17.21",
-    "path": "^0.12.7",
-    "react-color": "^2.19.3",
-    "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1",
-    "react-draggable": "^4.4.6",
-    "react-router-dom": "^6.22.3",
-    "react-split-pane": "^0.1.92"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "babel-plugin-import": "^1.13.8",
-    "dumi": "^2.2.13",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "less": "^4.1.3",
-    "less-loader": "^11.1.0",
-    "less-vars-to-js": "^1.3.0",
-    "lint-staged": "^13.0.3",
-    "mockjs": "^1.1.0",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "stylelint": "^14.9.1"
-  },
-  "peerDependencies": {
-    "moment": ">=2.29.4",
-    "react": ">=17.0.1",
-    "react-dom": ">=17.0.1",
-    "umi-request": "^1.4.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": [
-    "na.xu2278@foxmail.com"
-  ]
-}
+{
+  "name": "@arim-aisdc/public-components",
+  "version": "1.0.2",
+  "description": "前端组件库",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "father build",
+    "build:watch": "father dev",
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "local": "dumi dev",
+    "prepare": "husky install && dumi setup",
+    "prepublishOnly": "father doctor && npm run build",
+    "start": "npm run dev"
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "lint-staged": {
+    "*.{md,json}": [
+      "prettier --write --no-error-on-unmatched-pattern"
+    ],
+    "*.{css,less}": [
+      "stylelint --fix",
+      "prettier --write"
+    ],
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{ts,tsx}": [
+      "eslint --fix",
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/icons": "^4.7.0",
+    "@ant-design/pro-components": "2.6.51",
+    "@tanstack/match-sorter-utils": "^8.8.4",
+    "@tanstack/react-table": "^8.9.1",
+    "ahooks": "^3.7.8",
+    "antd": "^4.24.15",
+    "classnames": "^2.5.1",
+    "css-vars-ponyfill": "^2.4.8",
+    "fs": "^0.0.1-security",
+    "immer": "^10.0.3",
+    "jsep": "^1.3.8",
+    "lodash": "^4.17.21",
+    "moment": "^2.30.1",
+    "path": "^0.12.7",
+    "react-color": "^2.19.3",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "react-draggable": "^4.4.6",
+    "react-router-dom": "^6.22.3",
+    "react-split-pane": "^0.1.92",
+    "resize-observer-polyfill": "^1.5.1"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/lint": "^4.0.0",
+    "babel-plugin-import": "^1.13.8",
+    "dumi": "^2.2.13",
+    "eslint": "^8.23.0",
+    "father": "^4.1.0",
+    "husky": "^8.0.1",
+    "less": "^4.1.3",
+    "less-loader": "^11.1.0",
+    "less-vars-to-js": "^1.3.0",
+    "lint-staged": "^13.0.3",
+    "mockjs": "^1.1.0",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-packagejson": "^2.2.18",
+    "stylelint": "^14.9.1"
+  },
+  "peerDependencies": {
+    "moment": ">=2.29.4",
+    "react": ">=17.0.1",
+    "react-dom": ">=17.0.1",
+    "umi-request": "^1.4.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": [
+    "na.xu2278@foxmail.com"
+  ]
+}