@zgfe/modules-settings 2.0.0-zhongyuan.8 → 2.1.0-zhongyuan-set.1

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

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useEffect, useState, useContext } from 'react';
 import './index.less';
-import { Button, Form, Input, notification, Radio, Select, TreeSelect } from 'antd';
+import { Button, Form, Input, notification, Radio, Select } from 'antd';
 import request from './../../../utils/ajax';
 import apis from './../../../constants/api';
 import { BizDialog, BizSelect, BizGlobalDataContext } from '@zgfe/business-lib';
@@ -33,29 +33,18 @@ var UserGroup = function UserGroup(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     userList = _useState4[0],
     setUserList = _useState4[1];
-  var _useState5 = useState([]),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    departmentList = _useState6[0],
-    setDepartmentList = _useState6[1];
+    isAdmin = _useState6[0],
+    setIsAdmin = _useState6[1];
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    isAdmin = _useState8[0],
-    setIsAdmin = _useState8[1];
-  var _useState9 = useState({
-      rule: /^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9~!@#$%^&*]{8,20}$/,
-      description: '请输入8-20个字符,可包括大小写字母和数字 特殊字符(!@#$%^&*)'
-    }),
+    createAppLoading = _useState8[0],
+    setCreateAppLoading = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    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];
+    createdAppPanel = _useState10[0],
+    setCreatedAppPanel = _useState10[1];
   useEffect(function () {
     if (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) {
       setCreatedAppPanel(true);
@@ -63,19 +52,17 @@ var UserGroup = function UserGroup(props) {
       // 角色下拉数据
       queryRoleListByUserIdList(userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id);
       // 部门下拉数据
-      queryDeptListByUserIdList(userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id);
+      // queryDeptListByUserIdList(userEditAuthData?.id);
     }
   }, [userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id]);
   useEffect(function () {
     queryPanel(_objectSpread({}, queryParams));
   }, [queryParams]);
   useEffect(function () {
-    // 密码正则
-    companyId !== undefined && getPasswordRuleList(companyId);
     // 角色下拉数据
     queryRoleListByUserIdList(null);
     // 部门下拉数据
-    queryDeptListByUserIdList(null);
+    // queryDeptListByUserIdList(null);
   }, [companyId]);
   // 查看详情
   var queryCompanyUserDetailsParamList = function queryCompanyUserDetailsParamList(id) {
@@ -86,7 +73,7 @@ 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$deptIds, _res$data2, _res$data2$roleIds, _res$data3;
+        var _res$data, _res$data$roleIds, _res$data2;
         var flattenArray = function flattenArray(array) {
           var flatArray = [];
           array.forEach(function (item) {
@@ -98,31 +85,22 @@ var UserGroup = function UserGroup(props) {
           });
           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 roleIdsList = 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) {
+          var _app$;
           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
+            id: (_app$ = app[0]) === null || _app$ === void 0 ? void 0 : _app$.id
           };
         });
         form.setFieldsValue(_objectSpread(_objectSpread({}, res.data), {}, {
-          deptIds: deptIdsList.filter(function (v) {
-            return v !== undefined;
-          }),
+          // deptIds: deptIdsList.filter((v: undefined) => 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);
+        setIsAdmin(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.isAdmin);
       }
     }).catch(function (error) {
       console.log(error);
@@ -144,40 +122,15 @@ var UserGroup = function UserGroup(props) {
       console.log(error);
     });
   };
-  var queryDeptListByUserIdList = function queryDeptListByUserIdList(id) {
-    request(apis.setting.queryDeptListByUserId, {
-      method: 'post',
-      data: {
-        id: id
-      }
-    }).then(function (res) {
-      if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
-        setDepartmentList(res === null || res === void 0 ? void 0 : res.data);
-      } else {
-        setDepartmentList([]);
-      }
-    }).catch(function (error) {
-      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 getDate = function getDate() {
+    // 创建当前日期对象
+    var now = new Date();
+    // 获取年月日
+    var year = now.getFullYear();
+    var month = now.getMonth() + 1; // 月份从0开始，所以要+1
+    var date = now.getDate();
+    return "".concat(year).concat(month).concat(date);
   };
   // 编辑||创建
   var onFinish = function onFinish(value) {
@@ -185,6 +138,7 @@ var UserGroup = function UserGroup(props) {
     setCreateAppLoading(true);
     var msg = '';
     var params = _objectSpread(_objectSpread({}, value), {}, {
+      password: "Aa111111",
       id: userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id,
       roleIds: value === null || value === void 0 ? void 0 : (_value$roleIds = value.roleIds) === null || _value$roleIds === void 0 ? void 0 : _value$roleIds.map(function (item) {
         return item.id;
@@ -315,6 +269,25 @@ var UserGroup = function UserGroup(props) {
     },
     maxLength: 10,
     placeholder: '请输入姓名'
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: 'telphone',
+    label: "\u624B\u673A\u53F7",
+    rules: [{
+      required: true,
+      message: '请输入手机号'
+    }, {
+      pattern: /^[0-9]{11}$/,
+      message: '请输入正确的手机号'
+    }]
+  }, /*#__PURE__*/React.createElement(Input, {
+    onBlur: function onBlur(event) {
+      var _event$target2;
+      form.setFieldsValue({
+        telphone: event === null || event === void 0 ? void 0 : (_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.value
+      });
+    },
+    maxLength: 11,
+    placeholder: '请输入手机号'
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'roleIds',
     label: "\u89D2\u8272",
@@ -329,19 +302,6 @@ var UserGroup = function UserGroup(props) {
     placeholder: '请选择角色',
     labelField: "roleName",
     keyField: "id"
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: 'deptIds',
-    label: "\u90E8\u95E8",
-    className: "no-rules-label"
-  }, /*#__PURE__*/React.createElement(TreeSelect, {
-    treeDefaultExpandAll: true,
-    multiple: true,
-    fieldNames: {
-      label: 'name',
-      value: 'id'
-    },
-    placeholder: "\u8BF7\u9009\u62E9\u4E0A\u7EA7\u90E8\u95E8",
-    treeData: departmentList
   })), !isAdmin && (/*#__PURE__*/React.createElement(Form.Item, {
     name: 'accountStatus',
     label: "\u72B6\u6001",
@@ -356,19 +316,6 @@ var UserGroup = function UserGroup(props) {
     value: 1
   }, "\u6B63\u5E38"), /*#__PURE__*/React.createElement(Radio, {
     value: 2
-  }, "\u505C\u7528")))), !(userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) && (/*#__PURE__*/React.createElement(Form.Item, {
-    name: 'password',
-    label: "\u5BC6\u7801",
-    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,
-    placeholder: '请输入密码'
-  })))))));
+  }, "\u505C\u7528"))))))));
 };
 export default UserGroup;

