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

package/es/modules/companySetting/edit/styles/userGroup.less

@@ -1,44 +1,44 @@
-.company-setting-user-group {
-  position: relative;
-  height: 100%;
-  padding: 20px;
-  overflow-y: auto;
-  color: #354052;
-  font-size: 14px;
-  .company-setting-group-title {
-    margin-bottom: 30px;
-    font-size: 18px;
-    line-height: 18px;
-  }
-  .company-setting-user-name {
-    margin-left: 20px;
-    line-height: 35px;
-  }
-  .company-setting-users {
-    margin-top: 20px;
-    margin-left: 20px;
-  }
-  .encryption-wrap {
-    display: flex;
-    align-items: center;
-    margin-top: 20px;
-    margin-left: 20px;
-    .encryption-item {
-      margin-right: 5px;
-    }
-    label {
-      display: flex;
-      align-items: center;
-      input {
-        margin-right: 5px;
-      }
-    }
-  }
-  .company-setting-footer {
-    margin-top: 40px;
-    text-align: right;
-    .c-button {
-      margin-right: 20px;
-    }
-  }
-}
+.company-setting-user-group {
+  position: relative;
+  height: 100%;
+  padding: 20px;
+  overflow-y: auto;
+  color: #354052;
+  font-size: 14px;
+  .company-setting-group-title {
+    margin-bottom: 30px;
+    font-size: 18px;
+    line-height: 18px;
+  }
+  .company-setting-user-name {
+    margin-left: 20px;
+    line-height: 35px;
+  }
+  .company-setting-users {
+    margin-top: 20px;
+    margin-left: 20px;
+  }
+  .encryption-wrap {
+    display: flex;
+    align-items: center;
+    margin-top: 20px;
+    margin-left: 20px;
+    .encryption-item {
+      margin-right: 5px;
+    }
+    label {
+      display: flex;
+      align-items: center;
+      input {
+        margin-right: 5px;
+      }
+    }
+  }
+  .company-setting-footer {
+    margin-top: 40px;
+    text-align: right;
+    .c-button {
+      margin-right: 20px;
+    }
+  }
+}

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/index.less

