@arim-aisdc/public-components 2.0.7 → 2.0.8

package/dist/components/CustomForm/CustomForm.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import './index.less';
 import { CustomFormProps } from './type';
-declare const _default: React.NamedExoticComponent<CustomFormProps>;
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<CustomFormProps & React.RefAttributes<unknown>>>;
 export default _default;

package/dist/components/CustomForm/CustomForm.js

@@ -14,7 +14,7 @@ import { useDebounceFn } from 'ahooks';
 import { AutoComplete, Badge, Button, Cascader, Checkbox, Col, DatePicker, Form, Input, InputNumber, Radio, Row, Select, Spin, Switch } from 'antd';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { forwardRef, useEffect, useMemo, useState } from 'react';
 import ColorSelector from "../ColorSelector";
 import "./index.less";
 import { CustomFormItemType } from "./type";
@@ -74,7 +74,7 @@ var getSpanConfig = function getSpanConfig(layout, width, span) {
     layout: breakPoint[2]
   };
 };
-var CustomForm = function CustomForm(_ref) {
+var CustomForm = function CustomForm(_ref, ref) {
   var data = _ref.data,
     initialValues = _ref.initialValues,
     _ref$labelCol = _ref.labelCol,
@@ -117,12 +117,14 @@ var CustomForm = function CustomForm(_ref) {
   };
 
   /**初始化表单 */
-  var FormRef = useRef(null);
+  //   const FormRef = useRef<FormInstance>(null);
   useEffect(function () {
+    var _form$resetFields;
     /**回显异步初始值 */
-    if (FormRef && FormRef.current) {
-      FormRef.current.resetFields();
-    }
+    // if (FormRef && FormRef.current) {
+    //   FormRef.current.resetFields();
+    // }
+    (_form$resetFields = form.resetFields) === null || _form$resetFields === void 0 || _form$resetFields.call(form);
 
     // 更新表单数据
     setFormValues(initialValues || {});
@@ -373,8 +375,10 @@ var CustomForm = function CustomForm(_ref) {
         break;
       case CustomFormItemType.DateTime:
         element = /*#__PURE__*/_jsx(DatePicker, {
-          showTime: true,
-          format: "YYYY-MM-DD HH:mm:ss",
+          showTime: true
+          // format="YYYY-MM-DD HH:mm:ss"
+          ,
+          format: (item === null || item === void 0 ? void 0 : item.defaultFormat) || 'YYYY-MM-DD HH:mm:ss',
           style: {
             width: '100%'
           },
@@ -605,7 +609,7 @@ var CustomForm = function CustomForm(_ref) {
   return /*#__PURE__*/_jsx("div", {
     id: "CustomForm",
     children: /*#__PURE__*/_jsx(Form, {
-      ref: FormRef,
+      ref: ref,
       form: form,
       layout: layout,
       name: 'customForm',
@@ -677,4 +681,4 @@ var CustomForm = function CustomForm(_ref) {
     })
   });
 };
-export default /*#__PURE__*/React.memo(CustomForm);
+export default /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(CustomForm));

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

@@ -85,6 +85,9 @@ export type CustomSearchFieldType = {
     mode?: 'multiple' | 'tags';
     maxTagCount?: number | 'responsive';
     span?: number;
+    /**
+     * @deprecated 不建议使用，使用required替代
+     */
     is_null?: number;
     required?: boolean;
     labelCol?: number;
@@ -101,7 +104,7 @@ export interface CustomFormProps {
     isOkText?: string;
     /**取消按钮 text */
     cancelText?: string;
-    /**提交方法 */
+    /**修改值以及点击提交按钮，都会触发的方法 */
     handleSubmit: (...args: any[]) => void;
     /**重置方法 */
     handleCancel: MouseEventHandler<HTMLElement>;

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

@@ -23,5 +23,5 @@ export declare function useDynamicSearchFiled(searchField: Array<any>, dynamicFi
     settingHandler: (items: Array<any>) => Array<any>;
     params?: any;
 }>): any[];
-declare const _default: React.NamedExoticComponent<QueryFilterProps>;
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<QueryFilterProps & React.RefAttributes<unknown>>>;
 export default _default;

package/dist/components/QueryFilter/QueryFilter.js

@@ -20,7 +20,7 @@ import { AutoComplete, Badge, Button, Cascader, Checkbox, DatePicker, Form, Inpu
 import TextArea from 'antd/lib/input/TextArea';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { forwardRef, useEffect, useState } from 'react';
 import "./index.less";
 import { FormItemType, TimeFormatType } from "./type";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -31,7 +31,7 @@ export var typeList = {
   start: 'start',
   end: 'end'
 };
-var QueryFilter = function QueryFilter(_ref) {
+var QueryFilter = function QueryFilter(_ref, ref) {
   var data = _ref.data,
     initialValues = _ref.initialValues,
     _ref$isOkText = _ref.isOkText,
@@ -46,9 +46,8 @@ 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,
-    initForm = _ref.initForm;
-  var _Form$useForm = Form.useForm(initForm),
+    renderButton = _ref$renderButton === void 0 ? null : _ref$renderButton;
+  var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var Option = Select.Option;
@@ -82,7 +81,8 @@ var QueryFilter = function QueryFilter(_ref) {
   var handledInitValues = getHandledInitValues();
 
   /**初始化表单 */
-  var FormRef = useRef(null);
+  // const FormRef = useRef<FormInstance>(null);
+
   useEffect(function () {
     /**回显异步初始值 */
     // FormRef && FormRef.current && FormRef.current.resetFields();
@@ -565,7 +565,7 @@ var QueryFilter = function QueryFilter(_ref) {
   return /*#__PURE__*/_jsx("div", {
     id: "QueryFilter",
     children: /*#__PURE__*/_jsxs(Form, {
-      ref: FormRef,
+      ref: ref,
       form: form
       // name={styles.customForm}
       ,
@@ -725,4 +725,4 @@ export function useDynamicSearchFiled(searchField, dynamicField) {
     setWrapSearchField = _useState4[1];
   return wrapSearchField;
 }
-export default /*#__PURE__*/React.memo(QueryFilter);
+export default /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(QueryFilter));

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

@@ -1,5 +1,4 @@
 import { FormProps } from 'antd';
-import { FormInstance } from 'antd/es/form';
 import { MouseEventHandler } from 'react';
 export declare enum FormItemType {
     Text = "text",
@@ -100,7 +99,7 @@ export interface QueryFilterProps {
     isOkText?: string;
     /**取消按钮 text */
     cancelText?: string;
-    /**提交方法 */
+    /**修改值以及点击提交按钮，都会触发的方法 */
     handleSubmit: ({ data }: {
         data: any;
     }, item?: fieldType, type?: inputValueType) => void;
@@ -115,5 +114,4 @@ export interface QueryFilterProps {
     submitLoading?: boolean;
     buttonRender?: any;
     renderButton?: any;
-    initForm?: FormInstance;
 }

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/package.json

@@ -1,102 +1,103 @@
-{
-  "name": "@arim-aisdc/public-components",
-  "version": "2.0.7",
-  "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": "^5.3.7",
-    "@ant-design/pro-components": "^2.7.10",
-    "@tanstack/match-sorter-utils": "^8.8.4",
-    "@tanstack/react-table": "^8.9.1",
-    "ahooks": "^3.7.8",
-    "classnames": "^2.5.1",
-    "css-vars-ponyfill": "^2.4.8",
-    "dayjs": "^1.11.11",
-    "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": {
-    "antd": "^5.18.3",
-    "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": "2.0.8",
+  "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": "^5.3.7",
+    "@ant-design/pro-components": "^2.7.10",
+    "@tanstack/match-sorter-utils": "^8.8.4",
+    "@tanstack/react-table": "^8.9.1",
+    "ahooks": "^3.7.8",
+    "antd": "^5.18.3",
+    "classnames": "^2.5.1",
+    "css-vars-ponyfill": "^2.4.8",
+    "dayjs": "^1.11.11",
+    "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": {
+    "antd": "^5.18.3",
+    "react": ">=17.0.1",
+    "react-dom": ">=17.0.1",
+    "umi-request": "^1.4.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": [
+    "na.xu2278@foxmail.com"
+  ]
+}