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

package/es/modules/companySetting/style/common.less

@@ -1,79 +1,79 @@
-@import './reset.less';
-
-.setting {
-  height: 100%;
-  overflow-y: auto;
-  font-size: 14px;
-  background: #fafafb;
-
-  .disabled {
-    background: #ccc !important;
-    border-color: #ccc !important;
-    cursor: not-allowed;
-  }
-}
-
-.setting-content {
-  padding: 16px;
-
-  .setting-title {
-    display: flex;
-    align-items: center;
-    margin-bottom: 0px;
-
-    .icon-set,
-    .icon-company {
-      margin-right: 10px;
-    }
-
-    .app-name {
-      margin-left: 3px;
-      font-size: 14px;
-    }
-  }
-
-  .setting-body {
-    display: flex;
-    align-items: flex-start;
-
-    .setting-tab {
-      border-top: 1px solid #dadada;
-
-      li > a {
-        z-index: 1;
-        display: inline-block;
-        width: 200px;
-        min-height: 50px;
-        color: #858585;
-        font-size: 14px;
-        line-height: 50px;
-        text-align: left;
-        text-decoration: none;
-        text-indent: 40px;
-        background: #ffffff;
-        border: 1px solid #dadada;
-        border-top: none;
-        cursor: pointer;
-
-        &:hover {
-          color: #000;
-          font-weight: bold;
-        }
-      }
-
-      .router-link-active {
-        color: #000;
-        font-weight: bold;
-      }
-    }
-  }
-
-  .setting-component {
-    width: 914px;
-    height: calc(100vh - 130px);
-    min-height: 465px;
-    margin-left: 20px;
-    background: #fff;
-    border: 1px solid #dadada;
-  }
-}
+@import './reset.less';
+
+.setting {
+  height: 100%;
+  overflow-y: auto;
+  font-size: 14px;
+  background: #fafafb;
+
+  .disabled {
+    background: #ccc !important;
+    border-color: #ccc !important;
+    cursor: not-allowed;
+  }
+}
+
+.setting-content {
+  padding: 16px;
+
+  .setting-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0px;
+
+    .icon-set,
+    .icon-company {
+      margin-right: 10px;
+    }
+
+    .app-name {
+      margin-left: 3px;
+      font-size: 14px;
+    }
+  }
+
+  .setting-body {
+    display: flex;
+    align-items: flex-start;
+
+    .setting-tab {
+      border-top: 1px solid #dadada;
+
+      li > a {
+        z-index: 1;
+        display: inline-block;
+        width: 200px;
+        min-height: 50px;
+        color: #858585;
+        font-size: 14px;
+        line-height: 50px;
+        text-align: left;
+        text-decoration: none;
+        text-indent: 40px;
+        background: #ffffff;
+        border: 1px solid #dadada;
+        border-top: none;
+        cursor: pointer;
+
+        &:hover {
+          color: #000;
+          font-weight: bold;
+        }
+      }
+
+      .router-link-active {
+        color: #000;
+        font-weight: bold;
+      }
+    }
+  }
+
+  .setting-component {
+    width: 914px;
+    height: calc(100vh - 130px);
+    min-height: 465px;
+    margin-left: 20px;
+    background: #fff;
+    border: 1px solid #dadada;
+  }
+}

package/es/modules/companySetting/style/reset.less

@@ -1,117 +1,117 @@
-// @import constants
-
-* {
-  box-sizing: border-box;
-  font-family: 'PingFang SC', Arial, 'Microsoft YaHei', sans-serif;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
-*:before,
-*:after {
-  box-sizing: border-box;
-}
-
-// HTML & Body reset
-html,
-body {
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  overflow-x: hidden;
-}
-
-// unify the setting of elements's margin and padding for browsers
-body,
-div,
-dl,
-dt,
-dd,
-ul,
-ol,
-li,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-pre,
-code,
-form,
-fieldset,
-legend,
-input,
-textarea,
-p,
-blockquote,
-th,
-td,
-hr,
-button,
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-}
-
-// Reset fonts for relevant elements
-button,
-input,
-select,
-textarea {
-  color: inherit;
-  font-size: inherit;
-  line-height: inherit;
-  outline: none;
-}
-
-ul,
-li,
-ol {
-  list-style: none;
-}
-
-// Remove the clear button of a text input control in IE10+
-input::-ms-clear,
-input::-ms-reveal {
-  display: none;
-}
-
-// Links
-a {
-  text-decoration: none;
-  background: transparent;
-  outline: none;
-  cursor: pointer;
-  transition: color 0.3s ease;
-
-  &:focus {
-    text-decoration: underline;
-    text-decoration-skip-ink: auto;
-  }
-}
-
-.company-setting [class^='icon-'],
-.company-setting [class*=' icon-'] {
-  font-family: 'zhuge' !important;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.ant-dropdown-hidden,
-.ant-picker-dropdown-hidden,
-ant-dropdown-menu-submenu-hidden {
-  display: none;
-}
+// @import constants
+
+* {
+  box-sizing: border-box;
+  font-family: 'PingFang SC', Arial, 'Microsoft YaHei', sans-serif;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+*:before,
+*:after {
+  box-sizing: border-box;
+}
+
+// HTML & Body reset
+html,
+body {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  overflow-x: hidden;
+}
+
+// unify the setting of elements's margin and padding for browsers
+body,
+div,
+dl,
+dt,
+dd,
+ul,
+ol,
+li,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+pre,
+code,
+form,
+fieldset,
+legend,
+input,
+textarea,
+p,
+blockquote,
+th,
+td,
+hr,
+button,
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+// Reset fonts for relevant elements
+button,
+input,
+select,
+textarea {
+  color: inherit;
+  font-size: inherit;
+  line-height: inherit;
+  outline: none;
+}
+
+ul,
+li,
+ol {
+  list-style: none;
+}
+
+// Remove the clear button of a text input control in IE10+
+input::-ms-clear,
+input::-ms-reveal {
+  display: none;
+}
+
+// Links
+a {
+  text-decoration: none;
+  background: transparent;
+  outline: none;
+  cursor: pointer;
+  transition: color 0.3s ease;
+
+  &:focus {
+    text-decoration: underline;
+    text-decoration-skip-ink: auto;
+  }
+}
+
+.company-setting [class^='icon-'],
+.company-setting [class*=' icon-'] {
+  font-family: 'zhuge' !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.ant-dropdown-hidden,
+.ant-picker-dropdown-hidden,
+ant-dropdown-menu-submenu-hidden {
+  display: none;
+}

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, {