@zgfe/modules-settings 1.2.10-heyh.0 → 1.2.10-lmy-role5

package/es/constants/api.d.ts

@@ -56,6 +56,7 @@ declare let apis: {
         queryDeptListByUserId: string;
         queryCompanyUserDetailsParam: string;
         addCompanyUser: string;
+        getPasswordRule: string;
         updateCompanyUser: string;
         delCompanyUser: string;
         updateCompanyUserStatus: string;

package/es/constants/api.js

@@ -65,6 +65,7 @@ var apis = {
     queryDeptListByUserId: '/zg/web/v2/company/setting/queryDeptListByUserId',
     queryCompanyUserDetailsParam: '/zg/web/v2/company/setting/queryCompanyUserDetailsParam',
     addCompanyUser: '/zg/web/v2/company/setting/addCompanyUser',
+    getPasswordRule: '/zg/web/v2/system/getPasswordRule',
     updateCompanyUser: '/zg/web/v2/company/setting/updateCompanyUser',
     delCompanyUser: '/zg/web/v2/company/setting/delCompanyUser',
     updateCompanyUserStatus: '/zg/web/v2/company/setting/updateCompanyUserStatus' // 修改状态

package/es/modules/appSettings/member/modal.js

@@ -12,7 +12,6 @@ var SetingModal = function SetingModal(props) {
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
     dealArr = props.dealArr;
-  console.log(6666, data);
   return /*#__PURE__*/React.createElement(Modal, {
     className: "seting-modal-box",
     title: "\u6743\u9650\u4FE1\u606F",

package/es/modules/companySetting/demo.js

@@ -15,8 +15,6 @@ export default (function () {
       authority: sessionStorage.getItem('authorityList') ? JSON.parse(sessionStorage.getItem('authorityList')) : {}
     }
   }, /*#__PURE__*/React.createElement(CompanySetting, {
-    showWeChatMenu: true,
-    showMarketMenu: true,
     action: ''
   })));
 });

package/es/modules/companySetting/index.d.ts

@@ -1,8 +1,6 @@
 import React from 'react';
 import './index.less';
 declare const CompanySetting: React.FC<{
-    showWeChatMenu: boolean;
-    showMarketMenu: boolean;
     action: string;
     settingCallback?: (type: string, obj?: {
         [key: string]: any;

package/es/modules/companySetting/index.js

@@ -26,9 +26,7 @@ import OperationLog from './operationLog';
 import DepartmentList from './department';
 import RoleList from './role';
 var CompanySetting = function CompanySetting(props) {
-  var showWeChatMenu = props.showWeChatMenu,
-    showMarketMenu = props.showMarketMenu,
-    action = props.action,
+  var action = props.action,
     settingCallback = props.settingCallback;
   // #todo 需要修改主应用传入参数和business-lib数据仓库
   var apisOkNum = 0;
@@ -442,6 +440,7 @@ var CompanySetting = function CompanySetting(props) {
       settingCurrentUser: settingCurrentUser,
       id: id,
       groupHashList: groupHashList,
+      companyId: companyId,
       companyAppList: companyAppList,
       allGroupInfos: allGroupInfos,
       leftMenus: leftMenus,
@@ -527,7 +526,7 @@ var CompanySetting = function CompanySetting(props) {
     key: 'weChatBinding',
     label: '微信账号绑定',
     children: /*#__PURE__*/React.createElement(WechatBinding, null),
-    hidden: !(showWeChatMenu && showMarketMenu && showDataDaily && isAdmin)
+    hidden: !(authority[1016] && authority[1019] && showDataDaily && isAdmin)
   }, {
     key: 'operationLog',
     label: '操作日志',

package/es/modules/companySetting/user/index.d.ts

@@ -12,6 +12,7 @@ declare const User: React.FC<{
     leftMenus: LeftMenusItem[];
     isAdmin: boolean;
     serviceType: number;
+    companyId: number;
     removeUserCallback: (delIndex: number) => void;
     changeUserAuthCallback: (id: number) => void;
     createMembersCallback: (res: ApiResult<void>, userConfig?: AllMembersItem | false) => void;

package/es/modules/companySetting/user/index.js

@@ -27,6 +27,7 @@ var User = function User(props) {
   var id = props.id,
     allGroupInfos = props.allGroupInfos,
     isAdmin = props.isAdmin,
+    companyId = props.companyId,
     removeUserCallback = props.removeUserCallback,
     _createMembersCallback = props.createMembersCallback,
     changeAdminCallback = props.changeAdminCallback;
@@ -392,6 +393,7 @@ var User = function User(props) {
     className: "company-user"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Invite, {
     queryPanel: queryPanel,
+    companyId: companyId,
     userEditAuthData: userEditAuthData,
     allGroupInfos: allGroupInfos,
     createMembersCallback: function createMembersCallback(res, userConfig) {

package/es/modules/companySetting/user/invite.d.ts

@@ -5,6 +5,7 @@ declare const UserGroup: React.FC<{
     allGroupInfos: AllGroupInfosItem[];
     queryPanel: (params: queryPanelItem) => void;
     userEditAuthData: AllMembersItem;
+    companyId: number;
     createMembersCallback: (res: ApiResult<void>, userConfig: AllMembersItem | false) => void;
 }>;
 export default UserGroup;

package/es/modules/companySetting/user/invite.js

@@ -20,12 +20,14 @@ import { BizDialog, BizSelect, BizGlobalDataContext } from '@zgfe/business-lib';
 // import groupItem from './groupItem.vue'
 var UserGroup = function UserGroup(props) {
   var queryPanel = props.queryPanel,
-    userEditAuthData = props.userEditAuthData;
+    userEditAuthData = props.userEditAuthData,
+    companyId = props.companyId;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _useContext = useContext(BizGlobalDataContext),
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    isDemo = _useContext.isDemo;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     queryParams = _useState2[0],
@@ -38,14 +40,21 @@ var UserGroup = function UserGroup(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     departmentList = _useState6[0],
     setDepartmentList = _useState6[1];
-  var _useState7 = useState(false),
+  var _useState7 = useState({
+      rule: /^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9~!@#$%^&*]{8,20}$/,
+      description: '请输入8-20个字符,可包括大小写字母和数字 特殊字符(!@#$%^&*)'
+    }),
     _useState8 = _slicedToArray(_useState7, 2),
-    createAppLoading = _useState8[0],
-    setCreateAppLoading = _useState8[1];
+    passwordRule = _useState8[0],
+    setPasswordRule = _useState8[1];
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    createdAppPanel = _useState10[0],
-    setCreatedAppPanel = _useState10[1];
+    createAppLoading = _useState10[0],
+    setCreateAppLoading = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    createdAppPanel = _useState12[0],
+    setCreatedAppPanel = _useState12[1];
   useEffect(function () {
     if (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) {
       setCreatedAppPanel(true);
@@ -60,6 +69,8 @@ var UserGroup = function UserGroup(props) {
     queryPanel(_objectSpread({}, queryParams));
   }, [queryParams]);
   useEffect(function () {
+    // 密码正则
+    getPasswordRuleList(companyId);
     // 角色下拉数据
     queryRoleListByUserIdList(null);
     // 部门下拉数据
@@ -119,6 +130,25 @@ var UserGroup = function UserGroup(props) {
       console.log(error);
     });
   };
+  var getPasswordRuleList = function getPasswordRuleList(id) {
+    request(apis.setting.getPasswordRule, {
+      method: 'get',
+      params: {
+        companyId: id
+      }
+    }).then(function (res) {
+      if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
+        setPasswordRule(res === null || res === void 0 ? void 0 : res.data);
+      } else {
+        setPasswordRule({
+          rule: /^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9~!@#$%^&*]{8,20}$/,
+          description: '请输入8-20个字符,可包括大小写字母和数字 特殊字符(!@#$%^&*)'
+        });
+      }
+    }).catch(function (error) {
+      console.log(error);
+    });
+  };
   // 编辑||创建
   var onFinish = function onFinish(value) {
     var _value$roleIds;
@@ -223,6 +253,9 @@ var UserGroup = function UserGroup(props) {
     rules: [{
       required: true,
       message: '请输入账号'
+    }, {
+      pattern: isDemo ? /^[a-z0-9._@]{5,30}$/ : /^1[3-9]\d{8,9}$/,
+      message: isDemo ? '请输入5～30个字符，可包含小写字母和数字、特殊字符(_.@)' : '手机号格式错误'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     maxLength: 50,
@@ -286,6 +319,9 @@ var UserGroup = function UserGroup(props) {
     rules: [{
       required: true,
       message: '请输入密码'
+    }, {
+      pattern: new RegExp(passwordRule === null || passwordRule === void 0 ? void 0 : passwordRule.rule, 'g'),
+      message: passwordRule === null || passwordRule === void 0 ? void 0 : passwordRule.description
     }]
   }, /*#__PURE__*/React.createElement(Input.Password, {
     maxLength: 50,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.10-heyh.0",
+  "version": "1.2.10-lmy-role5",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,8 +51,8 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "5a87fbd333e67d981913658dff83a7018bbaeb2e",
+  "gitHead": "2e06635975cd56d952aba66b69cfc1e060d5a988",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }
-}
+}