@deepinnet-components/pc 0.0.25 → 0.0.27

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

@@ -18,12 +18,12 @@ import { createForm, onFieldValueChange } from '@formily/core';
 import { createSchemaField } from '@formily/react';
 import { Button, Spin, message } from 'antd';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
-import OrgTreeSelect from "../../../OrgTreeSelect";
+import MemberSelect from "../../../MemberSelect";
 import OrgSelect from "../../../OrgSelect";
+import OrgTreeSelect from "../../../OrgTreeSelect";
 import RoleSelect from "../../../RoleSelect";
-import MemberSelect from "../../../MemberSelect";
 import ValueContext from "../../../context";
-import { hashWithCryptoJS } from "../../../utils";
+import { hashWithCryptoJS, sm4Encrypt } from "../../../utils";
 var SchemaField = createSchemaField({
   components: {
     FormItem: FormItem,
@@ -109,16 +109,14 @@ var schema = {
       'x-validator': [{
         required: true,
         message: '请输入密码'
-      }
-      // {
-      //   validator: (val: any) => {
-      //     const regex = /^(?=.*[a-z])(?=.*[A-Z]).{8,}$/
-      //     if (val && !regex.test(val)) {
-      //       return '请输入包含大小写字母且长度不低于8位的密码'
-      //     }
-      //   },
-      // },
-      ],
+      }, {
+        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位';
+          }
+        }
+      }],
       'x-reactions': [{
         when: '{{addOrEdit === "add"}}',
         fulfill: {
@@ -165,7 +163,8 @@ var CreateAccount = function CreateAccount(props) {
     Components = contextValue.Components,
     userType = contextValue.userType,
     isMultiRole = contextValue.isMultiRole,
-    passwordEncryption = contextValue.passwordEncryption;
+    passwordEncryption = contextValue.passwordEncryption,
+    passwordEncryptionNeedSalt = contextValue.passwordEncryptionNeedSalt;
   var getAccountDetail = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var params, _yield$ApiService$get, data, _data$departmentFlatD, _data$userMemberBindD;
@@ -253,7 +252,7 @@ var CreateAccount = function CreateAccount(props) {
   var canSubmit = useRef(true);
   var handleSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var values, params, _yield$ApiService$sav, success, _params, _yield$ApiService$sav2, _success;
+      var values, params, _sm4Encrypt, key, encryptedData, _yield$ApiService$sav, success, _params, _yield$ApiService$sav2, _success;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -268,7 +267,7 @@ var CreateAccount = function CreateAccount(props) {
           case 4:
             values = _context2.sent;
             if (!(addOrEdit === 'add')) {
-              _context2.next = 18;
+              _context2.next = 19;
               break;
             }
             _context2.prev = 6;
@@ -281,10 +280,15 @@ var CreateAccount = function CreateAccount(props) {
               userType: userType,
               bindMemberId: values.bindMemberId
             };
+            if (passwordEncryptionNeedSalt) {
+              _sm4Encrypt = sm4Encrypt(params.password), key = _sm4Encrypt.key, encryptedData = _sm4Encrypt.encryptedData;
+              params.password = encryptedData;
+              params.key = key;
+            }
             setLoading(true);
-            _context2.next = 11;
+            _context2.next = 12;
             return ApiService.saveAccount(params);
-          case 11:
+          case 12:
             _yield$ApiService$sav = _context2.sent;
             success = _yield$ApiService$sav.success;
             if (success) {
@@ -292,17 +296,17 @@ var CreateAccount = function CreateAccount(props) {
               onClose === null || onClose === void 0 || onClose();
               onSuccess === null || onSuccess === void 0 || onSuccess();
             }
-          case 14:
-            _context2.prev = 14;
+          case 15:
+            _context2.prev = 15;
             setLoading(false);
             canSubmit.current = true;
-            return _context2.finish(14);
-          case 18:
+            return _context2.finish(15);
+          case 19:
             if (!(addOrEdit === 'edit')) {
-              _context2.next = 31;
+              _context2.next = 32;
               break;
             }
-            _context2.prev = 19;
+            _context2.prev = 20;
             _params = {
               accountNo: actionRow.accountNo,
               roleCodeList: Array.isArray(values.roleCodeList) ? values.roleCodeList : [values.roleCodeList],
@@ -312,9 +316,9 @@ var CreateAccount = function CreateAccount(props) {
               bindMemberId: values.bindMemberId
             };
             setLoading(true);
-            _context2.next = 24;
+            _context2.next = 25;
             return ApiService.saveAccount(_params);
-          case 24:
+          case 25:
             _yield$ApiService$sav2 = _context2.sent;
             _success = _yield$ApiService$sav2.success;
             if (_success) {
@@ -322,16 +326,16 @@ var CreateAccount = function CreateAccount(props) {
               onClose === null || onClose === void 0 || onClose();
               onSuccess === null || onSuccess === void 0 || onSuccess();
             }
-          case 27:
-            _context2.prev = 27;
+          case 28:
+            _context2.prev = 28;
             setLoading(false);
             canSubmit.current = true;
-            return _context2.finish(27);
-          case 31:
+            return _context2.finish(28);
+          case 32:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[6,, 14, 18], [19,, 27, 31]]);
+      }, _callee2, null, [[6,, 15, 19], [20,, 28, 32]]);
     }));
     return function handleSubmit() {
       return _ref2.apply(this, arguments);

package/dist/UserCenter/AccountPage/index.js

@@ -17,7 +17,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ShenduTable } from "../..";
-import { Button, message } from 'antd';
+import { Button, message, Tooltip } from 'antd';
 import dayjs from 'dayjs';
 import React, { useContext, useRef, useState } from 'react';
 import CreateAccount from "./components/CreateAccount";
@@ -109,6 +109,25 @@ var AccountList = function AccountList() {
         }, item.name), !isLast && /*#__PURE__*/React.createElement("div", null, "/"));
       }));
     }