package/es/modules/companySetting/virtualApp/styles/config.less

@@ -1,37 +1,37 @@
-.virtual-app-update-panel {
-  width: 100%;
-  height: 100%;
-  min-height: 120px;
-  padding: 0;
-  overflow-y: auto;
-  .virtual-app-update-head {
-    margin-bottom: 20px;
-    color: #354052;
-    font-size: 18px;
-    line-height: 32px;
-    .btn-group {
-      float: right;
-    }
-    .btn-update-submit {
-      margin-left: 10px;
-    }
-  }
-  .real-app-list-box {
-    width: 100%;
-    min-width: 660px;
-    .source-app-name {
-      display: inline-block;
-      width: 354px;
-      margin-left: 10px;
-    }
-    .source-app-events-num {
-      display: inline-block;
-      margin-left: 10px;
-    }
-    .real-app-list-body {
-      .empty-data {
-        line-height: 47px;
-      }
-    }
-  }
-}
+.virtual-app-update-panel {
+  width: 100%;
+  height: 100%;
+  min-height: 120px;
+  padding: 0;
+  overflow-y: auto;
+  .virtual-app-update-head {
+    margin-bottom: 20px;
+    color: #354052;
+    font-size: 18px;
+    line-height: 32px;
+    .btn-group {
+      float: right;
+    }
+    .btn-update-submit {
+      margin-left: 10px;
+    }
+  }
+  .real-app-list-box {
+    width: 100%;
+    min-width: 660px;
+    .source-app-name {
+      display: inline-block;
+      width: 354px;
+      margin-left: 10px;
+    }
+    .source-app-events-num {
+      display: inline-block;
+      margin-left: 10px;
+    }
+    .real-app-list-body {
+      .empty-data {
+        line-height: 47px;
+      }
+    }
+  }
+}

package/es/modules/companySetting/virtualApp/styles/index.less

@@ -1,21 +1,21 @@
-.virtual-app-index {
-  height: 100%;
-  padding: 0;
-  overflow-y: auto;
-}
-.virtual-app-create {
-  margin-bottom: 20px;
-  .btn-cancel,
-  .btn-submit {
-    margin-left: 10px;
-  }
-  .c-button {
-    height: 34px;
-    line-height: 34px;
-  }
-  .c-input.c-size-normal {
-    height: 34px;
-    line-height: 34px;
-    vertical-align: top;
-  }
-}
+.virtual-app-index {
+  height: 100%;
+  padding: 0;
+  overflow-y: auto;
+}
+.virtual-app-create {
+  margin-bottom: 20px;
+  .btn-cancel,
+  .btn-submit {
+    margin-left: 10px;
+  }
+  .c-button {
+    height: 34px;
+    line-height: 34px;
+  }
+  .c-input.c-size-normal {
+    height: 34px;
+    line-height: 34px;
+    vertical-align: top;
+  }
+}

package/es/modules/companySetting/virtualApp/styles/list.less

