@zgfe/modules-settings 1.2.15-ht.0 → 1.2.15-role2.0

package/es/constants/api.js

@@ -43,8 +43,8 @@ var apis = {
     createFilter: '/user/createFilter.jsp',
     queryFilter: '/user/queryFilter.jsp',
     //系统设置
-    queryNoticeConfig: '/zg/web/v2/systemSettings/queryNoticeSettings',
-    editNoticeConfig: '/zg/web/v2/systemSettings/setNoticeSettings',
+    queryNoticeConfig: apiPrefix + '/systemSettings/queryNoticeSettings',
+    editNoticeConfig: apiPrefix + '/systemSettings/setNoticeSettings',
     // 部门管理
     queryDeptList: '/zg/web/v2/company/setting/queryDeptList',
     addDept: '/zg/web/v2/company/setting/addDept',

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

@@ -19,7 +19,7 @@ import './index.less';
 import util from './../../../utils/util';
 import { Button, Drawer, Form, Input, Radio, Spin, Table, Tooltip, Tree, notification } from 'antd';
 import moment from 'moment';
-import { BizDialog, BizSelect, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
+import { BizDialog, BizSelect, IconFont, BizGlobalDataContext, BizUserGroupHeader } from '@zgfe/business-lib';
 import { addRole, queryRoleDataConfig, queryRoleDetails, queryRoleMenuTree, queryRolePage, queryCompanyUser, updateRole, deleteRole } from '../../../requests/role';
 var RoleList = function RoleList(props) {
   // 弹窗
@@ -646,6 +646,17 @@ var RoleList = function RoleList(props) {
     autoExpandParent: true,
     treeData: functionList
   }))), /*#__PURE__*/React.createElement(Form.Item, {
+    name: 'dataRange',
+    label: "\u6570\u636E\u8303\u56F4",
+    rules: [{
+      required: true,
+      message: '请选择数据范围'
+    }],
+    className: "data-range-form"
+  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
+    max: 1,
+    enableTags: true
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'isEncryption',
     className: "is-encryption",
     label: /*#__PURE__*/React.createElement(React.Fragment, null, "\u6570\u636E\u52A0\u5BC6", /*#__PURE__*/React.createElement(Tooltip, {

package/es/modules/companySetting/role/index.less

@@ -217,4 +217,20 @@
       text-align: right;
     }
   }
+
+  .data-range-form {
+    .biz-user-group-header-title {
+      display: none;
+    }
+
+    & .biz-user-group-header-container {
+      padding: 0;
+      background-color: transparent;
+
+      .ant-space-item:nth-child(1) {
+        width: 100%;
+        height: 34px;
+      }
+    }
+  }
 }

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

@@ -3,11 +3,6 @@ import { EditOutlined } from '@ant-design/icons';
 import React, { useContext } from 'react';
 import './index.less';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-var codeObj = {
-  email: 10085,
-  message: 1700125259,
-  phone: 1700125260
-};
 var ConfigItem = function ConfigItem(_ref) {
   var _configFieldMap$get;
   var onEdit = _ref.onEdit,
@@ -24,47 +19,10 @@ var ConfigItem = function ConfigItem(_ref) {
   }, {
     name: 'fromName',
     value: '发件人昵称'
-  }]).set('message', [{
-    name: 'accountSId',
-    value: 'ACCOUNT SID(主账户 ID)',
-    isSecret: true
-  }, {
-    name: 'accountToken',
-    value: 'Account Token(账户授权令牌)',
-    isSecret: true
-  }, {
-    name: 'templateId',
-    value: 'Templateid(模板ID)',
-    isSecret: true
-  }, {
-    name: 'accountAppId',
-    value: 'Account Appid(应用ID)',
-    isSecret: true
-  }]).set('phone', [{
-    name: 'dataSourceName',
-    value: 'DataSourceName(数据源名称)',
-    isSecret: true
-  }, {
-    name: 'contactGroupName',
-    value: 'ContactGroupName(联系人组名称)',
-    isSecret: true
-  }, {
-    name: 'botName',
-    value: 'BotName(机器人名称)',
-    isSecret: true
-  }, {
-    name: 'accountToken',
-    value: 'Account Token(账户授权令牌)',
-    isSecret: true
-  }, {
-    name: 'taskShowNumber',
-    value: '外显号码'
   }]);
   var _useContext = useContext(BizGlobalDataContext),
     authority = _useContext.authority;
-  return /*#__PURE__*/React.createElement("div", {
-    className: "setting-config-view"
-  }, /*#__PURE__*/React.createElement(Row, {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
     className: "item-title"
   }, /*#__PURE__*/React.createElement(Col, {
     span: 12,
@@ -74,7 +32,7 @@ var ConfigItem = function ConfigItem(_ref) {
     className: "title-right"
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
-    disabled: !authority[codeObj[item.type]],
+    disabled: !authority[10085],
     onClick: function onClick() {
       return onEdit(item);
     }
@@ -85,11 +43,10 @@ var ConfigItem = function ConfigItem(_ref) {
   }), "\u7F16\u8F91"))), /*#__PURE__*/React.createElement(Descriptions, {
     column: 1
   }, (_configFieldMap$get = configFieldMap.get(item.type)) === null || _configFieldMap$get === void 0 ? void 0 : _configFieldMap$get.map(function (field) {
-    var txt = item.config && item.config[field.name] || '';
     return /*#__PURE__*/React.createElement(Descriptions.Item, {
       key: field.value,
       label: field.value
-    }, field.isSecret ? txt.replace(/./g, '*') : txt);
+    }, item.config && item.config[field.name]);
   })));
 };
 export default ConfigItem;

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

@@ -13,8 +13,3 @@
     text-align: right;
   }
 }
-.setting-config-view {
-  .ant-descriptions-item-label {
-    color: #354354;
-  }
-}

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

@@ -68,93 +68,6 @@ var ItemEdit = function ItemEdit(props) {
       }],
       required: false
     }]
-  }).set('message', {
-    config: [{
-      name: 'accountSId',
-      field: 'ACCOUNT SID(主账户 ID)',
-      rules: [{
-        required: true,
-        message: '请输入ACCOUNT SID(主账户 ID)'
-      }],
-      type: 'password',
-      placeholder: '请输入ACCOUNT SID(主账户 ID)'
-    }, {
-      name: 'accountToken',
-      field: 'Account Token(账户授权令牌)',
-      rules: [{
-        required: true,
-        message: '请输入Account Token(账户授权令牌)'
-      }],
-      type: 'password',
-      placeholder: '请输入您的Account Token(账户授权令牌)'
-    }, {
-      name: 'accountAppId',
-      field: 'Account Appid(应用ID)',
-      rules: [{
-        required: true,
-        message: '请输入Account Appid(应用ID)'
-      }],
-      type: 'password',
-      placeholder: '请输入您的Account Appid(应用ID)'
-    }, {
-      name: 'templateId',
-      field: 'Templateid(模板ID)',
-      rules: [{
-        required: true,
-        message: '请输入Templateid(模板ID)'
-      }],
-      type: 'password',
-      placeholder: '请输入Templateid(模板ID)'
-    }]
-  }).set('phone', {
-    config: [{
-      name: 'dataSourceName',
-      field: 'DataSourceName(数据源名称)',
-      rules: [{
-        required: true,
-        message: '请输入DataSourceName(数据源名称)'
-      }],
-      placeholder: '请输入DataSourceName(数据源名称)L',
-      type: 'password'
-    }, {
-      name: 'contactGroupName',
-      field: 'ContactGroupName(联系人组名称)',
-      rules: [{
-        required: true,
-        message: '请输入ContactGroupName(联系人组名称)'
-      }],
-      placeholder: '请输入ContactGroupName(联系人组名称)',
-      type: 'password'
-    }, {
-      name: 'botName',
-      field: 'BotName(机器人名称)',
-      rules: [{
-        required: true,
-        message: '请输入BotName(机器人名称)'
-      }],
-      type: 'password',
-      placeholder: '请输入BotName(机器人名称)'
-    }, {
-      name: 'accountToken',
-      field: 'Account Token(账户授权令牌)',
-      rules: [{
-        required: true,
-        message: '请输入Account Token(账户授权令牌)'
-      }],
-      placeholder: '请输入Account Token(账户授权令牌)',
-      type: 'password'
-    }, {
-      name: 'taskShowNumber',
-      field: '外显号码',
-      rules: [{
-        required: true,
-        message: '请输入外显号码'
-      }, {
-        pattern: /^\d{1,11}$/,
-        message: '外显号码长度小于11的数字'
-      }],
-      placeholder: '请输入外显号码'
-    }]
   });
   // 确认
   var onFinish = function onFinish() {
@@ -182,11 +95,7 @@ var ItemEdit = function ItemEdit(props) {
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: config.field,
       name: config.name,
-      rules: config.rules,
-      labelCol: {
-        span: 0,
-        offset: 0
-      }
+      rules: config.rules
     }, /*#__PURE__*/React.createElement(Input, {
       placeholder: config.placeholder,
       type: config.type === 'password' ? 'password' : 'text'

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

@@ -17,20 +17,11 @@ import request, { urlRequest } from '../../../utils/ajax';
 import ConfigItem from './configItem';
 import ItemEdit from './edit';
 var Notice = function Notice() {
-  var typeMap = new Map([[1, 'email'], [2, 'message'], [3, 'phone']]);
-  var keyMap = new Map([['email', 1], ['message', 2], ['phone', 3]]);
+  var typeMap = new Map([[1, 'email']]);
   var _useState = useState(new Map().set('email', {
       type: 'email',
       name: '邮件',
       config: {}
-    }).set('message', {
-      type: 'message',
-      name: '短信',
-      config: {}
-    }).set('phone', {
-      type: 'phone',
-      name: '电话',
-      config: {}
     })),
     _useState2 = _slicedToArray(_useState, 2),
     settingMap = _useState2[0],
@@ -73,12 +64,11 @@ var Notice = function Notice() {
     var formData = new FormData();
     formData.set('type', editSetting.type);
     formData.set('config', JSON.stringify(values));
-    console.log('editSetting.type', editSetting.type);
     urlRequest(apis.setting.editNoticeConfig, {
       method: 'post',
       // data: formData,
       data: {
-        type: keyMap.get(editSetting.type) || null,
+        type: editSetting.type === 'email' ? 1 : null,
         config: JSON.stringify(values)
       }
     }).then(function (res) {

package/es/types/system.d.ts

@@ -21,7 +21,6 @@ export interface INoticeConfigMap {
 export interface ISystemSettingItemMap {
     name: string;
     value: string;
-    isSecret?: boolean;
 }
 export interface IEditNoticeConfigRes<T> extends InterfaceApiResult<T> {
     status?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.15-ht.0",
+  "version": "1.2.15-role2.0",
   "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.95",
+    "@zgfe/business-lib": "1.1.87-auth.11",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "43c56c1a82207ce5c15359e8e2faacf84cffb04e",
+  "gitHead": "36dee535c3b2364abc5bc41acf6fb65e51782b17",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }