@zgfe/modules-settings 1.2.11 → 1.2.13

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

@@ -10,20 +10,24 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
 import './index.less';
 import { Button, Form, Input, notification, Radio, Select, TreeSelect } from 'antd';
 import request from './../../../utils/ajax';
 import apis from './../../../constants/api';
-import { BizDialog, BizSelect } from '@zgfe/business-lib';
+import { BizDialog, BizSelect, BizGlobalDataContext } from '@zgfe/business-lib';
 // import companySettingUserGroup from '../edit/userGroup'
 // 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,
+    isDemo = _useContext.isDemo;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     queryParams = _useState2[0],
@@ -38,12 +42,23 @@ var UserGroup = function UserGroup(props) {
     setDepartmentList = _useState6[1];
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    createAppLoading = _useState8[0],
-    setCreateAppLoading = _useState8[1];
-  var _useState9 = useState(false),
+    isAdmin = _useState8[0],
+    setIsAdmin = _useState8[1];
+  var _useState9 = useState({
+      rule: /^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9~!@#$%^&*]{8,20}$/,
+      description: '请输入8-20个字符,可包括大小写字母和数字 特殊字符(!@#$%^&*)'
+    }),
     _useState10 = _slicedToArray(_useState9, 2),
-    createdAppPanel = _useState10[0],
-    setCreatedAppPanel = _useState10[1];
+    passwordRule = _useState10[0],
+    setPasswordRule = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    createAppLoading = _useState12[0],
+    setCreateAppLoading = _useState12[1];
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    createdAppPanel = _useState14[0],
+    setCreatedAppPanel = _useState14[1];
   useEffect(function () {
     if (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) {
       setCreatedAppPanel(true);
@@ -58,6 +73,8 @@ var UserGroup = function UserGroup(props) {
     queryPanel(_objectSpread({}, queryParams));
   }, [queryParams]);
   useEffect(function () {
+    // 密码正则
+    getPasswordRuleList(companyId);
     // 角色下拉数据
     queryRoleListByUserIdList(null);
     // 部门下拉数据
@@ -72,14 +89,43 @@ var UserGroup = function UserGroup(props) {
       }
     }).then(function (res) {
       if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
-        var _res$data, _res$data$roleIds;
+        var _res$data, _res$data$deptIds, _res$data2, _res$data2$roleIds, _res$data3;
+        var flattenArray = function flattenArray(array) {
+          var flatArray = [];
+          array.forEach(function (item) {
+            var children = item.children || [];
+            delete item.children;
+            var childArray = flattenArray(children);
+            flatArray.push(item);
+            flatArray = flatArray.concat(childArray);
+          });
+          return flatArray;
+        };
+        var deptIdsList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$deptIds = _res$data.deptIds) === null || _res$data$deptIds === void 0 ? void 0 : _res$data$deptIds.map(function (item) {
+          var _flattenArray, _app$;
+          var app = (_flattenArray = flattenArray(departmentList)) === null || _flattenArray === void 0 ? void 0 : _flattenArray.filter(function (v) {
+            return v.id === item;
+          });
+          return (_app$ = app[0]) === null || _app$ === void 0 ? void 0 : _app$.id;
+        });
+        var roleIdsList = res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$roleIds = _res$data2.roleIds) === null || _res$data2$roleIds === void 0 ? void 0 : _res$data2$roleIds.map(function (item) {
+          var _app$2;
+          var app = userList === null || userList === void 0 ? void 0 : userList.filter(function (v) {
+            return v.id === item;
+          });
+          return {
+            id: (_app$2 = app[0]) === null || _app$2 === void 0 ? void 0 : _app$2.id
+          };
+        });
         form.setFieldsValue(_objectSpread(_objectSpread({}, res.data), {}, {
-          roleIds: res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$roleIds = _res$data.roleIds) === null || _res$data$roleIds === void 0 ? void 0 : _res$data$roleIds.map(function (item) {
-            return {
-              id: item
-            };
+          deptIds: deptIdsList.filter(function (v) {
+            return v !== undefined;
+          }),
+          roleIds: roleIdsList.filter(function (v) {
+            return v.id !== undefined;
           })
         }));
+        setIsAdmin(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.isAdmin);
       }
     }).catch(function (error) {
       console.log(error);
@@ -117,6 +163,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;
@@ -143,9 +208,6 @@ var UserGroup = function UserGroup(props) {
         queryPanel(_objectSpread({}, queryParams));
       } else {
         setCreateAppLoading(false);
-        notification.error({
-          message: (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) ? '编辑失败,请重试' : '创建失败,请重试'
-        });
       }
     }).catch(function (error) {
       console.log(error);
@@ -170,34 +232,46 @@ var UserGroup = function UserGroup(props) {
     },
     placeholder: '请输入姓名'
   })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u89D2\u8272"), /*#__PURE__*/React.createElement(Select, {
-    style: {
-      width: '248px'
-    },
     options: userList,
     placeholder: '请选择角色',
     fieldNames: {
       label: 'roleName',
       value: 'id'
     },
+    style: {
+      width: '248px'
+    },
     allowClear: true,
     onChange: function onChange(e) {
       setQueryParams(_objectSpread(_objectSpread({}, queryParams), {}, {
         roleId: e
       }));
-    }
+    },
+    suffixIcon: /*#__PURE__*/React.createElement("i", {
+      style: {
+        fontSize: 14,
+        color: '#5f6085'
+      },
+      className: "bsicon xiangxia"
+    })
   }))), /*#__PURE__*/React.createElement("div", {
     className: "invite-list"
   }, /*#__PURE__*/React.createElement("div", null, "\u6210\u5458\u5217\u8868"), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       setCreatedAppPanel(true);
       form.resetFields();
+      form.setFieldsValue({
+        accountStatus: 1
+      });
     },
