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

package/es/modules/createDemand_bf/demo/index.js

@@ -6,7 +6,6 @@ import { DemoWrapper } from '@zgfe/business-lib';
 // import { Button } from 'antd';
 // const classPrefix = 'system-setting-approval-process-create-content';
 export default (function () {
-  console.log('window.innerWidth', window.innerWidth);
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     defaultApp: 99825
   }, /*#__PURE__*/React.createElement(CreateDemand, null));

package/es/modules/createDemand_bf/index.js

@@ -295,7 +295,6 @@ var CreateDemand = function CreateDemand(props) {
     });
   };
   var viewEventProp = function viewEventProp(record) {
-    console.log('viewEventProp', record);
     setEventAttrListShow(true);
     setEventProp(record.event_attrs);
   };

package/es/modules/dealDemand/demo/index.js

@@ -46,7 +46,6 @@ export default (function () {
   };
   var initFun = function initFun(callbackFun, data) {
     createDemandCallbackFun = callbackFun;
-    console.log('initFun', data);
     setSelectObj(data || []);
     setIsShowSelectList(true);
   };

package/es/modules/dealDemand/demo/selectPoint.js

@@ -63,7 +63,7 @@ export default (function (props) {
     className: "".concat(classPrefix, "-header-back")
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "fanhuiicon"
-  }), "\u8FD4\u56DE"), "\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement("div", {
+  }), "\u8FD4\u56DE"), "\u81EA\u5B9A\u4E49\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header-right")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {

package/es/modules/dealDemand/index.js

@@ -209,7 +209,6 @@ var CreateDemand = function CreateDemand(props) {
     });
   };
   var gotoPage = function gotoPage(type, data) {
-    console.log('data', data);
     switch (type) {
       case 'event':
         window.open('/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage?key=' + data, '_blank');
@@ -389,7 +388,6 @@ var CreateDemand = function CreateDemand(props) {
       }],
       onClick: function onClick(_ref) {
         var key = _ref.key;
-        console.log('key', key);
         switch (key) {
           case '0':
             submitDemand(3);

package/es/modules/demandManage/index.js

@@ -287,6 +287,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }, "\u67E5\u770B"), /*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
+      disabled: props.record.demandStatus == 102,
       onClick: function onClick() {
         Modal.confirm({
           wrapClassName: "".concat(classPrefix, "-confirm"),
@@ -319,7 +320,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           }
         });
       }
-    }, "\u590D\u5236"), [101, 102].indexOf(props.record.demandStatus) == -1 && (/*#__PURE__*/React.createElement(Button, {
+    }, "\u590D\u5236"), [101, 102, 103].indexOf(props.record.demandStatus) == -1 && (/*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
       onClick: function onClick() {
@@ -355,7 +356,6 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       console.log(err);
     });
   };
-  //复制功能
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {

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/securityLog/index.js

@@ -83,7 +83,7 @@ var SecurityLog = function SecurityLog() {
     }).then(function (res) {
       if (parseInt(res === null || res === void 0 ? void 0 : res.code) == 100000) {
         setDateLoading(false);
-        var maxDate = res.data[res.data.length - 1] || '';
+        var maxDate = res.data[0] || '';
         setDateRange(res.data);
         setCondition(function (v) {
           return _objectSpread(_objectSpread({}, v), {}, {