@deepinnet-components/pc 0.0.27 → 0.0.29

package/dist/UserCenter/AccountPage/components/CreateAccount/index.js

@@ -110,12 +110,7 @@ var schema = {
         required: true,
         message: '请输入密码'
       }, {
-        validator: function validator(val) {
-          var regex = /^(?=(?:.*[a-z]))(?=(?:.*[A-Z]))(?=(?:.*\d)).{8,}$|^(?=(?:.*[a-z]))(?=(?:.*[A-Z]))(?=(?:.*[^A-Za-z0-9])).{8,}$|^(?=(?:.*[a-z]))(?=(?:.*\d))(?=(?:.*[^A-Za-z0-9])).{8,}$|^(?=(?:.*[A-Z]))(?=(?:.*\d))(?=(?:.*[^A-Za-z0-9])).{8,}$/;
-          if (val && !regex.test(val)) {
-            return '密码需至少包含大、小写字母、数字以及特殊符号3种，且不少于8位';
-          }
-        }
+        validator: "{{\n          (val) => {\n            if (!passwordConfig) return;\n            const regex = passwordConfig.regex;\n            if (val && !regex.test(val)) {\n              return passwordConfig.message\n            }\n          }\n        }}"
       }],
       'x-reactions': [{
         when: '{{addOrEdit === "add"}}',
@@ -163,6 +158,7 @@ var CreateAccount = function CreateAccount(props) {
     Components = contextValue.Components,
     userType = contextValue.userType,
     isMultiRole = contextValue.isMultiRole,
+    passwordConfig = contextValue.passwordConfig,
     passwordEncryption = contextValue.passwordEncryption,
     passwordEncryptionNeedSalt = contextValue.passwordEncryptionNeedSalt;
   var getAccountDetail = /*#__PURE__*/function () {
@@ -357,7 +353,8 @@ var CreateAccount = function CreateAccount(props) {
     schema: schema,
     scope: {
       addOrEdit: addOrEdit,
-      isMultiRole: isMultiRole
+      isMultiRole: isMultiRole,
+      passwordConfig: passwordConfig
     }
   }), /*#__PURE__*/React.createElement(FormButtonGroup.FormItem, null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",

package/dist/UserCenter/ConfigProvider/index.d.ts

@@ -9,6 +9,7 @@ export interface MainProps {
     userType?: string;
     showDataAuth?: boolean;
     isMultiRole?: boolean;
+    passwordConfig?: any;
     passwordEncryption?: string;
     passwordEncryptionNeedSalt?: boolean;
     hideDeleteAccountBtn?: boolean;

package/dist/UserCenter/ConfigProvider/index.js

@@ -58,6 +58,8 @@ var Index = function Index(props) {
     showDataAuth = _props$showDataAuth === void 0 ? false : _props$showDataAuth,
     _props$isMultiRole = props.isMultiRole,
     isMultiRole = _props$isMultiRole === void 0 ? true : _props$isMultiRole,
+    _props$passwordConfig = props.passwordConfig,
+    passwordConfig = _props$passwordConfig === void 0 ? null : _props$passwordConfig,
     _props$passwordEncryp = props.passwordEncryption,
     passwordEncryption = _props$passwordEncryp === void 0 ? 'md5' : _props$passwordEncryp,
     _props$passwordEncryp2 = props.passwordEncryptionNeedSalt,
@@ -213,6 +215,7 @@ var Index = function Index(props) {
       userType: userType,
       showDataAuth: showDataAuth,
       isMultiRole: isMultiRole,
+      passwordConfig: passwordConfig,
       passwordEncryption: passwordEncryption,
       passwordEncryptionNeedSalt: passwordEncryptionNeedSalt,
       hideDeleteAccountBtn: hideDeleteAccountBtn,

package/dist/UserCenter/OrgPage/components/CreateMember/index.js

@@ -11,7 +11,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form, FormItem, Input, Select } from '@formily/antd-v5';
 import { createForm } from '@formily/core';
 import { createSchemaField } from '@formily/react';
-import { Modal, message, Checkbox } from 'antd';
+import { Checkbox, Modal, message } from 'antd';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
 import OrgSelect from "../../../OrgSelect";
 import { MEMBER_TYPE_ENUM, MEMBER_TYPE_TEXT_ENUM } from "../../../enum";
@@ -227,6 +227,9 @@ var CreateMember = function CreateMember(props) {
           // disabled: '{{type === "edit"}}',
         },
         'x-validator': [{
+          required: true,
+          message: '请输入手机号'
+        }, {
           format: 'phone',
           message: '请输入正确的手机号'
         }]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepinnet-components/pc",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",