@zgfe/modules-settings 2.0.0-zhongyuan.25 → 2.0.0-zhongyuan.27

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

@@ -4,6 +4,9 @@
   height: 100%;
   padding: 0 16px 16px;
   background: #fafafb;
+  .forbiddenColor {
+    background-color: #f2f3f4;
+  }
   .setting-point-map-page-content-img-select {
     position: relative;
   }
@@ -81,6 +84,15 @@
       color: #1454e5;
       border: 1px solid #1454e5;
     }
+    &-btnRight {
+      display: flex;
+      align-items: center;
+      margin-right: 310px;
+      margin-left: auto;
+      .commentBtn {
+        margin-left: 10px;
+      }
+    }
   }
   &-info {
     display: flex;
@@ -236,6 +248,44 @@
         }
       }
     }
+    &-right {
+      margin-left: auto;
+      &-button {
+        margin-left: 10px;
+      }
+    }
+    &-tabList {
+      display: flex;
+      align-items: center;
+      color: #9aa1a9;
+      border-radius: 5px;
+      // outline: 1px solid #9aa1a9;
+      &-item {
+        box-sizing: border-box;
+        width: 90px;
+        height: 32px;
+        line-height: 32px;
+        text-align: center;
+        cursor: pointer;
+      }
+      &-item:nth-child(1) {
+        border-top: 1px solid #9aa1a9;
+        border-bottom: 1px solid #9aa1a9;
+        border-left: 1px solid #9aa1a9;
+        border-radius: 2px 0 0 2px;
+      }
+      &-item:nth-child(2) {
+        border-top: 1px solid #9aa1a9;
+        border-right: 1px solid #9aa1a9;
+        border-bottom: 1px solid #9aa1a9;
+        border-radius: 0 2px 2px 0;
+      }
+      &-active {
+        color: #fff;
+        background-color: #165dff;
+        border: none !important;
+      }
+    }
   }
   &-drawer {
     .ant-drawer-header-title .ant-drawer-close {
@@ -243,7 +293,6 @@
       right: 6px;
     }
   }
-
   &-content-img-select {
     position: relative;
     display: flex;
@@ -260,7 +309,54 @@
       max-height: 78px;
     }
   }
+  &-comment {
+    width: 100%;
+    margin-top: 20px;
+    &-tab {
+      display: flex;
+      align-items: center;
+      margin: 0 10px 0 20px;
+      padding-bottom: 10px;
+      font-size: 16px;
+      border-bottom: 1px solid #e6e7ea;
+
+      &-btn {
+        color: #9aa1a9;
+        font-size: 16px;
+        cursor: pointer;
+      }
+      &-btnActive {
+        color: #116acc;
+        font-weight: bold;
+      }
+      &-btn + &-btn::before {
+        display: inline-block;
+        margin: 0 10px;
+        color: #9aa1a9;
+        font-weight: bold;
+        transform: translateY(-2px);
+        content: '|';
+      }
+    }
+    &-list {
+      margin: 0 10px 0 20px;
+      padding: 10px 0;
+      border-bottom: 1px solid #e6e7ea;
+    }
+  }
+  &-history {
+    &-list {
+      margin: 0 10px 0 20px;
+      padding: 10px 0;
+      border-bottom: 1px solid #e6e7ea;
+      span {
+        margin: 0 5px;
+        color: #116acc;
+      }
+    }
+  }
 }
+
 #system-setting-demand {
   position: fixed;
   z-index: -1000;

package/es/modules/demandManage/index.js

@@ -21,6 +21,7 @@ import './styles/index.less';
 import apis from '../../constants/api';
 import request from '../../utils/ajax';
 import moment from 'moment';