+    disabled: !authority[10088],
     type: "primary",
     size: "middle"
   }, "\u6DFB\u52A0\u6210\u5458")), /*#__PURE__*/React.createElement(BizDialog, {
-    title: (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) ? '编辑角色' : '新增角色',
+    title: (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) ? '编辑成员' : '新增成员',
     open: createdAppPanel,
     width: 520,
+    className: "setting-bizDialog",
     closable: true,
     onOk: function onOk() {
       form.submit();
@@ -220,8 +294,12 @@ 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, {
+    disabled: (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) !== undefined,
     maxLength: 50,
     placeholder: '请输入账号'
   })), /*#__PURE__*/React.createElement(Form.Item, {
@@ -232,7 +310,13 @@ var UserGroup = function UserGroup(props) {
       message: '请输入姓名'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
-    maxLength: 50,
+    onBlur: function onBlur(event) {
+      var _event$target, _event$target$value;
+      form.setFieldsValue({
+        username: event === null || event === void 0 ? void 0 : (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$value = _event$target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.replace(/ /g, '')
+      });
+    },
+    maxLength: 10,
     placeholder: '请输入姓名'
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'roleIds',
@@ -251,10 +335,7 @@ var UserGroup = function UserGroup(props) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'deptIds',
     label: "\u90E8\u95E8",
-    rules: [{
-      required: true,
-      message: '请选择部门'
-    }]
+    className: "no-rules-label"
   }, /*#__PURE__*/React.createElement(TreeSelect, {
     treeDefaultExpandAll: true,
     multiple: true,
@@ -264,9 +345,10 @@ var UserGroup = function UserGroup(props) {
     },
     placeholder: "\u8BF7\u9009\u62E9\u4E0A\u7EA7\u90E8\u95E8",
     treeData: departmentList
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+  })), !isAdmin && /*#__PURE__*/React.createElement(Form.Item, {
     name: 'accountStatus',
     label: "\u72B6\u6001",
+    className: "account-status",
     rules: [{
       required: true,
       message: '请选择状态'
@@ -283,6 +365,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/es/modules/companySetting/wechatBinding/index.less

@@ -1,26 +1,32 @@
 .company-setting-wechat-binding {
   min-height: 300px;
   max-height: 100%;
+  margin-top: 8px;
   padding: 0;
   overflow: auto;
+
   .wechat-title {
     display: flex;
     justify-content: space-between;
     margin-bottom: 20px;
     line-height: 16px;
+
     h4 {
       font-weight: normal;
       font-size: 16px;
     }
+
     a {
       color: #00a0ea;
     }
   }
+
   .wechat-account {
     img {
       width: 20px;
       height: 20px;
     }
+
     .wechat-name {
       display: inline-block;
       width: 80px;
@@ -30,18 +36,22 @@
       text-overflow: ellipsis;
     }
   }
+
   .untied-wechat {
     color: #00a0ea;
     cursor: pointer;
   }
+
   .c-dialog .c-dialog-content {
     padding: 20px;
     color: #858585;
     font-size: 14px;
+
     .c-input {
       color: initial;
     }
   }
+
   .c-data-grid {
     border-radius: 0;
   }

package/es/modules/systemSetting/demo.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: () => React.JSX.Element;
+export default _default;

package/es/modules/systemSetting/demo.js

@@ -0,0 +1,10 @@
+import { DemoWrapper } from '@zgfe/business-lib';
+import React from 'react';
+import { SystemSetting } from '../..';
+export default (function () {
+  return /*#__PURE__*/React.createElement(DemoWrapper, {
+    defaultApp: 348
+  }, /*#__PURE__*/React.createElement(SystemSetting, {
+    appList: []
+  }));
+});

package/es/modules/systemSetting/notice/configItem/index.js

@@ -1,7 +1,8 @@
 import { Button, Col, Descriptions, Row } from 'antd';
 import { EditOutlined } from '@ant-design/icons';
-import React from 'react';
+import React, { useContext } from 'react';
 import './index.less';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
 var ConfigItem = function ConfigItem(_ref) {
   var _configFieldMap$get;
   var onEdit = _ref.onEdit,
@@ -19,6 +20,8 @@ var ConfigItem = function ConfigItem(_ref) {
     name: 'fromName',
     value: '发件人昵称'
   }]);
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
     className: "item-title"
   }, /*#__PURE__*/React.createElement(Col, {
@@ -29,6 +32,7 @@ var ConfigItem = function ConfigItem(_ref) {
     className: "title-right"
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: !authority[10085],
     onClick: function onClick() {
       return onEdit(item);
     }

package/es/requests/role.d.ts

@@ -4,13 +4,22 @@ export declare const queryRolePage: (data: {
     pageSize: number;
 }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryRoleDetails: (data: {
     id: number | null;
-}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryRoleDataConfig: (data: {
+}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<{
+    appIds: number[];
+    userIds: number[];
+    menuCodeMap: {};
+    settingMenuList: [];
+}> | null>, queryRoleDataConfig: (data: {
     id: number | null;
 }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryRoleMenuTree: (data: {
     id: number | null;
     systemVersion: number | null;
-}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryRoleUser: (data: {
+}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryCompanyUser: (data: {
     id: number | null;
-}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, addRole: (data: any) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, updateRole: (data: any) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, deleteRole: (data: {
+}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, addRole: (data: {
+    id: number | null;
+}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, updateRole: (data: {
+    id: number | null;
+}) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, deleteRole: (data: {
     id: number | null;
 }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>;

package/es/requests/role.js

@@ -50,14 +50,14 @@ var Department = /*#__PURE__*/function () {
     }
     // 用户下拉数据
   }, {
-    key: "queryRoleUser",
-    value: function queryRoleUser(data) {
-      return ajax(api.setting.queryRoleUser, {
+    key: "queryCompanyUser",
+    value: function queryCompanyUser(data) {
+      return ajax(api.setting.queryCompanyUser, {
         method: 'post',
         data: data
       });
     }
-    // queryRoleUser
+    // queryCompanyUser
     // 修改
   }, {
     key: "addRole",
@@ -93,8 +93,8 @@ var _Department = new Department(),
   queryRoleDetails = _Department.queryRoleDetails,
   queryRoleDataConfig = _Department.queryRoleDataConfig,
   queryRoleMenuTree = _Department.queryRoleMenuTree,
-  queryRoleUser = _Department.queryRoleUser,
+  queryCompanyUser = _Department.queryCompanyUser,
   addRole = _Department.addRole,
   updateRole = _Department.updateRole,
   deleteRole = _Department.deleteRole;
-export { queryRolePage, queryRoleDetails, queryRoleDataConfig, queryRoleMenuTree, queryRoleUser, addRole, updateRole, deleteRole };
+export { queryRolePage, queryRoleDetails, queryRoleDataConfig, queryRoleMenuTree, queryCompanyUser, addRole, updateRole, deleteRole };

package/es/types/companySetting.d.ts

@@ -156,6 +156,7 @@ export interface AllMembersItem {
     label?: string;
     inv_status?: number;
     isAdmin?: boolean;
+    createDateTime?: string;
     authConfig?: AuthConfig;
     groupName?: string;
 }

package/es/utils/util.d.ts

@@ -224,6 +224,12 @@ declare const util: {
         title: string;
         parentId: number;
     }[];
-    menuTreeData(arr: any[]): any[];
+    menuTreeData(arr: {
+        disabled: boolean | number;
+        children: object[] | undefined;
+    }[]): {
+        disabled: boolean | number;
+        children: object[] | undefined;
+    }[];
 };
 export default util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -38,7 +38,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.86",
+    "@zgfe/business-lib": "1.1.87-auth.11",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
@@ -51,8 +51,8 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "93469e802d8605f0fa693f9ddbdefecca8cc36d2",
+  "gitHead": "2e06635975cd56d952aba66b69cfc1e060d5a988",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }
-}
+}