@@ -1,90 +1,90 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-@import './style/common.less';
-
-.ant-card-body {
-  padding: 0;
-}
-
-.company-setting {
-  border: 1px solid var(--unnamed, #ecedf0);
-
-  .company-setting-title {
-    display: flex;
-    flex-shrink: 0;
-    gap: 10px;
-    align-items: center;
-    width: 100%;
-    height: 48px;
-    padding: 0 24px;
-    background: #fff;
-  }
-
-  .company-setting-tabs {
-    height: 100%;
-    background: #fff !important;
-    border-radius: 8px;
-  }
-
-  .hidden-tab {
-    display: none;
-  }
-
-  .ant-tabs-nav {
-    margin-bottom: 16px;
-  }
-
-  .ant-tabs-nav-wrap {
-    margin: 0 24px;
-  }
-
-  .ant-tabs-content {
-    max-height: 100%;
-    padding: 0 24px 24px;
-    overflow-y: auto;
-  }
-
-  .setting-tab {
-    li:nth-child(1),
-    li:nth-child(3),
-    li:nth-child(6) {
-      margin-bottom: 10px;
-    }
-
-    li {
-      &:nth-child(2),
-      &:nth-child(4) > a {
-        border-top: 1px solid #dadada !important;
-      }
-    }
-  }
-}
-
-.setting-title {
-  color: initial;
-  font-size: 18px;
-
-  label {
-    font-weight: bold;
-  }
-}
-
-.setting-bizDialog {
-  .ant-modal-header {
-    padding-bottom: 24px;
-  }
-
-  .ant-modal-close-x {
-    width: 24px;
-    height: 24px;
-    margin-right: 22px;
-  }
-
-  .ant-modal-close .qingchu {
-    font-weight: normal;
-  }
-
-  .ant-modal-body {
-    padding: 0 24px;
-    padding-bottom: 24px;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+@import './style/common.less';
+
+.ant-card-body {
+  padding: 0;
+}
+
+.company-setting {
+  border: 1px solid var(--unnamed, #ecedf0);
+
+  .company-setting-title {
+    display: flex;
+    flex-shrink: 0;
+    gap: 10px;
+    align-items: center;
+    width: 100%;
+    height: 48px;
+    padding: 0 24px;
+    background: #fff;
+  }
+
+  .company-setting-tabs {
+    height: 100%;
+    background: #fff !important;
+    border-radius: 8px;
+  }
+
+  .hidden-tab {
+    display: none;
+  }
+
+  .ant-tabs-nav {
+    margin-bottom: 16px;
+  }
+
+  .ant-tabs-nav-wrap {
+    margin: 0 24px;
+  }
+
+  .ant-tabs-content {
+    max-height: 100%;
+    padding: 0 24px 24px;
+    overflow-y: auto;
+  }
+
+  .setting-tab {
+    li:nth-child(1),
+    li:nth-child(3),
+    li:nth-child(6) {
+      margin-bottom: 10px;
+    }
+
+    li {
+      &:nth-child(2),
+      &:nth-child(4) > a {
+        border-top: 1px solid #dadada !important;
+      }
+    }
+  }
+}
+
+.setting-title {
+  color: initial;
+  font-size: 18px;
+
+  label {
+    font-weight: bold;
+  }
+}
+
+.setting-bizDialog {
+  .ant-modal-header {
+    padding-bottom: 24px;
+  }
+
+  .ant-modal-close-x {
+    width: 24px;
+    height: 24px;
+    margin-right: 22px;
+  }
+
+  .ant-modal-close .qingchu {
+    font-weight: normal;
+  }
+
+  .ant-modal-body {
+    padding: 0 24px;
+    padding-bottom: 24px;
+  }
+}

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

@@ -1,42 +1,42 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-@import './../style/common.less';
-
-.company-setting-info {
-  margin-top: 8px;
-  padding: 0;
-
-  > p {
-    margin-bottom: 13px;
-    color: #565656;
-  }
-
-  li {
-    margin-bottom: 30px;
-    color: #333333;
-  }
-
-  .c-button {
-    width: 90px;
-    height: 40px;
-  }
-
-  .c-input.c-size-big {
-    height: 40px;
-    color: initial;
-    line-height: 40px;
-  }
-
-  .el-textarea {
-    width: 350px;
-  }
-}
-
-.temp {
-  position: absolute;
-  top: -999px;
-  padding: 0;
-  font-size: inherit;
-  line-height: inherit;
-  white-space: nowrap;
-  visibility: hidden;
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+@import './../style/common.less';
+
+.company-setting-info {
+  margin-top: 8px;
+  padding: 0;
+
+  > p {
+    margin-bottom: 13px;
+    color: #565656;
+  }
+
+  li {
+    margin-bottom: 30px;
+    color: #333333;
+  }
+
+  .c-button {
+    width: 90px;
+    height: 40px;
+  }
+
+  .c-input.c-size-big {
+    height: 40px;
+    color: initial;
+    line-height: 40px;
+  }
+
+  .el-textarea {
+    width: 350px;
+  }
+}
+
+.temp {
+  position: absolute;
+  top: -999px;
+  padding: 0;
+  font-size: inherit;
+  line-height: inherit;
+  white-space: nowrap;
+  visibility: hidden;
+}

package/es/modules/companySetting/mainPart/images/img2.svg

@@ -1,12 +1,12 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Property 1=&#228;&#189;&#191;&#231;&#148;&#168;&#229;&#156;&#186;&#230;&#153;&#175;">
-<rect id="Rectangle 34624455" width="48" height="48" rx="10" fill="url(#paint0_linear_6042_154372)"/>
-<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M14 9C11.2386 9 9 11.2386 9 14V34C9 36.7614 11.2386 39 14 39H34C36.7614 39 39 36.7614 39 34V14C39 11.2386 36.7614 9 34 9H14ZM33.2854 23.5462L32.0833 22.8249L24 27.6749L15.9167 22.8249L14.7146 23.5462C14.6442 23.5884 14.5853 23.6473 14.5431 23.7177C14.401 23.9545 14.4778 24.2616 14.7146 24.4037L24 29.9749L33.2854 24.4037C33.3558 24.3615 33.4146 24.3026 33.4569 24.2322C33.5989 23.9954 33.5222 23.6883 33.2854 23.5462ZM33.2854 28.2462L32.0833 27.5249L24 32.3749L15.9167 27.5249L14.7146 28.2462C14.6442 28.2884 14.5853 28.3473 14.5431 28.4177C14.401 28.6545 14.4778 28.9616 14.7146 29.1037L23.4855 34.3662C23.8021 34.5563 24.1978 34.5563 24.5144 34.3662L33.2854 29.1037C33.3558 29.0615 33.4146 29.0026 33.4569 28.9322C33.5989 28.6954 33.5222 28.3883 33.2854 28.2462ZM33.2854 18.8962L24.5144 13.6337C24.1978 13.4437 23.8021 13.4437 23.4855 13.6337L14.7146 18.8962C14.6442 18.9385 14.5853 18.9974 14.5431 19.0677C14.401 19.3045 14.4778 19.6117 14.7146 19.7537L24 25.3249L33.2854 19.7537C33.3558 19.7115 33.4146 19.6526 33.4569 19.5822C33.5989 19.3454 33.5222 19.0383 33.2854 18.8962Z" fill="white"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_6042_154372" x1="24" y1="0" x2="24" y2="48" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10DF2E"/>
-<stop offset="1" stop-color="#07BE4A"/>
-</linearGradient>
-</defs>
-</svg>
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Property 1=&#228;&#189;&#191;&#231;&#148;&#168;&#229;&#156;&#186;&#230;&#153;&#175;">
+<rect id="Rectangle 34624455" width="48" height="48" rx="10" fill="url(#paint0_linear_6042_154372)"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M14 9C11.2386 9 9 11.2386 9 14V34C9 36.7614 11.2386 39 14 39H34C36.7614 39 39 36.7614 39 34V14C39 11.2386 36.7614 9 34 9H14ZM33.2854 23.5462L32.0833 22.8249L24 27.6749L15.9167 22.8249L14.7146 23.5462C14.6442 23.5884 14.5853 23.6473 14.5431 23.7177C14.401 23.9545 14.4778 24.2616 14.7146 24.4037L24 29.9749L33.2854 24.4037C33.3558 24.3615 33.4146 24.3026 33.4569 24.2322C33.5989 23.9954 33.5222 23.6883 33.2854 23.5462ZM33.2854 28.2462L32.0833 27.5249L24 32.3749L15.9167 27.5249L14.7146 28.2462C14.6442 28.2884 14.5853 28.3473 14.5431 28.4177C14.401 28.6545 14.4778 28.9616 14.7146 29.1037L23.4855 34.3662C23.8021 34.5563 24.1978 34.5563 24.5144 34.3662L33.2854 29.1037C33.3558 29.0615 33.4146 29.0026 33.4569 28.9322C33.5989 28.6954 33.5222 28.3883 33.2854 28.2462ZM33.2854 18.8962L24.5144 13.6337C24.1978 13.4437 23.8021 13.4437 23.4855 13.6337L14.7146 18.8962C14.6442 18.9385 14.5853 18.9974 14.5431 19.0677C14.401 19.3045 14.4778 19.6117 14.7146 19.7537L24 25.3249L33.2854 19.7537C33.3558 19.7115 33.4146 19.6526 33.4569 19.5822C33.5989 19.3454 33.5222 19.0383 33.2854 18.8962Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_6042_154372" x1="24" y1="0" x2="24" y2="48" gradientUnits="userSpaceOnUse">
+<stop stop-color="#10DF2E"/>
+<stop offset="1" stop-color="#07BE4A"/>
+</linearGradient>
+</defs>
+</svg>