@zgfe/modules-settings 2.0.0-zhongyuan.2 → 2.0.0-zhongyuan.21

package/es/modules/companySetting/user/invite.js

@@ -315,6 +315,25 @@ var UserGroup = function UserGroup(props) {
     },
     maxLength: 10,
     placeholder: '请输入姓名'
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: 'telphone',
+    label: "\u624B\u673A\u53F7",
+    rules: [{
+      required: true,
+      message: '请输入手机号'
+    }, {
+      pattern: /^[0-9]{11}$/,
+      message: '请输入正确的手机号'
+    }]
+  }, /*#__PURE__*/React.createElement(Input, {
+    onBlur: function onBlur(event) {
+      var _event$target2;
+      form.setFieldsValue({
+        telphone: event === null || event === void 0 ? void 0 : (_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.value
+      });
+    },
+    maxLength: 11,
+    placeholder: '请输入手机号'
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'roleIds',
     label: "\u89D2\u8272",

package/es/modules/demandManage/index.js

@@ -46,7 +46,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     demandName = _useState6[0],
     setDemandName = _useState6[1];
-  // 状态：1-待处理， 2-处理中，3-已驳回，4-已结束
+  // 状态：1-待处理， 2-处理中，3-已驳回，4-已结束,5-已超时
   var _useState7 = useState(0),
     _useState8 = _slicedToArray(_useState7, 2),
     demandStatus = _useState8[0],
@@ -181,7 +181,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     dataIndex: 'demandStatus',
     width: 160,
     render: function render(demandStatus) {
-      var status = ['', '待处理', '处理中', '已驳回', '已结束'];
+      var status = ['', '待处理', '处理中', '已驳回', '已结束', '已超时'];
       return /*#__PURE__*/React.createElement("div", {
         style: {
           display: 'flex'
@@ -367,6 +367,18 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }
   }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.rejectedSum) || 0 : '-')), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel-status-item")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-panel-status-item-txt"),
+    onClick: function onClick() {
+      return setDemandStatus(5);
+    }
+  }, "\u5DF2\u8D85\u65F6"), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-panel-status-item-num"),
+    onClick: function onClick() {
+      return setDemandStatus(5);
+    }
+  }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.overTimeSum) || 0 : '-')), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-panel-status-item")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel-status-item-txt"),
     onClick: function onClick() {
@@ -423,6 +435,9 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }, {
       value: 4,
       label: '已结束'
+    }, {
+      value: 5,
+      label: '已超时'
     }]
   }), /*#__PURE__*/React.createElement("div", {
     className: "top-total"

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

@@ -1,210 +1,226 @@
-// @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;
-          &::before {
-            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;
-        }
-      }
-      &-item:nth-child(1) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #fd9f41;
-        }
-      }
-      &-item:nth-child(2) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #165dff;
-        }
-      }
-      &-item:nth-child(3) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #fb5547;
-        }
-      }
-      &-item:nth-child(4) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #ccd0d4;
-        }
-      }
-    }
-  }
-  &-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 {
-    &-status2 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #165dff);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #e8efff);
-      border-radius: 2px;
-    }
-    &-status1 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #fd9f41);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #ffecd9);
-      border-radius: 2px;
-    }
-    &-status3 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #fb5547);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #ffece8);
-      border-radius: 2px;
-    }
-    &-status4 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #5f6085);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #f2f3f4);
-      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;
+          &::before {
+            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;
+        }
+      }
+      &-item:nth-child(1) {
+        .system-setting-demand-panel-status-item-txt::before {
+          background-color: #fd9f41;
+        }
+      }
+      &-item:nth-child(2) {
+        .system-setting-demand-panel-status-item-txt::before {
+          background-color: #165dff;
+        }
+      }
+      &-item:nth-child(3) {
+        .system-setting-demand-panel-status-item-txt::before {
+          background-color: #fb5547;
+        }
+      }
+      &-item:nth-child(4) {
+        .system-setting-demand-panel-status-item-txt::before {
+          background-color: #e1f703;
+        }
+      }
+      &-item:nth-child(5) {
+        .system-setting-demand-panel-status-item-txt::before {
+          background-color: #ccd0d4;
+        }
+      }
+    }
+  }
+  &-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 {
+    &-status2 {
+      display: flex;
+      align-items: center;
+      padding: 1px 8px;
+      color: var(--io-i-, #165dff);
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 22px; /* 157.143% */
+      background: var(--io-i1-, #e8efff);
+      border-radius: 2px;
+    }
+    &-status1 {
+      display: flex;
+      align-items: center;
+      padding: 1px 8px;
+      color: var(--io-i-, #fd9f41);
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 22px; /* 157.143% */
+      background: var(--io-i1-, #ffecd9);
+      border-radius: 2px;
+    }
+    &-status3 {
+      display: flex;
+      align-items: center;
+      padding: 1px 8px;
+      color: var(--io-i-, #fb5547);
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 22px; /* 157.143% */
+      background: var(--io-i1-, #ffece8);
+      border-radius: 2px;
+    }
+    &-status4 {
+      display: flex;
+      align-items: center;
+      padding: 1px 8px;
+      color: var(--io-i-, #5f6085);
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 22px; /* 157.143% */
+      background: var(--io-i1-, #f2f3f4);
+      border-radius: 2px;
+    }
+    &-status5 {
+      display: flex;
+      align-items: center;
+      padding: 1px 8px;
+      color: var(--io-i-, #faad14);
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 22px; /* 157.143% */
+      background: var(--io-i1-, #ffe58f);
+      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.js

@@ -73,8 +73,8 @@ var CreateProcess = function CreateProcess(props) {
       console.log(err);
     });
   };
-  var gotoPage = function gotoPage(businessId) {
-    var pageNmae = businessId === -1 ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/setting/systemSetting/createDemand?id=' + businessId;
+  var gotoPage = function gotoPage(businessId, content) {
+    var pageNmae = businessId === -1 ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : content.includes('埋点待测试') ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/setting/systemSetting/createDemand?id=' + businessId;
     window.open(pageNmae, '_blank');
     // const pageNmae = businessId === -1 ? routes.dataAccess.manage : routes.createDemand;
     // const currentPage =
@@ -166,7 +166,7 @@ var CreateProcess = function CreateProcess(props) {
           color: '#67727F'
         },
         onClick: function onClick() {
-          gotoPage(v.businessId);
+          gotoPage(v.businessId, v.content);
           props.onClose();
           // changeAllRead(v.id);
         }
@@ -189,7 +189,7 @@ var CreateProcess = function CreateProcess(props) {
       }, /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-content-list-item-title"),
         onClick: function onClick() {
-          gotoPage(v.businessId);
+          gotoPage(v.businessId, v.content);
           props.onClose();
           changeAllRead(v.id);
         }

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

@@ -18,7 +18,8 @@ var PersonalInfo = function PersonalInfo(_ref) {
     isDemo = _useContext.isDemo;
   var _useState = useState({
       username: currentUser === null || currentUser === void 0 ? void 0 : currentUser.username,
-      emailNote: currentUser === null || currentUser === void 0 ? void 0 : currentUser.emailNote
+      emailNote: currentUser === null || currentUser === void 0 ? void 0 : currentUser.emailNote,
+      telphone: currentUser === null || currentUser === void 0 ? void 0 : currentUser.telphone
     }),
     _useState2 = _slicedToArray(_useState, 2),
     initialValues = _useState2[0],
@@ -34,14 +35,15 @@ var PersonalInfo = function PersonalInfo(_ref) {
   var onSubmit = function onSubmit(value) {
     setLoading(true);
     var username = value.username,
-      emailNote = value.emailNote;
+      emailNote = value.emailNote,
+      telphone = value.telphone;
     urlRequest(apis.setting.updateUserInfo, {
       method: 'post',
       data: {
         data: JSON.stringify({
           name: username,
           email: emailNote,
-          mobile: currentUser === null || currentUser === void 0 ? void 0 : currentUser.telphone
+          mobile: telphone
         })
       }
     }).then(function (res) {
@@ -52,11 +54,13 @@ var PersonalInfo = function PersonalInfo(_ref) {
         // 表单重置
         setInitialValues({
           username: username,
-          emailNote: emailNote
+          emailNote: emailNote,
+          telphone: telphone
         });
         form.resetFields();
         currentUser.username = username;
         currentUser.emailNote = emailNote;
+        currentUser.telphone = telphone;
         // 主应用更新currentUser,同公司设置-更新应用名称回调
         settingsCallback('settingChangeCompanyNameCallback');
       } else {
@@ -96,6 +100,20 @@ var PersonalInfo = function PersonalInfo(_ref) {
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u59D3\u540D",
     disabled: isDemo
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u624B\u673A\u53F7",
+    name: "telphone",
+    rules: [{
+      required: true,
+      message: '请输入手机号'
+    }, {
+      pattern: /^[0-9]{11}$/,
+      message: '请输入正确的手机号'
+    }]
+  }, /*#__PURE__*/React.createElement(Input, {
+    maxLength: 11,
+    placeholder: "\u624B\u673A\u53F7",
+    disabled: isDemo
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u90AE\u7BB1",
     name: "emailNote",
@@ -116,7 +134,7 @@ var PersonalInfo = function PersonalInfo(_ref) {
       type: "primary",
       htmlType: "submit",
       loading: loading,
-      disabled: isDemo || !(form.isFieldTouched('username') || form.isFieldTouched('emailNote')) || !!form.getFieldsError().filter(function (_ref2) {
+      disabled: isDemo || !(form.isFieldTouched('username') || form.isFieldTouched('emailNote') || form.isFieldTouched('telphone')) || !!form.getFieldsError().filter(function (_ref2) {
         var errors = _ref2.errors;
         return errors.length;
       }).length || JSON.stringify(initialValues) === JSON.stringify(form.getFieldsValue())