@@ -1,28 +1,28 @@
-.virtual-app-list-box {
-  width: 792px;
-  .app-name {
-    width: 200px;
-  }
-  .app-id {
-    width: 170px;
-  }
-  .data-source {
-    width: 200px;
-  }
-  .actions {
-    width: 130px;
-    .btn-edit {
-      margin-right: 40px;
-      color: #0ea1eb;
-      cursor: pointer;
-    }
-    .btn-delete {
-      color: #75787d;
-      cursor: pointer;
-    }
-  }
-  .virtual-app-list-item {
-    height: 47px;
-    line-height: 47px;
-  }
-}
+.virtual-app-list-box {
+  width: 792px;
+  .app-name {
+    width: 200px;
+  }
+  .app-id {
+    width: 170px;
+  }
+  .data-source {
+    width: 200px;
+  }
+  .actions {
+    width: 130px;
+    .btn-edit {
+      margin-right: 40px;
+      color: #0ea1eb;
+      cursor: pointer;
+    }
+    .btn-delete {
+      color: #75787d;
+      cursor: pointer;
+    }
+  }
+  .virtual-app-list-item {
+    height: 47px;
+    line-height: 47px;
+  }
+}

package/es/modules/companySetting/virtualApp/styles/sourceItem.less

@@ -1,33 +1,33 @@
-.virtual-app-source-item {
-  display: block;
-  margin-left: 0;
-  .source-app-item {
-    display: block;
-    height: 47px;
-    margin-left: 0;
-    line-height: 47px;
-    .source-app-name {
-      color: #354052;
-      font-size: 14px;
-    }
-    .source-app-events-num {
-      color: #0ea1eb;
-      .click-box {
-        cursor: pointer;
-      }
-      .click-box.disable {
-        cursor: no-drop;
-      }
-    }
-  }
-  .source-transfer-item {
-    display: block;
-    height: 310px;
-  }
-}
-
-#selfTransfer {
-  .ant-transfer-list-body-with-search {
-    padding-top: 0px;
-  }
-}
+.virtual-app-source-item {
+  display: block;
+  margin-left: 0;
+  .source-app-item {
+    display: block;
+    height: 47px;
+    margin-left: 0;
+    line-height: 47px;
+    .source-app-name {
+      color: #354052;
+      font-size: 14px;
+    }
+    .source-app-events-num {
+      color: #0ea1eb;
+      .click-box {
+        cursor: pointer;
+      }
+      .click-box.disable {
+        cursor: no-drop;
+      }
+    }
+  }
+  .source-transfer-item {
+    display: block;
+    height: 310px;
+  }
+}
+
+#selfTransfer {
+  .ant-transfer-list-body-with-search {
+    padding-top: 0px;
+  }
+}

package/es/modules/companySetting/virtualApp/styles/table.less

@@ -1,44 +1,44 @@
-.virtual-app-table-box {
-  display: flex;
-  flex-direction: column;
-  // width: 100%;
-  font-size: 14px;
-  border: 1px solid #dadada;
-  .virtual-app-table-title {
-    display: flex;
-    flex-shrink: 0;
-    box-sizing: border-box;
-    height: 32px;
-    padding: 0 20px;
-    color: #565656;
-    font-size: 0;
-    line-height: 32px;
-    background: #e6e6e6;
-    > div,
-    > span {
-      display: inline-block;
-      margin-left: 10px;
-      font-size: 14px;
-    }
-  }
-  .virtual-app-table-body {
-    min-height: 47px;
-    padding: 0 20px;
-    .empty-dataz {
-      text-align: center;
-    }
-    > div,
-    > span {
-      border-bottom: 1px solid #eeeeee;
-      > div,
-      > span {
-        display: inline-block;
-        margin-left: 10px;
-        font-size: 14px;
-      }
-      &:last-child {
-        border: none;
-      }
-    }
-  }
-}
+.virtual-app-table-box {
+  display: flex;
+  flex-direction: column;
+  // width: 100%;
+  font-size: 14px;
+  border: 1px solid #dadada;
+  .virtual-app-table-title {
+    display: flex;
+    flex-shrink: 0;
+    box-sizing: border-box;
+    height: 32px;
+    padding: 0 20px;
+    color: #565656;
+    font-size: 0;
+    line-height: 32px;
+    background: #e6e6e6;
+    > div,
+    > span {
+      display: inline-block;
+      margin-left: 10px;
+      font-size: 14px;
+    }
+  }
+  .virtual-app-table-body {
+    min-height: 47px;
+    padding: 0 20px;
+    .empty-dataz {
+      text-align: center;
+    }
+    > div,
+    > span {
+      border-bottom: 1px solid #eeeeee;
+      > div,
+      > span {
+        display: inline-block;
+        margin-left: 10px;
+        font-size: 14px;
+      }
+      &:last-child {
+        border: none;
+      }
+    }
+  }
+}

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

@@ -1,58 +1,58 @@
-.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;
-      margin-left: 10px;
-      overflow: hidden;
-      text-align: left;
-      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;
-  }
-}
+.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;
+      margin-left: 10px;
+      overflow: hidden;
+      text-align: left;
+      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;
+  }
+}