ztxkui 3.0.4 → 3.0.6-1

package/dist/DemoCom/BasicDemo.js

@@ -2,6 +2,7 @@ import InputNumber from 'components/InputNumber';
 import Tag from 'components/Tag';
 import Input from 'components/Input';
 import { FormList, RangePicker, Button } from '../index';
+import { InputNumber as AntInputNumber } from 'antd';
 import GridList from 'components/business/NewList';
 import { useState } from 'react';
 import './style.scss';
@@ -53,9 +54,15 @@ function BasicDemo() {
     ]), rangeValue = _b[0], setRangeValue = _b[1];
     return (React.createElement(React.Fragment, null,
         React.createElement(InputNumber, { value: value, onChange: function (value) {
-                console.log(value);
+                console.log(value, 1);
                 setValue(value);
-            }, min: 0, max: 10, formatterType: "percent" }),
+            }, precision: 4, formatterType: "currency", style: { width: '300px' } }),
+        React.createElement(AntInputNumber, { value: value, onChange: function (value) {
+                console.log(value, 1);
+                setValue(value);
+            }, formatter: function (value) {
+                return ("$ " + value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+            }, parser: function (value) { return value.replace(/\$\s?|(,*)/g, ''); }, style: { width: '300px' } }),
         React.createElement("div", null,
             React.createElement(Tag, null, "\u4F60\u597D"),
             React.createElement(Tag, { type: "normal" }, "\u4F60\u597D"),

package/dist/DemoCom/TableDemo.js

@@ -435,14 +435,15 @@ var list1 = [
 var TableDemo = function () {
     var _a = useGetTableRecords(), records = _a.records, setRecords = _a.setRecords;
     var _b = useGetSelectList(), list = _b.list, loading = _b.loading, setLoading = _b.setLoading;
+    var _c = useState(false), btnLoading = _c[0], setBtnLoading = _c[1];
     // 表格数据引用
     var recordsRef = useRef([]);
     // 初始化渲染，针对配置了editable、editableConfig的列配置
-    var _c = useState(false), firstRender = _c[0], setFirstRender = _c[1];
+    var _d = useState(false), firstRender = _d[0], setFirstRender = _d[1];
     // 新增删除行改变
-    var _d = useState(false), lengthChange = _d[0], setLengthChange = _d[1];
+    var _e = useState(false), lengthChange = _e[0], setLengthChange = _e[1];
     // 表格行拖拽改变
-    var _e = useState(false), moveChange = _e[0], setMoveChange = _e[1];
+    var _f = useState(false), moveChange = _f[0], setMoveChange = _f[1];
     useEffect(function () {
         setFirstRender(true);
     }, []);
@@ -580,12 +581,21 @@ var TableDemo = function () {
                     return "\u7B2C" + (index + 1) + "\u884C\uFF0C\u8D85\u51FA\u6700\u5927\u503C\uFF0C\u5DF2\u4FEE\u6539\u6210\u6700\u5927\u503C";
                 },
                 maxHandle: function (record) {
-                    return 10;
+                    return 10000;
                 },
                 lowMinTip: function (record, index) {
                     return "\u7B2C" + (index + 1) + "\u884C\uFF0C\u4F4E\u4E8E\u6700\u5C0F\u503C\uFF0C\u5DF2\u4FEE\u6539\u6210\u6700\u5C0F\u503C";
                 },
                 precision: 3,
+                formatterType: 'currency',
+                onBlur: function () {
+                    setBtnLoading(false);
+                    console.log('失去焦点了');
+                },
+                onFocus: function () {
+                    setBtnLoading(true);
+                    console.log('获得焦点了');
+                },
             },
         },
         {
@@ -714,7 +724,7 @@ var TableDemo = function () {
         },
     ];
     // 本地偏好设置相关
-    var _f = useState(getStorage('test-table') || []), tableLayout = _f[0], setTableLayout = _f[1];
+    var _g = useState(getStorage('test-table') || []), tableLayout = _g[0], setTableLayout = _g[1];
     var onDynamicChange = useCallback(function (tableLayout) {
         // 剔除调一些可能不可序列化的字段，只保留关键数据
         var newTableLayout = tableLayout.map(function (item) { return ({
@@ -789,7 +799,10 @@ var TableDemo = function () {
             // 表格行拖拽
             onMoveRow: onMoveRowHandle }),
         React.createElement("div", null,
-            React.createElement("button", { onClick: function () { return console.log(records); } }, "\u83B7\u53D6\u6570\u636E")),
+            React.createElement("button", { onClick: function () { return console.log(records); } }, "\u83B7\u53D6\u6570\u636E"),
+            React.createElement(Button, { loading: btnLoading, onClick: function () {
+                    console.log(111);
+                } }, "\u70B9\u51FB")),
         React.createElement(Empty, null)));
 };
 function getStorage(key) {

package/dist/components/InputNumber/input-number.js

@@ -23,11 +23,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 import React, { useRef } from 'react';
 import { InputNumber as AntInputNumber } from 'antd';
 import { message } from '../../index';
-import useFormatter from '../../hooks/useFormatter';
+import { getFormatter, } from '../../hooks/useFormatter';
 function InputNumber(props) {
     var formatterType = props.formatterType, currencySymbol = props.currencySymbol, formatter = props.formatter, parser = props.parser, precision = props.precision, max = props.max, min = props.min, onChange = props.onChange, onBlur = props.onBlur, onPressEnter = props.onPressEnter, onOverRange = props.onOverRange, overMaxTip = props.overMaxTip, lowMinTip = props.lowMinTip, restProps = __rest(props, ["formatterType", "currencySymbol", "formatter", "parser", "precision", "max", "min", "onChange", "onBlur", "onPressEnter", "onOverRange", "overMaxTip", "lowMinTip"]);
     var selfValue = useRef();
-    var _a = useFormatter(formatterType, currencySymbol), _formatter = _a.formatter, _parser = _a.parser, _precision = _a.precision;
+    var _a = getFormatter(formatterType, currencySymbol), _formatter = _a.formatter, _parser = _a.parser, _precision = _a.precision;
     var onChangeHandle = function (value) {
         selfValue.current = value;
         onChange && onChange(value);

package/dist/components/Table/table-enhance-cell.js

@@ -180,7 +180,15 @@ var TableEnhanceCell = memo(function (_a) {
         }
         else if (type === 'inputNumber') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
-                React.createElement(InputNumber, __assign({ autoComplete: "new-password", maxLength: 50 }, inputNumMaxMin, editableProps, inputNumberRangeTip, { disabled: disabledResult, onPressEnter: function () { return save({ maxResult: maxResult, minResult: minResult }); }, onBlur: function () { return save({ maxResult: maxResult, minResult: minResult }); } }))));
+                React.createElement(InputNumber, __assign({ autoComplete: "new-password", maxLength: 50 }, inputNumMaxMin, editableProps, inputNumberRangeTip, { disabled: disabledResult, onPressEnter: function (e) {
+                        editableProps.onPressEnter && editableProps.onPressEnter(e);
+                        save({ maxResult: maxResult, minResult: minResult });
+                    }, onBlur: function (e) {
+                        editableProps.onBlur && editableProps.onBlur(e);
+                        save({ maxResult: maxResult, minResult: minResult });
+                    }, onFocus: function (e) {
+                        editableProps.onFocus(e);
+                    } }))));
         }
         else if (type === 'textArea') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },

package/dist/components/business/Common/UserPassword/index.d.ts

@@ -6,6 +6,7 @@ interface IProps {
     request: any;
     encryptionHandle: any;
     setUserPasswordOption?: any;
+    empSource?: any;
 }
 declare const Making: React.FC<IProps>;
 export default Making;

package/dist/components/business/Common/UserPassword/index.js

@@ -45,14 +45,20 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useState, useMemo } from 'react';
 import { Container, Form, SearchContainer, Input, message, Modal, Button, } from '../../../../index';
 import { validate, commonMessage } from 'ztxkutils/dist/validate';
 var SearchLeft = SearchContainer.SearchLeft, Item = SearchContainer.SearchItem;
 var Making = function (_a) {
-    var visible = _a.visible, onCancel = _a.onCancel, setUserPassword = _a.setUserPassword, request = _a.request, setUserPasswordOption = _a.setUserPasswordOption, encryptionHandle = _a.encryptionHandle;
+    var visible = _a.visible, onCancel = _a.onCancel, setUserPassword = _a.setUserPassword, request = _a.request, setUserPasswordOption = _a.setUserPasswordOption, encryptionHandle = _a.encryptionHandle, empSource = _a.empSource;
     var form = Form.useForm()[0];
     var _b = useState(false), loading = _b[0], setLoading = _b[1];
+    var isOutSource = useMemo(function () {
+        if (empSource && empSource + '' === '2') {
+            return true;
+        }
+        return false;
+    }, [empSource]);
     /**提交验证 */
     var vallidateFn = useCallback(function (callback) { return __awaiter(void 0, void 0, void 0, function () {
         var err_1, errorFields;
@@ -84,10 +90,15 @@ var Making = function (_a) {
         setLoading(true);
         var params = form.getFieldsValue();
         var submitParams = {
+            empSource: empSource,
             oldPassword: encryptionHandle(params === null || params === void 0 ? void 0 : params.oldPassword),
             newPassword: encryptionHandle(params === null || params === void 0 ? void 0 : params.newPassword),
             newPassword1: encryptionHandle(params === null || params === void 0 ? void 0 : params.newPassword1),
         };
+        // 外部用户 不需要旧密码
+        if (isOutSource) {
+            Reflect.deleteProperty(submitParams, 'oldPassword');
+        }
         request(setUserPasswordOption
             ? __assign(__assign({}, setUserPasswordOption), { data: __assign(__assign({}, setUserPasswordOption.data), submitParams) }) : {
             url: '/api/zmdms-user/update-password',
@@ -111,7 +122,15 @@ var Making = function (_a) {
             setLoading(false);
             message.warning(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '密码修改失败!');
         });
-    }, [form, encryptionHandle, request, setUserPasswordOption, setUserPassword]);
+    }, [
+        form,
+        encryptionHandle,
+        request,
+        setUserPasswordOption,
+        setUserPassword,
+        empSource,
+        isOutSource,
+    ]);
     var onSaveHandle = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             vallidateFn(function () {
@@ -128,9 +147,9 @@ var Making = function (_a) {
             React.createElement(Form, { name: "user-password-making", form: form },
                 React.createElement(SearchContainer, { dark: true },
                     React.createElement(SearchLeft, null,
-                        React.createElement("div", { style: { width: '100%' } },
+                        isOutSource ? null : (React.createElement("div", { style: { width: '100%' } },
                             React.createElement(Item, { name: "oldPassword", label: "\u539F\u5BC6\u7801", rules: [{ required: true, message: '请输入原密码' }] },
-                                React.createElement(Input, { autoComplete: "new-password", type: "password" }))),
+                                React.createElement(Input.Password, { autoComplete: "new-password" })))),
                         React.createElement("div", { style: { width: '100%', display: 'flex' } },
                             React.createElement(Item, { name: "newPassword", label: "\u65B0\u5BC6\u7801", rules: [
                                     { required: true, message: '请输入新密码' },

package/dist/hooks/useFormatter.d.ts

@@ -16,4 +16,9 @@ declare function useFormatter(formatterType: IFormatterType | undefined, currenc
     parser: IParserFuc;
     precision: number;
 };
+export declare function getFormatter(formatterType: IFormatterType | undefined, currencySymbol?: ICurrencySymbol): {
+    formatter: IFormatterFuc;
+    parser: IParserFuc;
+    precision: number;
+};
 export default useFormatter;

package/dist/hooks/useFormatter.js

@@ -20,7 +20,7 @@ function useFormatter(formatterType, currencySymbol) {
                 // /\$\s?|(,*)/g
                 return value
                     ? // eslint-disable-next-line no-eval
-                        value.replace(eval("/" + currencySymbol + "s?|(,*)/g"), '')
+                        value.replace(eval("/${currencySymbol}\\s?|(,*)/g"), '')
                     : Number(value);
             };
             setFormatter(function () {
@@ -64,4 +64,45 @@ function useFormatter(formatterType, currencySymbol) {
         precision: precision,
     };
 }
+export function getFormatter(formatterType, currencySymbol) {
+    if (currencySymbol === void 0) { currencySymbol = '$'; }
+    if (formatterType === 'currency') {
+        var formatterFn = function (value) {
+            return ("" + value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+        };
+        var parserFn = function (value) { return value.replace(/(,*)/g, ''); };
+        return {
+            formatter: formatterFn,
+            parser: parserFn,
+            precision: MONEY_PRECISION,
+        };
+    }
+    if (formatterType === 'percent') {
+        var formatterFn = function (value) { return value + "%"; };
+        var parserFn = function (value) {
+            return value ? value.replace('%', '') : Number(value);
+        };
+        return {
+            formatter: formatterFn,
+            parser: parserFn,
+            precision: QUANTITY_PRECISION,
+        };
+    }
+    if (formatterType === 'thousands') {
+        var formatterFn = function (value) { return value + "\u2030"; };
+        var parserFn = function (value) {
+            return value ? value.replace('‰', '') : Number(value);
+        };
+        return {
+            formatter: formatterFn,
+            parser: parserFn,
+            precision: QUANTITY_PRECISION,
+        };
+    }
+    return {
+        formatter: undefined,
+        parser: undefined,
+        precision: undefined,
+    };
+}
 export default useFormatter;

package/package.json

@@ -1,94 +1,94 @@
-{
-  "name": "ztxkui",
-  "version": "3.0.4",
-  "private": false,
-  "description": "React components library",
-  "author": "zt-front-end",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "license": "MIT",
-  "files": [
-    "dist"
-  ],
-  "dependencies": {
-    "antd": "^4.16.8",
-    "axios": "^0.21.1",
-    "classnames": "^2.2.6",
-    "dayjs": "^1.10.4",
-    "immutability-helper": "^3.1.1",
-    "number-precision": "^1.5.0",
-    "react-dnd": "^14.0.2",
-    "react-dnd-html5-backend": "^14.0.0",
-    "react-to-print": "^2.14.7",
-    "ztxkutils": "^2.6.2"
-  },
-  "scripts": {
-    "analyze": "source-map-explorer 'dist/static/js/*.js'",
-    "lint": "eslint --ext js,ts,tsx src",
-    "clean": "rimraf ./dist",
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "build-lib": "npm run clean & npm run build-ts & npm run build-css",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject",
-    "build-ts": "tsc -p tsconfig.build.json",
-    "build-css": "sass ./src/styles/index.scss ./dist/index.css",
-    "storybook": "start-storybook -p 6006 -s public",
-    "build-storybook": "build-storybook -s public",
-    "prepublish": "npm run build-lib"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {
-    "@storybook/addon-actions": "^6.1.20",
-    "@storybook/addon-essentials": "^6.1.20",
-    "@storybook/addon-links": "^6.1.20",
-    "@storybook/node-logger": "^6.1.20",
-    "@storybook/preset-create-react-app": "^3.1.6",
-    "@storybook/react": "^6.1.20",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/classnames": "^2.2.11",
-    "@types/jest": "^26.0.15",
-    "@types/lodash": "^4.14.172",
-    "@types/node": "^12.0.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@types/react-router-dom": "^5.1.8",
-    "eslint-config-prettier": "^8.0.0",
-    "eslint-plugin-prettier": "^3.3.1",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.6.1",
-    "jspdf": "^2.5.1",
-    "prettier": "^2.2.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-router-dom": "^5.3.0",
-    "react-scripts": "4.0.3",
-    "rimraf": "^3.0.2",
-    "sass": "^1.32.8",
-    "source-map-explorer": "^2.5.2",
-    "typescript": "^4.1.2",
-    "web-vitals": "^1.0.1"
-  },
-  "peerDependencies": {
-    "axios": ">=0.21.1",
-    "js-base64": ">=3.6.0",
-    "lodash": ">=4.17.21",
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0",
-    "ztxkutils": ">=2.1.1"
-  }
+{
+  "name": "ztxkui",
+  "version": "3.0.6-1",
+  "private": false,
+  "description": "React components library",
+  "author": "zt-front-end",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "MIT",
+  "files": [
+    "dist"
+  ],
+  "dependencies": {
+    "antd": "^4.16.8",
+    "axios": "^0.21.1",
+    "classnames": "^2.2.6",
+    "dayjs": "^1.10.4",
+    "immutability-helper": "^3.1.1",
+    "number-precision": "^1.5.0",
+    "react-dnd": "^14.0.2",
+    "react-dnd-html5-backend": "^14.0.0",
+    "react-to-print": "^2.14.7",
+    "ztxkutils": "^2.6.2"
+  },
+  "scripts": {
+    "analyze": "source-map-explorer 'dist/static/js/*.js'",
+    "lint": "eslint --ext js,ts,tsx src",
+    "clean": "rimraf ./dist",
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "build-lib": "npm run clean & npm run build-ts & npm run build-css",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject",
+    "build-ts": "tsc -p tsconfig.build.json",
+    "build-css": "sass ./src/styles/index.scss ./dist/index.css",
+    "storybook": "start-storybook -p 6006 -s public",
+    "build-storybook": "build-storybook -s public",
+    "prepublish": "npm run build-lib"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "devDependencies": {
+    "@storybook/addon-actions": "^6.1.20",
+    "@storybook/addon-essentials": "^6.1.20",
+    "@storybook/addon-links": "^6.1.20",
+    "@storybook/node-logger": "^6.1.20",
+    "@storybook/preset-create-react-app": "^3.1.6",
+    "@storybook/react": "^6.1.20",
+    "@testing-library/jest-dom": "^5.11.4",
+    "@testing-library/react": "^11.1.0",
+    "@testing-library/user-event": "^12.1.10",
+    "@types/classnames": "^2.2.11",
+    "@types/jest": "^26.0.15",
+    "@types/lodash": "^4.14.172",
+    "@types/node": "^12.0.0",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "@types/react-router-dom": "^5.1.8",
+    "eslint-config-prettier": "^8.0.0",
+    "eslint-plugin-prettier": "^3.3.1",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.6.1",
+    "jspdf": "^2.5.1",
+    "prettier": "^2.2.1",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
+    "react-router-dom": "^5.3.0",
+    "react-scripts": "4.0.3",
+    "rimraf": "^3.0.2",
+    "sass": "^1.32.8",
+    "source-map-explorer": "^2.5.2",
+    "typescript": "^4.1.2",
+    "web-vitals": "^1.0.1"
+  },
+  "peerDependencies": {
+    "axios": ">=0.21.1",
+    "js-base64": ">=3.6.0",
+    "lodash": ">=4.17.21",
+    "react": ">=16.9.0",
+    "react-dom": ">=16.9.0",
+    "ztxkutils": ">=2.1.1"
+  }
 }