+  }, {
+    title: '角色',
+    dataIndex: 'roles',
+    width: 150,
+    render: function render(_) {
+      var arr = _ === null || _ === void 0 ? void 0 : _[0];
+      if (!(_ !== null && _ !== void 0 && _.length)) return '-';
+      var text = '';
+      _.forEach(function (item, index) {
+        text += item.roleName;
+        if (index !== _.length - 1) text += '/';
+      });
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "top",
+        title: text
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "truncate"
+      }, text));
+    }
   }, {
     title: '创建人',
     dataIndex: 'creatorName',

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

@@ -10,6 +10,7 @@ export interface MainProps {
     showDataAuth?: boolean;
     isMultiRole?: boolean;
     passwordEncryption?: string;
+    passwordEncryptionNeedSalt?: boolean;
     hideDeleteAccountBtn?: boolean;
     hideMemberType?: Boolean;
     showMemberPilot?: Boolean;

package/dist/UserCenter/ConfigProvider/index.js

@@ -60,6 +60,8 @@ var Index = function Index(props) {
     isMultiRole = _props$isMultiRole === void 0 ? true : _props$isMultiRole,
     _props$passwordEncryp = props.passwordEncryption,
     passwordEncryption = _props$passwordEncryp === void 0 ? 'md5' : _props$passwordEncryp,
+    _props$passwordEncryp2 = props.passwordEncryptionNeedSalt,
+    passwordEncryptionNeedSalt = _props$passwordEncryp2 === void 0 ? false : _props$passwordEncryp2,
     _props$hideDeleteAcco = props.hideDeleteAccountBtn,
     hideDeleteAccountBtn = _props$hideDeleteAcco === void 0 ? false : _props$hideDeleteAcco,
     _props$hideMemberType = props.hideMemberType,
@@ -212,6 +214,7 @@ var Index = function Index(props) {
       showDataAuth: showDataAuth,
       isMultiRole: isMultiRole,
       passwordEncryption: passwordEncryption,
+      passwordEncryptionNeedSalt: passwordEncryptionNeedSalt,
       hideDeleteAccountBtn: hideDeleteAccountBtn,
       hideMemberType: hideMemberType,
       showMemberPilot: showMemberPilot

package/dist/UserCenter/utils.d.ts

@@ -1,2 +1,6 @@
 export declare function getUrlQuery(): any;
 export declare function hashWithCryptoJS(message: string, algorithm?: 'md5' | 'sha1' | 'sha256' | 'sha512'): string;
+export declare function sm4Encrypt(data: string): {
+    key: string;
+    encryptedData: string;
+};

package/dist/UserCenter/utils.js

@@ -1,4 +1,5 @@
 import CryptoJS from 'crypto-js';
+import { SM4 } from 'gm-crypto';
 
 // 获取url参数
 export function getUrlQuery() {
@@ -29,4 +30,25 @@ export function hashWithCryptoJS(message) {
     default:
       throw new Error("Unsupported algorithm: ".concat(algorithm));
   }
+}
+
+// 生成32位的16进制数
+function generate32HexDigits() {
+  var result = '';
+  for (var i = 0; i < 32; i++) {
+    result += Math.floor(Math.random() * 16).toString(16);
+  }
+  return result;
+}
+
+// SM4 国标对称加密
+export function sm4Encrypt(data) {
+  var key = generate32HexDigits();
+  return {
+    key: key,
+    encryptedData: SM4.encrypt(data, key, {
+      inputEncoding: 'utf8',
+      outputEncoding: 'base64'
+    })
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepinnet-components/pc",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -56,6 +56,7 @@
     "axios": "^1.5.1",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.13",
+    "gm-crypto": "^0.1.12",
     "lodash-es": "^4.17.21",
     "md5": "^2.3.0",
     "react-router-dom": "^7.6.2",