@zgfe/modules-settings 1.2.11 → 1.2.13

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

@@ -10,15 +10,18 @@ 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 util from './../../../utils/util';
 import { Button, Form, Input, Spin, TreeSelect, notification } from 'antd';
 import moment from 'moment';
-import { BizTable, BizDialog, BizSelect, IconFont } from '@zgfe/business-lib';
-import { addDept, deleteDept, getGroupMembers, queryDeptList, updateDept } from '../../../requests/department';
+import { BizTable, BizDialog, BizSelect, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
+import { addDept, deleteDept,
+// getGroupMembers,
+queryDeptList, updateDept } from '../../../requests/department';
+import { queryCompanyUser } from '../../../requests/role';
 var DepartmentList = function DepartmentList(props) {
-  var _departmentList$, _departmentList$2;
+  var _departmentList$, _departmentList$2, _departmentList$3;
   var closeCreateCallback = props.closeCreateCallback;
   // 弹窗
   var _useState = useState(false),
@@ -37,6 +40,8 @@ var DepartmentList = function DepartmentList(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     loading = _useState8[0],
     setLoading = _useState8[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   // 初始数据
   var _useState9 = useState(''),
     _useState10 = _slicedToArray(_useState9, 2),
@@ -68,49 +73,68 @@ var DepartmentList = function DepartmentList(props) {
     if (createdAppPanel || delPanelState) return;
     setLoading(true);
     // 请求部门列表数据
-    queryDeptList({
-      name: name
-    }).then(function (res) {
-      if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
-        var app = util.convertData(res === null || res === void 0 ? void 0 : res.data, name);
-        setLoading(false);
-        setDepartmentList(app);
-      } else {
-        setTimeout(function () {
+    setTimeout(function () {
+      queryDeptList({
+        name: name
+      }).then(function (res) {
+        if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
+          var app = util.convertData(res === null || res === void 0 ? void 0 : res.data, name);
           setLoading(false);
-        }, 2000);
-      }
-    }).catch(function (err) {
-      setDepartmentList([]);
-      console.error(err);
-    });
+          setDepartmentList(app);
+        } else {
+          setTimeout(function () {
+            setLoading(false);
+          }, 2000);
+        }
+      }).catch(function (err) {
+        setDepartmentList([]);
+        console.error(err);
+      });
+    }, 500);
     if (name) return;
     // 请求负责人数据
-    getGroupMembers().then(function (res) {
-      var result = res; // 使用类型断言将返回的数据转换为ApiResult<void>
-      if (result && (result === null || result === void 0 ? void 0 : result.company_members)) {
-        setAllMembers(((result === null || result === void 0 ? void 0 : result.company_members) || []).map(function (item) {
-          return _objectSpread(_objectSpread({}, item), {}, {
-            value: item.email,
-            label: item.email
-          });
-        }));
-      } else {
-        setAllMembers([]);
+    queryCompanyUser({
+      id: null
+    }).then(function (res) {
+      if (res === null || res === void 0 ? void 0 : res.data) {
+        setAllMembers(res === null || res === void 0 ? void 0 : res.data);
       }
     }).catch(function (err) {
       setAllMembers([]);
       console.error(err);
     });
+    // getGroupMembers()
+    //   .then((res) => {
+    //     const result = res as ApiResult<void>; // 使用类型断言将返回的数据转换为ApiResult<void>
+    //     if (result && result?.company_members) {
+    //       setAllMembers(
+    //         (result?.company_members || []).map((item) => {
+    //           return {
+    //             ...item,
+    //             value: item.email,
+    //             label: item.email,
+    //           };
+    //         }),
+    //       );
+    //     } else {
+    //       setAllMembers([]);
+    //     }
+    //   })
+    //   .catch((err) => {
+    //     setAllMembers([]);
+    //     console.error(err);
+    //   });
   }, [createdAppPanel, delPanelState, name]);
   // 列表数据
   var columns = [{
     title: '部门名称',
     dataIndex: 'name',
+    ellipsis: true,
     with: 334
   }, {
     title: '负责人',
     with: 334,
+    ellipsis: true,
     render: function render(data) {
       var _data$deptBoss;
       return data === null || data === void 0 ? void 0 : (_data$deptBoss = data.deptBoss) === null || _data$deptBoss === void 0 ? void 0 : _data$deptBoss.replace(/,/g, '、');
@@ -127,11 +151,11 @@ var DepartmentList = function DepartmentList(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", {
         className: "operating"
-      }, data.parentId !== 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
+      }, data.parentId !== 0 && /*#__PURE__*/React.createElement(React.Fragment, null, authority[10097] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return toAppSetting(data);
         }
-      }, "\u7F16\u8F91"), /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91"), authority[10098] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return showDelPanel(data);
         }
@@ -141,13 +165,20 @@ var DepartmentList = function DepartmentList(props) {
   // 打开编辑弹窗
   var toAppSetting = function toAppSetting(data) {
     var _data$deptBoss$split;
+    var arr = (_data$deptBoss$split = data.deptBoss.split(',')) === null || _data$deptBoss$split === void 0 ? void 0 : _data$deptBoss$split.map(function (item) {
+      var _app$, _app$2;
+      var app = allMembers.filter(function (v) {
+        return v.email === item;
+      });
+      return {
+        email: (_app$ = app[0]) === null || _app$ === void 0 ? void 0 : _app$.email,
+        id: (_app$2 = app[0]) === null || _app$2 === void 0 ? void 0 : _app$2.id
+      };
+    });
     form.setFieldsValue(_objectSpread(_objectSpread({}, data), {}, {
       parentId: data.parentId,
-      deptBoss: data.deptBoss ? (_data$deptBoss$split = data.deptBoss.split(',')) === null || _data$deptBoss$split === void 0 ? void 0 : _data$deptBoss$split.map(function (item) {
-        return {
-          label: item,
-          value: item
-        };
+      deptBoss: data.deptBoss ? arr.filter(function (v) {
+        return v.email !== undefined;
       }) : []
     }));
     setCreatedAppPanel(true);
@@ -193,7 +224,12 @@ var DepartmentList = function DepartmentList(props) {
       name: formParams.name
     };
     (formParams.id === -1 ? addDept : updateDept)(params).then(function (res) {
-      if (!res) return;
+      if ((res === null || res === void 0 ? void 0 : res.code) !== '101000') {
+        setTimeout(function () {
+          setCreateAppLoading(false);
+        }, 1000);
+        return;
+      }
       setCreatedAppPanel(false);
       setCreateAppLoading(false);
       // 通知数据刷新
@@ -212,7 +248,12 @@ var DepartmentList = function DepartmentList(props) {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
     className: "department-list"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '8px',
+      marginLeft: '2px'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
     prefix: /*#__PURE__*/React.createElement(IconFont, {
       type: "sousuo"
     }),
@@ -225,10 +266,11 @@ var DepartmentList = function DepartmentList(props) {
       marginBottom: '24px'
     },
     placeholder: '请输入部门名称'
-  })), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "app-list-head"
-  }, /*#__PURE__*/React.createElement("div", null, "\u90E8\u95E8\u5217\u8868", name), /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement("div", null, "\u90E8\u95E8\u5217\u8868"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: !authority[10096],
     onClick: function onClick() {
       setCreatedAppPanel(true);
       setFormParams({
@@ -241,6 +283,7 @@ var DepartmentList = function DepartmentList(props) {
       form.resetFields();
     }
   }, "\u65B0\u589E\u90E8\u95E8")), /*#__PURE__*/React.createElement(BizDialog, {
+    className: "setting-bizDialog",
     title: formParams.id === -1 ? '新增部门' : '编辑部门',
     open: createdAppPanel,
     width: 520,
@@ -288,8 +331,16 @@ var DepartmentList = function DepartmentList(props) {
       message: '请选择上级部门'
     }]
   }, /*#__PURE__*/React.createElement(TreeSelect, {
+    treeDefaultExpandedKeys: (_departmentList$ = departmentList[0]) === null || _departmentList$ === void 0 ? void 0 : _departmentList$.defaultRowKeys,
     placeholder: "\u8BF7\u9009\u62E9\u4E0A\u7EA7\u90E8\u95E8",
-    treeData: departmentList
+    treeData: departmentList,
+    suffixIcon: /*#__PURE__*/React.createElement("i", {
+      style: {
+        fontSize: 14,
+        color: '#5f6085'
+      },
+      className: "bsicon xiangxia"
+    })
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'name',
     label: "\u90E8\u95E8\u540D\u79F0",
@@ -298,6 +349,12 @@ var DepartmentList = function DepartmentList(props) {
       message: '请输入部门名称'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
+    onBlur: function onBlur(event) {
+      var _event$target, _event$target$value;
+      form.setFieldsValue({
+        name: 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: 50,
     placeholder: '请输入部门名称'
   })), /*#__PURE__*/React.createElement(Form.Item, {
@@ -312,12 +369,13 @@ var DepartmentList = function DepartmentList(props) {
     options: allMembers,
     multiple: true,
     placeholder: '请选择负责人',
-    labelField: "label",
-    keyField: "value"
+    labelField: "email",
+    keyField: "id"
   }))))), /*#__PURE__*/React.createElement(BizDialog, {
     title: "\u5220\u9664\u5E94\u7528",
     open: delPanelState,
     closable: true,
+    className: "setting-bizDialog",
     onOk: function onOk() {
       setDelPanelState(false);
       onDelConfirm();
@@ -327,11 +385,11 @@ var DepartmentList = function DepartmentList(props) {
     }
   }, "\u786E\u8BA4\u8981\u5220\u9664\u5F53\u524D\u90E8\u95E8\u5417?"), /*#__PURE__*/React.createElement("div", {
     className: "department-list-content"
-  }, ((_departmentList$ = departmentList[0]) === null || _departmentList$ === void 0 ? void 0 : _departmentList$.defaultRowKeys.length) > 0 && !name ? /*#__PURE__*/React.createElement(BizTable, {
+  }, ((_departmentList$2 = departmentList[0]) === null || _departmentList$2 === void 0 ? void 0 : _departmentList$2.defaultRowKeys.length) > 0 && !name ? /*#__PURE__*/React.createElement(BizTable, {
     rowKey: "key",
     dataSource: departmentList,
     expandable: {
-      defaultExpandedRowKeys: (_departmentList$2 = departmentList[0]) === null || _departmentList$2 === void 0 ? void 0 : _departmentList$2.defaultRowKeys
+      defaultExpandedRowKeys: (_departmentList$3 = departmentList[0]) === null || _departmentList$3 === void 0 ? void 0 : _departmentList$3.defaultRowKeys
     },
     columns: columns,
     scroll: {

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

@@ -1,6 +1,10 @@
 @import './../../../constants/icons/iconfont.css';
 
 .department-list {
+  height: 100%;
+  padding: 0;
+  overflow: auto;
+
   .ant-form-item {
     .ant-form-item-control-input {
       width: 392px;
@@ -24,10 +28,6 @@
     margin-top: 0;
   }
 
-  height: 100%;
-  padding: 0;
-  overflow: auto;
-
   .app-list-head {
     display: flex;
     align-items: center;
@@ -43,6 +43,7 @@
       /* 150% */
     }
   }
+
   .platform-icons {
     display: flex;
     align-items: center;
@@ -58,6 +59,7 @@
 
   .department-list-content {
     margin-top: 16px;
+
     .c-grid-cell,
     .c-grid-header-cell {
       text-align: left !important;
@@ -96,7 +98,58 @@
       border-color: @primary-color !important;
     }
   }
+
+  .ant-select-selector {
+    border-color: @background-color-base !important;
+  }
+
+  .biz-select-handle-input {
+    .ant-input {
+      border-color: @background-color-base !important;
+
+      &:focus {
+        border-color: @background-color-base !important;
+      }
+    }
+
+    &:focus {
+      border-color: @primary-color !important;
+    }
+  }
+
+  .ant-input-status-error {
+    border: 1px solid #fb5547 !important;
+
+    &:focus {
+      border-color: #fb5547 !important;
+    }
+  }
+
+  .ant-select-status-error {
+    border: none !important;
+
+    &:focus {
+      box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+    }
+  }
+
+  .biz-select-handle-status-error.active:not(.disable) {
+    box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+  }
+
+  .biz-select-handle-status-error {
+    .ant-input.ant-input-status-error:focus:not(.ant-input-disable):not(.ant-input-borderless),
+    .ant-input.ant-input-status-error-focused:not(.ant-input-disable):not(.ant-input-borderless) {
+      box-shadow: none !important;
+    }
+  }
+
+  .ant-form-item:last-of-type {
+    margin-bottom: 0;
+  }
+
   color: #5f6085;
+
   .ant-form-item-label {
     width: 80px;
     text-align: right;

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;