+import { demandTabList } from '../createDemand/constants';
 var sorterKey = {
   ascend: 'asc',
   descend: 'desc'
@@ -46,47 +47,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     pageData = _useState4[0],
     setPageData = _useState4[1];
-  var _useState5 = useState([{
-      label: '设计',
-      value: 1,
-      key: 'nodename1',
-      color: '#fda145'
-    }, {
-      label: '审核1',
-      value: 2,
-      key: 'nodename2',
-      color: '#fb5547'
-    }, {
-      label: '审核2',
-      value: 3,
-      key: 'nodename3',
-      color: '#fb5547'
-    }, {
-      label: '开发',
-      value: 4,
-      key: 'nodename4',
-      color: '#165dff'
-    }, {
-      label: '测试',
-      value: 5,
-      key: 'nodename5',
-      color: '#165dff'
-    }, {
-      label: '已完成',
-      value: 6,
-      key: 'finishedSum',
-      color: '#2cbe54'
-    }, {
-      label: '已关闭',
-      value: 7,
-      key: 'closedSum',
-      color: '#cccfd5'
-    }, {
-      label: '已超时',
-      value: 8,
-      key: 'overTimeSum',
-      color: '#fda145'
-    }]),
+  var _useState5 = useState(demandTabList),
     _useState6 = _slicedToArray(_useState5, 1),
     labelList = _useState6[0];
   var _useState7 = useState(route && route.query && route.query.demandKey || ''),
@@ -271,21 +232,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       }).then(function (res) {
         if (res === null || res === void 0 ? void 0 : res.data) {
-          if (type === 'revocation') {
-            request(apis.revocationDemand, {
-              method: 'POST',
-              data: {
-                app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-                id: props.record.id
-              }
-            }).then(function (re) {
-              props.onDeal && props.onDeal(type, res.data);
-              getDemandStatistics();
-              getDemandList();
-            });
-          } else {
-            props.onDeal && props.onDeal(type, res.data);
-          }
+          props.onDeal && props.onDeal(type, res.data);
         }
         // getDemandStatistics();
         // getDemandList();
@@ -325,32 +272,24 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       color: "primary",
       type: "link",
       onClick: function onClick() {
-        props.onDeal && props.onDeal('view', {
-          data: props.record
+        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
         });
       }
     }, "\u590D\u5236"), /*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
-      onClick: function onClick() {
-        props.onDeal && props.onDeal('view', {
-          data: props.record
-        });
-      }
-    }, "\u7F16\u8F91"), !isDemo && props.record.isHandle && authority[17228364473] && (/*#__PURE__*/React.createElement("a", {
-      style: {
-        marginRight: 16
-      },
-      onClick: function onClick() {
-        getDemand('deal');
-      }
-    }, "\u5904\u7406")
-    // </Popover>
-    ), !isDemo && props.record.revocation && (/*#__PURE__*/React.createElement("a", {
       onClick: function onClick() {
         getDemand('revocation');
       }
-    }, "\u64A4\u56DE")));
+    }, "\u7F16\u8F91"));
   };
   //关闭功能
   var disableDemand = function disableDemand(data) {

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/messageList/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import './index.less';
 declare const CreateProcess: React.FC<{
-    onClose: Function;
+    onClose: Function | undefined;
     changeRead?: Function;
 }>;
 export default CreateProcess;

package/es/modules/messageList/index.js

@@ -100,12 +100,12 @@ var CreateProcess = function CreateProcess(props) {
     className: "".concat(classPrefix)
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header")
-  }, "\u6D88\u606F\u901A\u77E5\uFF08", unReadNum, "\uFF09", /*#__PURE__*/React.createElement(IconFont, {
+  }, "\u6D88\u606F\u901A\u77E5\uFF08", unReadNum, "\uFF09", onclose ? (/*#__PURE__*/React.createElement(IconFont, {
     type: "qingchu",
     onClick: function onClick() {
-      return props.onClose();
+      return props.onClose && props.onClose();
     }
-  })), /*#__PURE__*/React.createElement("div", {
+  })) : ''), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content-filter")
@@ -167,7 +167,7 @@ var CreateProcess = function CreateProcess(props) {
         },
         onClick: function onClick() {
           gotoPage(v.businessId, v.content);
-          props.onClose();
+          props.onClose && props.onClose();
           // changeAllRead(v.id);
         }
       }, v.content), /*#__PURE__*/React.createElement("div", {
@@ -190,7 +190,7 @@ var CreateProcess = function CreateProcess(props) {
         className: "".concat(classPrefix, "-content-list-item-title"),
         onClick: function onClick() {
           gotoPage(v.businessId, v.content);
-          props.onClose();
+          props.onClose && props.onClose();
           changeAllRead(v.id);
         }
       }, v.content), /*#__PURE__*/React.createElement("div", {

package/es/modules/personalSetting/demo/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: () => React.JSX.Element;
+export default _default;

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

@@ -0,0 +1,13 @@
+import React from 'react';
+import PersonalSetting from '../index';
+import { DemoWrapper } from '@zgfe/business-lib';
+export default (function () {
+  return /*#__PURE__*/React.createElement(DemoWrapper, {
+    defaultApp: 99825
+  }, /*#__PURE__*/React.createElement(PersonalSetting, {
+    settingsCallback: function settingsCallback(type) {
+      throw new Error('Function not implemented.');
+    },
+    currentKey: "5"
+  }));
+});

package/es/modules/personalSetting/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 declare const PersonalSetting: React.FC<{
     settingsCallback: (type: string) => void;
+    currentKey?: string;
 }>;
 export default PersonalSetting;

package/es/modules/personalSetting/index.js

@@ -14,15 +14,18 @@ import { useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import util from '../../utils/util';
 import SecurityLog from './securityLog';
+import CreateProcess from '../messageList';
 var PersonalSetting = function PersonalSetting(_ref) {
-  var settingsCallback = _ref.settingsCallback;
+  var settingsCallback = _ref.settingsCallback,
+    _ref$currentKey = _ref.currentKey,
+    currentKey = _ref$currentKey === void 0 ? '1' : _ref$currentKey;
   var _useContext = useContext(BizGlobalDataContext),
     currentUser = _useContext.currentUser,
     isDemo = _useContext.isDemo;
-  var _useState = useState('1'),
+  var _useState = useState(currentKey),
     _useState2 = _slicedToArray(_useState, 2),
-    currentKey = _useState2[0],
-    setCurrentKey = _useState2[1];
+    currentKeyTab = _useState2[0],
+    setCurrentKeyTab = _useState2[1];
   var title = /*#__PURE__*/React.createElement("div", {
     className: "tab-header"
   }, /*#__PURE__*/React.createElement(UserOutlined, null), /*#__PURE__*/React.createElement("span", {
@@ -30,7 +33,7 @@ var PersonalSetting = function PersonalSetting(_ref) {
   }, "\u4E2A\u4EBA\u8BBE\u7F6E"));
   useEffect(function () {
     var query = util.getHrefData(window.location.href);
-    if (query.password) setCurrentKey('2');
+    if (query.password) setCurrentKeyTab('2');
   }, []);
   var items = [{
     key: '1',
@@ -54,12 +57,18 @@ var PersonalSetting = function PersonalSetting(_ref) {
     key: '4',
     label: '安全日志',
     content: /*#__PURE__*/React.createElement(SecurityLog, null)
+  }, {
+    key: '5',
+    label: '消息通知',
+    content: /*#__PURE__*/React.createElement(CreateProcess, {
+      onClose: undefined
+    })
   }];
   return /*#__PURE__*/React.createElement(SettingTabs, {
     typeName: "personal",
     title: title,
     items: items,
-    currentKey: currentKey
+    currentKey: currentKeyTab
   });
 };
 export default PersonalSetting;