@zgfe/modules-settings 2.0.0-zhongyuan.28 → 2.0.0-zhongyuan.30

package/es/modules/demandManage/index.js

@@ -88,7 +88,11 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
-        setDemandInfo(res.data);
+        var data = {};
+        res.data.map(function (res) {
+          data[res.node] = res.count;
+        });
+        setDemandInfo(data);
       }
     }).catch(function (err) {
       console.log(err);
@@ -153,7 +157,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
             message.error('无查看权限');
             return;
           }
-          props.onDeal && props.onDeal('view', data.id);
+          props.onDeal && props.onDeal('revocation', {
+            type: 'manage',
+            demand: data
+          });
           // router &&
           //   router?.push({
           //     name: routes.createDemand,
@@ -273,21 +280,28 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       type: "link",
       onClick: function onClick() {
         props.onDeal && props.onDeal('revocation', {
-          appId: props.record.id,
-          approvalModule: props.record.approvalModule,
-          businessType: props.record.businessType,
-          completionTime: props.record.completionTime,
-          demandDescribe: props.record.demandDescrib,
-          demandName: props.record.demandName + '复制',
-          fileName: props.record.fileName,
-          filePath: props.record.filePath
+          type: 'edit',
+          demand: {
+            appId: props.record.id,
+            approvalModule: props.record.approvalModule,
+            businessType: props.record.businessType,
+            completionTime: props.record.completionTime,
+            demandDescribe: props.record.demandDescribe,
+            demandName: props.record.demandName + '复制',
+            fileName: props.record.fileName,
+            filePath: props.record.filePath
+          }
         });
       }
     }, "\u590D\u5236"), /*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
       onClick: function onClick() {
-        getDemand('revocation');
+        // getDemand('revocation');
+        props.onDeal && props.onDeal('revocation', {
+          type: 'edit',
+          demand: props.record
+        });
       }
     }, "\u7F16\u8F91"));
   };
@@ -305,6 +319,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         notification.success({
           message: '关闭成功'
         });
+        getDemandList();
       }
     }).catch(function (err) {
       console.log(err);
@@ -331,7 +346,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     onClick: function onClick() {
       return setDemandStatus(0);
     }
-  }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.demandAllSum) || 0 : '-'))), /*#__PURE__*/React.createElement("div", {
+  }, demandInfo ? demandInfo[100] || 0 : '-'))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel-status")
   }, labelList.map(function (res) {
     return /*#__PURE__*/React.createElement("div", {
@@ -352,7 +367,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       onClick: function onClick() {
         return setDemandStatus(res.value);
       }
-    }, demandInfo ? demandInfo[res.key] || 0 : '-'));
+    }, demandInfo ? demandInfo[res.value] || 0 : '-'));
   }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-filter")
   }, /*#__PURE__*/React.createElement("div", {
@@ -404,7 +419,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       //     name: routes.createDemand,
       //   });
     }
-  }, "\u65B0\u589E\u9700\u6C42"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u65B0\u589E\u9700\u6C42"), false && (/*#__PURE__*/React.createElement(Button, {
     shape: "round",
     className: "button ".concat(!authority[1722839123] ? 'disabled' : ''),
     disabled: isDemo || !authority[1722839123],
@@ -416,7 +431,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       }));
     }
