@zgfe/modules-settings 1.2.15-role2.3 → 1.2.15

package/es/constants/api.js

@@ -43,8 +43,8 @@ var apis = {
     createFilter: '/user/createFilter.jsp',
     queryFilter: '/user/queryFilter.jsp',
     //系统设置
-    queryNoticeConfig: apiPrefix + '/systemSettings/queryNoticeSettings',
-    editNoticeConfig: apiPrefix + '/systemSettings/setNoticeSettings',
+    queryNoticeConfig: '/zg/web/v2/systemSettings/queryNoticeSettings',
+    editNoticeConfig: '/zg/web/v2/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, BizUserTagsSelect, BizUserGroup } from '@zgfe/business-lib';
+import { BizDialog, BizSelect, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import { addRole, queryRoleDataConfig, queryRoleDetails, queryRoleMenuTree, queryRolePage, queryCompanyUser, updateRole, deleteRole } from '../../../requests/role';
 var RoleList = function RoleList(props) {
   // 弹窗
@@ -109,10 +109,6 @@ var RoleList = function RoleList(props) {
     _useState34 = _slicedToArray(_useState33, 2),
     usList = _useState34[0],
     setUsList = _useState34[1];
-  var _useState35 = useState(0),
-    _useState36 = _slicedToArray(_useState35, 2),
-    dataRange = _useState36[0],
-    setDataRange = _useState36[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -563,10 +559,7 @@ var RoleList = function RoleList(props) {
     form: form,
     onFinish: onFinish,
     colon: false,
-    scrollToFirstError: true,
-    initialValues: {
-      dataRange: [0]
-    }
+    scrollToFirstError: true
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: 'name',
     label: "\u89D2\u8272\u540D\u79F0",
@@ -653,42 +646,6 @@ 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("div", {
-    style: {
-      display: 'flex',
-      flexDirection: 'column',
-      minHeight: '40px'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      margin: '6px  0'
-    }
-  }, /*#__PURE__*/React.createElement(Radio.Group, {
-    onChange: function onChange(e) {
-      return setDataRange(e.target.value);
-    },
-    value: dataRange
-  }, /*#__PURE__*/React.createElement(Radio, {
-    value: 0
-  }, "\u6240\u6709\u8303\u56F4"), /*#__PURE__*/React.createElement(Radio, {
-    value: 1
-  }, "\u7528\u6237\u5206\u7FA4"), /*#__PURE__*/React.createElement(Radio, {
-    value: 2
-  }, "\u7528\u6237\u6807\u7B7E"))), dataRange === 1 ? /*#__PURE__*/React.createElement(BizUserGroup, null) : null, dataRange === 2 ? /*#__PURE__*/React.createElement(BizUserTagsSelect, {
-    data: [],
-    childFields: ['children', 'layers'],
-    keyFields: ['labelGroup', 'id', 'layerLabelId'],
-    labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
-    valueFields: ['labelGroup', 'id', 'layerLabelId'],
-    onChange: function onChange() {}
-  }) : null)), /*#__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/systemSetting/notice/configItem/index.js

@@ -3,6 +3,11 @@ 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,
@@ -19,10 +24,44 @@ 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(数据源名称)'
+  }, {
+    name: 'contactGroupName',
+    value: 'ContactGroupName(联系人组名称)'
+  }, {
+    name: 'botName',
+    value: 'BotName(机器人名称)'
+  }, {
+    name: 'accountToken',
+    value: 'Account Token(账户授权令牌)',
+    isSecret: true
+  }, {
+    name: 'taskShowNumber',
+    value: '外显号码'
   }]);
   var _useContext = useContext(BizGlobalDataContext),
     authority = _useContext.authority;
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Row, {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "setting-config-view"
+  }, /*#__PURE__*/React.createElement(Row, {
     className: "item-title"
   }, /*#__PURE__*/React.createElement(Col, {
     span: 12,
@@ -32,7 +71,7 @@ var ConfigItem = function ConfigItem(_ref) {
     className: "title-right"
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
-    disabled: !authority[10085],
+    disabled: !authority[codeObj[item.type]],
     onClick: function onClick() {
       return onEdit(item);
     }
@@ -43,10 +82,11 @@ 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
-    }, item.config && item.config[field.name]);
+    }, field.isSecret ? txt.replace(/./g, '*') : txt);
   })));
 };
 export default ConfigItem;

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

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

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

@@ -68,6 +68,93 @@ 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() {
@@ -95,7 +182,11 @@ var ItemEdit = function ItemEdit(props) {
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: config.field,
       name: config.name,
-      rules: config.rules
+      rules: config.rules,
+      labelCol: {
+        span: 0,
+        offset: 0
+      }
     }, /*#__PURE__*/React.createElement(Input, {
       placeholder: config.placeholder,
       type: config.type === 'password' ? 'password' : 'text'

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

@@ -17,11 +17,20 @@ import request, { urlRequest } from '../../../utils/ajax';
 import ConfigItem from './configItem';
 import ItemEdit from './edit';
 var Notice = function Notice() {
-  var typeMap = new Map([[1, 'email']]);
+  var typeMap = new Map([[1, 'email'], [2, 'message'], [3, 'phone']]);
+  var keyMap = new Map([['email', 1], ['message', 2], ['phone', 3]]);
   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],
@@ -64,11 +73,12 @@ 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: editSetting.type === 'email' ? 1 : null,
+        type: keyMap.get(editSetting.type) || null,
         config: JSON.stringify(values)
       }
     }).then(function (res) {

package/es/types/system.d.ts

@@ -21,6 +21,7 @@ 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-role2.3",
+  "version": "1.2.15",
   "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.87-auth.11",
+    "@zgfe/business-lib": "1.1.95",
     "@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": "453dbebe3dccc2e1f189a62efa6e20aee1a1c8de",
+  "gitHead": "2e06635975cd56d952aba66b69cfc1e060d5a988",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }