ztxkui 10.0.61 → 10.0.63

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

@@ -263,7 +263,9 @@ var TableEnhanceCell = function (_a) {
             return null;
         }
         if (!editableConfig) {
-            return (React.createElement(Input, { autoComplete: "new-password", maxLength: 50, onPressEnter: save, onBlur: save, allowClear: true, onPaste: onPasteHandle, value: val, onMouseUp: function (e) {
+            return (React.createElement(Input, { autoComplete: "new-password", 
+                // maxLength={50}
+                onPressEnter: save, onBlur: save, allowClear: true, onPaste: onPasteHandle, value: val, onMouseUp: function (e) {
                     e === null || e === void 0 ? void 0 : e.stopPropagation();
                 }, 
                 // draggable
@@ -339,7 +341,7 @@ var TableEnhanceCell = function (_a) {
                 selectData.map(function (item) { return (React.createElement(Select.Option, { key: item[selectKeyValue.key] + '', value: item[selectKeyValue === null || selectKeyValue === void 0 ? void 0 : selectKeyValue.key] }, item[selectKeyValue === null || selectKeyValue === void 0 ? void 0 : selectKeyValue.label])); })));
         }
         else if (type === 'inputNumber') {
-            return (React.createElement(InputNumber, __assign({ autoComplete: "new-password", maxLength: 50 }, inputNumMaxMin, editableProps, inputNumberRangeTip, { disabled: disabledResult, 
+            return (React.createElement(InputNumber, __assign({ autoComplete: "new-password" }, inputNumMaxMin, editableProps, inputNumberRangeTip, { disabled: disabledResult, 
                 // draggable
                 // onDragStart={(e) => {
                 //   e?.stopPropagation?.();
@@ -364,7 +366,9 @@ var TableEnhanceCell = function (_a) {
                 } })));
         }
         else if (type === 'textArea') {
-            return (React.createElement(Input.TextArea, __assign({ autoComplete: "new-password", maxLength: 200, autoSize: { maxRows: 3 } }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, onPaste: onPasteHandle, value: val, onMouseUp: function (e) {
+            return (React.createElement(Input.TextArea, __assign({ autoComplete: "new-password", 
+                // maxLength={200}
+                autoSize: { maxRows: 3 } }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, onPaste: onPasteHandle, value: val, onMouseUp: function (e) {
                     e === null || e === void 0 ? void 0 : e.stopPropagation();
                 }, 
                 // draggable
@@ -383,7 +387,7 @@ var TableEnhanceCell = function (_a) {
                 }, allowClear: true })));
         }
         else {
-            return (React.createElement(Input, __assign({ autoComplete: "new-password", maxLength: 50 }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, allowClear: true, onPaste: onPasteHandle, value: val, onMouseUp: function (e) {
+            return (React.createElement(Input, __assign({ autoComplete: "new-password" }, editableProps, { disabled: disabledResult, onPressEnter: save, onBlur: save, allowClear: true, onPaste: onPasteHandle, value: val, onMouseUp: function (e) {
                     e === null || e === void 0 ? void 0 : e.stopPropagation();
                 }, 
                 // draggable

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

@@ -1,10 +1,10 @@
 import React from 'react';
 interface IProps {
     visible: boolean;
-    onCancel: any;
-    setUserPassword: any;
-    request: any;
-    encryptionHandle: any;
+    onCancel?: any;
+    setUserPassword?: any;
+    request?: any;
+    encryptionHandle?: any;
     setUserPasswordOption?: any;
 }
 declare const Making: React.FC<IProps>;

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

@@ -47,9 +47,28 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import React, { useCallback, useState } from 'react';
 import { Container, Form, SearchContainer, Input, message, Modal, Button, } from '../../../../index';
+import ZtxkContext from '../../../utils/ZtxkContext';
+//
+var validatePassword = function (str) {
+    // 定义正则表达式，分别匹配数字、大写字母、小写字母和特殊字符
+    var hasNumber = /\d/.test(str);
+    var hasUpperCase = /[A-Z]/.test(str);
+    var hasLowerCase = /[a-z]/.test(str);
+    var hasSpecialChar = /[^a-zA-Z0-9]/.test(str);
+    // 计算满足条件的种类数量
+    var conditionsMet = [
+        hasNumber,
+        hasUpperCase,
+        hasLowerCase,
+        hasSpecialChar,
+    ].filter(Boolean).length;
+    // 至少满足三种条件则返回 true，否则返回 false
+    return conditionsMet >= 3;
+};
 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 hightKeywords = React.useContext(ZtxkContext).hightKeywords;
     var form = Form.useForm()[0];
     var _b = useState(false), loading = _b[0], setLoading = _b[1];
     /**提交验证 */
@@ -137,11 +156,24 @@ var Making = function (_a) {
                                         var getFieldValue = _a.getFieldValue;
                                         return ({
                                             validator: function (rule, value) {
-                                                if ((value === null || value === void 0 ? void 0 : value.length) >= 8) {
-                                                    return Promise.resolve();
+                                                if (hightKeywords) {
+                                                    if ((value === null || value === void 0 ? void 0 : value.length) <= 8) {
+                                                        return Promise.reject('密码长度必须大于8位！');
+                                                    }
+                                                    else if (!validatePassword(value)) {
+                                                        return Promise.reject('密码至少满足数字，大写字母，小写字母，特殊字符中的三种！');
+                                                    }
+                                                    else {
+                                                        return Promise.resolve();
+                                                    }
                                                 }
                                                 else {
-                                                    return Promise.reject('密码长度最小为8位！');
+                                                    if ((value === null || value === void 0 ? void 0 : value.length) >= 8) {
+                                                        return Promise.resolve();
+                                                    }
+                                                    else {
+                                                        return Promise.reject('密码长度最小为8位！');
+                                                    }
                                                 }
                                                 // const result = validatePassword(
                                                 //   value,
@@ -158,7 +190,9 @@ var Making = function (_a) {
                                 ] },
                                 React.createElement(Input.Password, { autoComplete: "new-password" })),
                             React.createElement("div", null,
-                                React.createElement("p", { style: { height: 32, lineHeight: '32px', color: 'red' } }, "\u5BC6\u7801\u957F\u5EA6\u6700\u5C0F\u4E3A8\u4F4D\uFF01"))),
+                                React.createElement("p", { style: { height: 32, lineHeight: '32px', color: 'red' } }, hightKeywords
+                                    ? '密码长度大于8位，至少满足数字，大写字母，小写字母，特殊字符中的三种!'
+                                    : '密码长度最小为8位！'))),
                         React.createElement(Item, { name: "newPassword1", label: "\u786E\u8BA4\u65B0\u5BC6\u7801", rules: [
                                 { required: true, message: '请确认密码' },
                                 function (_a) {

package/dist/components/utils/ZtxkContext.d.ts

@@ -6,6 +6,7 @@ export interface IZtxkConfig {
     printContainer?: {
         print: boolean;
     };
+    hightKeywords?: boolean;
 }
 declare const ZtxkContext: React.Context<IZtxkConfig>;
 export default ZtxkContext;

package/dist/components/utils/ZtxkContext.js

@@ -5,6 +5,7 @@ var ztxkConfig = {
     printContainer: {
         print: false,
     },
+    hightKeywords: false,
 };
 var ZtxkContext = React.createContext(ztxkConfig);
 export default ZtxkContext;

package/package.json

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