-  }, "\u6D41\u7A0B\u7BA1\u7406"))), /*#__PURE__*/React.createElement(BizTable, {
+  }, "\u6D41\u7A0B\u7BA1\u7406")))), /*#__PURE__*/React.createElement(BizTable, {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
     rowKey: "id",

package/es/modules/demandManage/styles/index.less

@@ -1,155 +1,155 @@
-// @import '~@zgfe/business-lib/es/assets/styles/inner.less';
-.system-setting-demand {
-  padding: 24px;
-  background-color: #fff;
-
-  &-title {
-    padding: 16px 0;
-    color: #021429;
-    font-weight: 500;
-    font-size: 20px;
-  }
-
-  &-panel {
-    display: flex;
-    flex-direction: row;
-    gap: 16px;
-    &-all {
-      display: flex;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-      width: 256px;
-      padding: 24px;
-      color: var(--io-N8-, #354354);
-      font-weight: 400;
-      font-size: 16px;
-      background: var(--io-n-02, #fafafb);
-      border-radius: 8px;
-      &-img {
-        width: 64px;
-        height: 64px;
-        background: url('./../images/title-bg.png') no-repeat;
-        background-size: contain;
-      }
-      &-num {
-        color: var(--io-N-, #021429);
-        font-weight: 700;
-        font-size: 32px;
-        line-height: 40px; /* 125% */
-        cursor: pointer;
-      }
-    }
-    &-status {
-      display: flex;
-      flex: 1;
-      flex-direction: row;
-      color: var(--io-N8-, #354354);
-      font-weight: 400;
-      font-size: 16px;
-      font-family: 'PingFang SC';
-      font-style: normal;
-      line-height: normal;
-      background: var(--io-n-02, #fafafb);
-      border-radius: 8px;
-      &-item {
-        display: flex;
-        flex: 1;
-        // align-items: center;
-        flex-direction: column;
-        padding: 24px;
-        &-txt {
-          display: flex;
-          flex-direction: row;
-          gap: 4px;
-          align-items: center;
-          cursor: pointer;
-        }
-        &-icon {
-          display: block;
-          width: 8px;
-          height: 8px;
-          border-radius: 4px;
-          content: '';
-        }
-        &-num {
-          margin-top: 4px;
-          margin-left: 12px;
-          color: var(--io-N-, #021429);
-          font-weight: 700;
-          font-size: 32px;
-          font-family: Arial;
-          font-style: normal;
-          line-height: 40px; /* 125% */
-          cursor: pointer;
-        }
-      }
-    }
-  }
-  &-filter {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    padding: 16px 0;
-    &-left {
-      display: flex;
-      flex: 1;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-    }
-    &-right {
-      display: flex;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-      .button:not(.disabled):not(.ant-btn-primary) {
-        color: #1454e5;
-        border: 1px solid #1454e5;
-      }
-    }
-  }
-
-  &-table {
-    &-status {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      border-radius: 2px;
-    }
-  }
-}
-.system-setting-demand-pop {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  width: 136px;
-  &-header {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: space-between;
-    color: var(--io-N-, #021429);
-    font-weight: 400;
-    font-size: 16px;
-    line-height: 24px; /* 150% */
-    .qingchu {
-      color: #9aa1a9;
-      cursor: pointer;
-    }
-  }
-  &-footer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    .ant-btn-primary {
-      height: 24px;
-      padding-top: 0;
-      padding-bottom: 0;
-    }
-  }
-}
+// @import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.system-setting-demand {
+  padding: 24px;
+  background-color: #fff;
+
+  &-title {
+    padding: 16px 0;
+    color: #021429;
+    font-weight: 500;
+    font-size: 20px;
+  }
+
+  &-panel {
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    &-all {
+      display: flex;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+      width: 256px;
+      padding: 24px;
+      color: var(--io-N8-, #354354);
+      font-weight: 400;
+      font-size: 16px;
+      background: var(--io-n-02, #fafafb);
+      border-radius: 8px;
+      &-img {
+        width: 64px;
+        height: 64px;
+        background: url('./../images/title-bg.png') no-repeat;
+        background-size: contain;
+      }
+      &-num {
+        color: var(--io-N-, #021429);
+        font-weight: 700;
+        font-size: 32px;
+        line-height: 40px; /* 125% */
+        cursor: pointer;
+      }
+    }
+    &-status {
+      display: flex;
+      flex: 1;
+      flex-direction: row;
+      color: var(--io-N8-, #354354);
+      font-weight: 400;
+      font-size: 16px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: normal;
+      background: var(--io-n-02, #fafafb);
+      border-radius: 8px;
+      &-item {
+        display: flex;
+        flex: 1;
+        // align-items: center;
+        flex-direction: column;
+        padding: 24px;
+        &-txt {
+          display: flex;
+          flex-direction: row;
+          gap: 4px;
+          align-items: center;
+          cursor: pointer;
+        }
+        &-icon {
+          display: block;
+          width: 8px;
+          height: 8px;
+          border-radius: 4px;
+          content: '';
+        }
+        &-num {
+          margin-top: 4px;
+          margin-left: 12px;
+          color: var(--io-N-, #021429);
+          font-weight: 700;
+          font-size: 32px;
+          font-family: Arial;
+          font-style: normal;
+          line-height: 40px; /* 125% */
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  &-filter {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 16px 0;
+    &-left {
+      display: flex;
+      flex: 1;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+    }
+    &-right {
+      display: flex;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+      .button:not(.disabled):not(.ant-btn-primary) {
+        color: #1454e5;
+        border: 1px solid #1454e5;
+      }
+    }
+  }
+
+  &-table {
+    &-status {
+      display: flex;
+      align-items: center;
+      padding: 1px 8px;
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 22px; /* 157.143% */
+      border-radius: 2px;
+    }
+  }
+}
+.system-setting-demand-pop {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  width: 136px;
+  &-header {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: space-between;
+    color: var(--io-N-, #021429);
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 24px; /* 150% */
+    .qingchu {
+      color: #9aa1a9;
+      cursor: pointer;
+    }
+  }
+  &-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    .ant-btn-primary {
+      height: 24px;
+      padding-top: 0;
+      padding-bottom: 0;
+    }
+  }
+}

package/es/modules/personalSetting/index.js

@@ -16,13 +16,13 @@ import util from '../../utils/util';
 import SecurityLog from './securityLog';
 import CreateProcess from '../messageList';
 var PersonalSetting = function PersonalSetting(_ref) {
-  var _route$params;
+  var _route$query;
   var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
     currentUser = _useContext.currentUser,
     isDemo = _useContext.isDemo,
     route = _useContext.route;
-  var _useState = useState((route === null || route === void 0 ? void 0 : (_route$params = route.params) === null || _route$params === void 0 ? void 0 : _route$params.currentKey) || '1'),
+  var _useState = useState((route === null || route === void 0 ? void 0 : (_route$query = route.query) === null || _route$query === void 0 ? void 0 : _route$query.currentKey) || '1'),
     _useState2 = _slicedToArray(_useState, 2),
     currentKey = _useState2[0],
     setCurrentKey = _useState2[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.28",
+  "version": "2.0.0-zhongyuan.30",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "84a3ce232b868fce2f82c664b8df23b31e4f88b9",
+  "gitHead": "fe33a47697d07ffcf6a05127afc43ffd8513b23d",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }