@zgfe/modules-settings 2.1.0-zhongyuan.18 → 2.1.0-zhongyuan.20

package/es/modules/companySetting/index.js

@@ -18,13 +18,10 @@ import React, { useContext, useEffect, useState } from 'react';
 import './index.less';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import { Tabs } from 'antd';
-import Info from './info';
 import User from './user';
 import VirtualApp from './virtualApp';
-import Cost from './cost';
 import WechatBinding from './wechatBinding';
 import OperationLog from './operationLog';
-import DepartmentList from './department';
 import RoleList from './role';
 import Business from './business';
 import Application from './application';
@@ -59,7 +56,7 @@ var CompanySetting = function CompanySetting(props) {
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
     setIsShowCreateApp = _useState8[1];
-  var _useState9 = useState(currentPath ? currentPath : 'info'),
+  var _useState9 = useState(currentPath ? currentPath : 'user'),
     _useState10 = _slicedToArray(_useState9, 2),
     activeKey = _useState10[0],
     setActiveKey = _useState10[1]; // 默认值
@@ -157,17 +154,21 @@ var CompanySetting = function CompanySetting(props) {
       }
     }));
   };
-  var items = [{
-    key: 'info',
-    label: '公司信息',
-    children: (/*#__PURE__*/React.createElement(Info, {
-      ENVIRONMENT: ENVIRONMENT,
-      companyId: currentUser.companyId,
-      companyName: currentUser.companyName,
-      changeCompanyNameCallback: changeCompanyNameCallback
-    })),
-    hidden: !authority[10078]
-  }, {
+  var items = [
+  // {
+  //   key: 'info',
+  //   label: '公司信息',
+  //   children: (
+  //     <Info
+  //       ENVIRONMENT={ENVIRONMENT}
+  //       companyId={currentUser!.companyId as number}
+  //       companyName={currentUser!.companyName}
+  //       changeCompanyNameCallback={changeCompanyNameCallback}
+  //     />
+  //   ),
+  //   hidden: !authority[10078],
+  // },
+  {
     key: 'user',
     label: '成员管理',
     children: (/*#__PURE__*/React.createElement(User, {
@@ -196,15 +197,19 @@ var CompanySetting = function CompanySetting(props) {
       companyId: currentUser.companyId
     }),
     hidden: !authority[10080]
-  }, {
-    key: 'department',
-    label: '部门管理',
-    children: (/*#__PURE__*/React.createElement(DepartmentList, {
-      companyId: currentUser.companyId,
-      closeCreateCallback: closeCreateCallback
-    })),
-    hidden: !authority[10081]
-  }, {
+  },
+  // {
+  //   key: 'department',
+  //   label: '部门管理',
+  //   children: (
+  //     <DepartmentList
+  //       companyId={currentUser!.companyId as number}
+  //       closeCreateCallback={closeCreateCallback}
+  //     />
+  //   ),
+  //   hidden: !authority[10081],
+  // },
+  {
     key: 'business',
     label: '业务',
     children: /*#__PURE__*/React.createElement(Business, {
@@ -233,15 +238,14 @@ var CompanySetting = function CompanySetting(props) {
       editVirtualAppCallback: editVirtualAppCallback
     })),
     hidden: !showVirtualApp
-  }, {
-    key: 'cost',
-    label: '套餐',
-    children: /*#__PURE__*/React.createElement(Cost, {
-      ENVIRONMENT: ENVIRONMENT,
-      companyId: currentUser.companyId
-    }),
-    hidden: !authority[10083]
-  }, {
+  },
+  // {
+  //   key: 'cost',
+  //   label: '套餐',
+  //   children: <Cost ENVIRONMENT={ENVIRONMENT} companyId={currentUser!.companyId as number} />,
+  //   hidden: !authority[10083],
+  // },
+  {
     key: 'weChatBinding',
     label: '微信账号绑定',
     children: /*#__PURE__*/React.createElement(WechatBinding, null),

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

@@ -360,30 +360,35 @@ var User = function User(props) {
         title: arr === null || arr === void 0 ? void 0 : (_arr$join = arr.join(',')) === null || _arr$join === void 0 ? void 0 : _arr$join.replace(/,/g, '、')
       }, splitString(arr === null || arr === void 0 ? void 0 : (_arr$join2 = arr.join(',')) === null || _arr$join2 === void 0 ? void 0 : _arr$join2.replace(/,/g, '、'), 8)));
     }
-  }, {
-    title: '部门',
-    with: 195,
-    dataIndex: 'aclDeptList',
-    render: function render(aclDeptList) {
-      var _arr$join3, _arr$join4;
-      var arr = aclDeptList === null || aclDeptList === void 0 ? void 0 : aclDeptList.map(function (item) {
-        return item === null || item === void 0 ? void 0 : item.name;
-      });
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Tooltip, {
-        overlayStyle: {
-          maxWidth: 396
-        },
-        overlayInnerStyle: {
-          color: '#FFF',
-          fontSize: 14,
-          fontWeight: 400,
-          letterSpacing: 0.56
-        },
-        placement: "top",
-        title: arr === null || arr === void 0 ? void 0 : (_arr$join3 = arr.join(',')) === null || _arr$join3 === void 0 ? void 0 : _arr$join3.replace(/,/g, '、')
-      }, splitString(arr === null || arr === void 0 ? void 0 : (_arr$join4 = arr.join(',')) === null || _arr$join4 === void 0 ? void 0 : _arr$join4.replace(/,/g, '、'), 8)));
-    }
-  }, {
+  },
+  // {
+  //   title: '部门',
+  //   with: 195,
+  //   dataIndex: 'aclDeptList',
+  //   render: (aclDeptList: []) => {
+  //     const arr = aclDeptList?.map((item: { name: string }) => {
+  //       return item?.name;
+  //     });
+  //     return (
+  //       <div>
+  //         <Tooltip
+  //           overlayStyle={{ maxWidth: 396 }}
+  //           overlayInnerStyle={{
+  //             color: '#FFF',
+  //             fontSize: 14,
+  //             fontWeight: 400,
+  //             letterSpacing: 0.56,
+  //           }}
+  //           placement="top"
+  //           title={arr?.join(',')?.replace(/,/g, '、')}
+  //         >
+  //           {splitString(arr?.join(',')?.replace(/,/g, '、'), 8)}
+  //         </Tooltip>
+  //       </div>
+  //     );
+  //   },
+  // },
+  {
     title: '状态',
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", null, !data.isAdmin && (/*#__PURE__*/React.createElement(Switch, {

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';
@@ -63,7 +63,7 @@ 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 () {
@@ -75,7 +75,7 @@ var UserGroup = function UserGroup(props) {
     // 角色下拉数据
     queryRoleListByUserIdList(null);
     // 部门下拉数据
-    queryDeptListByUserIdList(null);
+    // queryDeptListByUserIdList(null);
   }, [companyId]);
   // 查看详情
   var queryCompanyUserDetailsParamList = function queryCompanyUserDetailsParamList(id) {
@@ -348,19 +348,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",

package/es/modules/systemSetting/index.js

@@ -6,7 +6,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useContext, useState } from 'react';
 import { DesktopOutlined } from '@ant-design/icons';
-import Notice from './notice';
 import Approvalmanage from './approvalmanage';
 import SettingTabs from '../../components/settingTabs';
 import Dictionary from './Dictionary';
@@ -23,7 +22,7 @@ var SystemSetting = function SystemSetting(_ref) {
     currentUser = _useContext.currentUser,
     authority = _useContext.authority,
     route = _useContext.route;
-  var _useState = useState(route && route.query && route.query.key ? route.query.key : '1'),
+  var _useState = useState(route && route.query && route.query.key ? route.query.key : '4'),
     _useState2 = _slicedToArray(_useState, 2),
     key = _useState2[0],
     setKey = _useState2[1];
@@ -50,19 +49,18 @@ var SystemSetting = function SystemSetting(_ref) {
     setIsRead(isRead);
     setIsShowProcess(true);
   };
-  var items = [{
-    key: '1',
-    label: '通知配置',
-    content: /*#__PURE__*/React.createElement(Notice, {
-      bizType: 1
-    })
-  }, {
-    key: '3',
-    label: 'kpi通知配置',
-    content: /*#__PURE__*/React.createElement(Notice, {
-      bizType: 2
-    })
-  }, {
+  var items = [
+  // {
+  //   key: '1',
+  //   label: '通知配置',
+  //   content: <Notice bizType={1} />,
+  // },
+  // {
+  //   key: '3',
+  //   label: 'kpi通知配置',
+  //   content: <Notice bizType={2} />,
+  // },
+  {
     key: '4',
     label: '审批管理',
     hidden: !authority[1722839049],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan.18",
+  "version": "2.1.0-zhongyuan.20",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0658ef363698b6d268a6ea48c652c78069e1d053",
+  "gitHead": "b062bec8eede9288d53a3eb35627c34908a5ef04",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }