@zgfe/modules-settings 2.1.0-zhongyuan.8 → 3.0.0-zhongyuan-set.0

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

@@ -1,296 +1,296 @@
-@import './../../../constants/icons/iconfont.css';
-
-.role-list {
-  .ant-form-item {
-    .ant-form-item-control-input {
-      width: 392px;
-      height: 32px;
-    }
-  }
-  .ant-input {
-    border-color: @background-color-base !important;
-
-    &:focus {
-      border-color: @primary-color !important;
-    }
-  }
-
-  .ant-table-cell {
-    height: 50px;
-  }
-
-  .ant-table-row-indent + .ant-table-row-expand-icon {
-    margin-top: 0;
-  }
-
-  height: 100%;
-  padding: 0;
-  overflow: auto;
-
-  .app-list-head {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 24px;
-
-    > div {
-      color: var(--io-n, #021429);
-      font-weight: 500;
-      font-size: 16px;
-      font-family: PingFang SC;
-      font-style: normal;
-      line-height: 24px;
-      /* 150% */
-    }
-  }
-
-  .platform-icons {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    width: 100%;
-
-    span {
-      margin-right: 10px;
-      color: #cfcfcf;
-      font-size: 16px;
-    }
-  }
-
-  .role-list-content {
-    margin-top: 16px;
-
-    .c-grid-cell,
-    .c-grid-header-cell {
-      text-align: left !important;
-      border: none;
-      border-bottom: 1px solid #d1d1d1;
-    }
-
-    .c-grid-cell {
-      text-align: left !important;
-    }
-
-    .c-grid-body .c-grid-row:nth-child(2n) {
-      background: #fff !important;
-    }
-
-    .app-name {
-      cursor: pointer;
-
-      &:hover {
-        color: #00a0ea;
-      }
-    }
-
-    .operating {
-      display: flex;
-      gap: 16px;
-    }
-  }
-}
-
-.ant-select-selection-item-content {
-  .custom-item-right {
-    display: none;
-  }
-}
-
-.appIdsPopupClassName {
-  .ant-select-tree-treenode-checkbox-checked {
-    .custom-item-right {
-      color: #165dff;
-    }
-  }
-}
-
-.add-drawer {
-  z-index: 999 !important;
-  .ant-drawer-header-title {
-    flex-direction: row-reverse;
-  }
-
-  .ant-drawer-close {
-    margin-right: 0 !important;
-  }
-}
-
-.custom-item {
-  display: flex;
-  justify-content: space-between;
-  > :nth-child(1) {
-    max-width: 400px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-  .tishi {
-    color: #9aa1a9;
-  }
-}
-.biz-select-option.active {
-  .custom-item {
-    > :nth-child(1) {
-      max-width: 260px;
-    }
-  }
-}
-.custom-item.v2 {
-  > :nth-child(1) {
-    max-width: 330px;
-  }
-}
-.ant-select-tree-treenode-checkbox-checked {
-  .custom-item.v2 {
-    > :nth-child(1) {
-      max-width: 250px;
-    }
-  }
-}
-.role-dialog-content {
-  .group-config {
-    display: flex;
-    margin-bottom: 24px;
-    padding-left: 120px;
-
-    .config-name {
-      margin-right: 12px;
-      color: #5f6085;
-      font-size: 14px;
-      line-height: 30px;
-      white-space: nowrap;
-    }
-
-    .biz-user-condition-type-label {
-      margin-left: -7px;
-    }
-  }
-
-  .ant-form-item {
-    .ant-form-item-control-input {
-      width: 484px;
-      min-height: 32px;
-    }
-  }
-
-  .ant-input {
-    border-color: @background-color-base !important;
-
-    &:focus {
-      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;
-  }
-
-  .menuCode-map {
-    .ant-form-item-label::before {
-      display: inline-block;
-      margin-right: 4px;
-      color: #ff4d4f;
-      font-size: 14px;
-      font-family: SimSun, sans-serif;
-      line-height: 1;
-      content: '*';
-    }
-
-    .ant-form-item-control-input {
-      width: 100%;
-      height: auto;
-      padding: 14px 16px;
-      border: 1px solid var(--io-n-1, #e6e7ea);
-      border-radius: 4px;
-
-      .ant-form-item {
-        margin-bottom: 8px;
-      }
-
-      .ant-input {
-        border: 1px solid #fafafb;
-
-        &:focus {
-          border-color: @primary-color !important;
-        }
-      }
-
-      .ant-form-item-control-input {
-        width: 484px;
-        padding: 0;
-        border: none;
-      }
-    }
-  }
-
-  .is-encryption {
-    .ant-form-item-label {
-      width: 116px;
-      text-align: right;
-    }
-  }
-}
-
-.ant-tooltip {
-  z-index: 9999;
-}
-
-.label-group-overlay {
-  display: none;
-}
-
-.set-data-dialog {
-  width: 2000px;
-}
+@import './../../../constants/icons/iconfont.css';
+
+.role-list {
+  .ant-form-item {
+    .ant-form-item-control-input {
+      width: 392px;
+      height: 32px;
+    }
+  }
+  .ant-input {
+    border-color: @background-color-base !important;
+
+    // &:focus {
+    //   border-color: @primary-color !important;
+    // }
+  }
+
+  .ant-table-cell {
+    height: 50px;
+  }
+
+  .ant-table-row-indent + .ant-table-row-expand-icon {
+    margin-top: 0;
+  }
+
+  height: 100%;
+  padding: 0;
+  overflow: auto;
+
+  .app-list-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 24px;
+
+    > div {
+      color: var(--io-n, #021429);
+      font-weight: 500;
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-style: normal;
+      line-height: 24px;
+      /* 150% */
+    }
+  }
+
+  .platform-icons {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    width: 100%;
+
+    span {
+      margin-right: 10px;
+      color: #cfcfcf;
+      font-size: 16px;
+    }
+  }
+
+  .role-list-content {
+    margin-top: 16px;
+
+    .c-grid-cell,
+    .c-grid-header-cell {
+      text-align: left !important;
+      border: none;
+      border-bottom: 1px solid #d1d1d1;
+    }
+
+    .c-grid-cell {
+      text-align: left !important;
+    }
+
+    .c-grid-body .c-grid-row:nth-child(2n) {
+      background: #fff !important;
+    }
+
+    .app-name {
+      cursor: pointer;
+
+      &:hover {
+        color: #00a0ea;
+      }
+    }
+
+    .operating {
+      display: flex;
+      gap: 16px;
+    }
+  }
+}
+
+.ant-select-selection-item-content {
+  .custom-item-right {
+    display: none;
+  }
+}
+
+.appIdsPopupClassName {
+  .ant-select-tree-treenode-checkbox-checked {
+    .custom-item-right {
+      color: #165dff;
+    }
+  }
+}
+
+.add-drawer {
+  z-index: 999 !important;
+  .ant-drawer-header-title {
+    flex-direction: row-reverse;
+  }
+
+  .ant-drawer-close {
+    margin-right: 0 !important;
+  }
+}
+
+.custom-item {
+  display: flex;
+  justify-content: space-between;
+  > :nth-child(1) {
+    max-width: 400px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  .tishi {
+    color: #9aa1a9;
+  }
+}
+.biz-select-option.active {
+  .custom-item {
+    > :nth-child(1) {
+      max-width: 260px;
+    }
+  }
+}
+.custom-item.v2 {
+  > :nth-child(1) {
+    max-width: 330px;
+  }
+}
+.ant-select-tree-treenode-checkbox-checked {
+  .custom-item.v2 {
+    > :nth-child(1) {
+      max-width: 250px;
+    }
+  }
+}
+.role-dialog-content {
+  .group-config {
+    display: flex;
+    margin-bottom: 24px;
+    padding-left: 120px;
+
+    .config-name {
+      margin-right: 12px;
+      color: #5f6085;
+      font-size: 14px;
+      line-height: 30px;
+      white-space: nowrap;
+    }
+
+    .biz-user-condition-type-label {
+      margin-left: -7px;
+    }
+  }
+
+  .ant-form-item {
+    .ant-form-item-control-input {
+      width: 484px;
+      min-height: 32px;
+    }
+  }
+
+  .ant-input {
+    border-color: @background-color-base !important;
+
+    &:focus {
+      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;
+  }
+
+  .menuCode-map {
+    .ant-form-item-label::before {
+      display: inline-block;
+      margin-right: 4px;
+      color: #ff4d4f;
+      font-size: 14px;
+      font-family: SimSun, sans-serif;
+      line-height: 1;
+      content: '*';
+    }
+
+    .ant-form-item-control-input {
+      width: 100%;
+      height: auto;
+      padding: 14px 16px;
+      border: 1px solid var(--io-n-1, #e6e7ea);
+      border-radius: 4px;
+
+      .ant-form-item {
+        margin-bottom: 8px;
+      }
+
+      .ant-input {
+        border: 1px solid #fafafb;
+
+        &:focus {
+          border-color: @primary-color !important;
+        }
+      }
+
+      .ant-form-item-control-input {
+        width: 484px;
+        padding: 0;
+        border: none;
+      }
+    }
+  }
+
+  .is-encryption {
+    .ant-form-item-label {
+      width: 116px;
+      text-align: right;
+    }
+  }
+}
+
+.ant-tooltip {
+  z-index: 9999;
+}
+
+.label-group-overlay {
+  display: none;
+}
+
+.set-data-dialog {
+  width: 2000px;
+}

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, {
@@ -513,14 +518,23 @@ var User = function User(props) {
                 transferorId: havePhoneFlg[0].id
               }
             }).then(function (res) {
-              setBtnLoading(false);
               if (res.code == '100000') {
                 message.success('交接成功！');
               }
             }).catch(function (err) {
-              setBtnLoading(false);
               message.success('交接失败！，请联系管理员');
-              return false;
+            }).finally(function () {
+              setMoveWorkModal(false);
+              setBtnLoading(false);
+              setNumber({
+                value: '',
+                errorMsg: ''
+              });
+              // 数据清空
+              form.setFieldsValue({
+                toType: [],
+                toUser: ''
+              });
             });
           case 17:
           case "end":