@zgfe/modules-settings 2.0.0-zhongyuan.31 → 2.0.0-zhongyuan.33

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

@@ -1,144 +1,144 @@
-.application {
-  height: 100%;
-  min-height: 400px;
-  overflow-x: hidden;
-  overflow-y: auto;
-
-  &-modal {
-    .ant-modal-body {
-      padding: 24px !important;
-    }
-    .ant-modal-confirm-body .ant-modal-confirm-title {
-      color: #000;
-      font-size: 24px;
-      line-height: 24px;
-    }
-
-    .ant-modal-confirm-body .ant-modal-confirm-content {
-      margin-top: 0;
-      padding-top: 24px;
-    }
-
-    .ant-modal-close {
-      padding-top: 8px;
-      padding-right: 6px;
-
-      &-x {
-        color: #021429;
-        font-size: 24px;
-      }
-    }
-  }
-
-  &-drawer {
-    .ant-drawer-header-title {
-      flex-direction: row-reverse;
-    }
-  }
-
-  .bsicon {
-    color: #9aa1a9;
-    font-size: 16px !important;
-  }
-  .bsicon:hover {
-    color: var(--io-i-, #165dff);
-  }
-
-  .bsicon.shanchu:hover {
-    color: #fb5547;
-  }
-
-  .zhuge.icon-shanchu:hover {
-    color: #fb5547;
-  }
-
-  &-alert-info {
-    background-color: #e6f7ff;
-    border: 1px solid #91d5ff;
-    border-radius: 2px;
-  }
-
-  &-form {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    &-item {
-      display: flex;
-      gap: 8px;
-      align-items: center;
-
-      .bsicon {
-        color: #fd9f41;
-      }
-
-      .bsicon:hover {
-        color: var(--io-i-, #fd9f41);
-      }
-    }
-
-    .ant-btn-sm {
-      height: 32px;
-      padding: 4px 16px;
-    }
-  }
-
-  .ant-divider-horizontal {
-    margin: 14px 0;
-  }
-
-  .biz-loading-container.loading {
-    margin-top: 100px;
-  }
-
-  &-disabled,
-  &-disabled:hover,
-  &-disabled:focus {
-    cursor: not-allowed !important;
-  }
-
-  .ant-btn-primary[disabled],
-  .ant-btn-primary[disabled]:hover,
-  .ant-btn-primary[disabled]:focus,
-  .ant-btn-primary[disabled]:active {
-    color: #fff;
-    background: var(--io-i2-, #d0dfff);
-    border: 1px solid #d0dfff;
-  }
-
-  .settings-card {
-    gap: 6px;
-    height: 120px;
-  }
-  &-rowContent {
-    height: calc(100vh - 302px);
-    overflow: overlay;
-  }
-  &-contentList-label {
-    display: grid;
-    grid-template-columns: 230px repeat(4, minmax(90px, 1fr)) 135px 90px 260px;
-    align-items: center;
-    padding-right: 14px;
-    border-bottom: 1px solid #ecedf0;
-  }
-  &-contentList-item-name {
-    color: #000;
-    font-weight: bold;
-    font-size: 14px;
-  }
-  &-contentList-item-status-icon0,
-  &-contentList-item-status-icon1 {
-    display: inline-block;
-    width: 6px;
-    height: 6px;
-    margin-right: 3px;
-    border-radius: 50%;
-    transform: translateY(-1px);
-  }
-  &-contentList-item-status-icon0 {
-    background: #67727f;
-  }
-  &-contentList-item-status-icon1 {
-    background: #165dff;
-  }
-}
+.application {
+  height: 100%;
+  min-height: 400px;
+  overflow-x: hidden;
+  overflow-y: auto;
+
+  &-modal {
+    .ant-modal-body {
+      padding: 24px !important;
+    }
+    .ant-modal-confirm-body .ant-modal-confirm-title {
+      color: #000;
+      font-size: 24px;
+      line-height: 24px;
+    }
+
+    .ant-modal-confirm-body .ant-modal-confirm-content {
+      margin-top: 0;
+      padding-top: 24px;
+    }
+
+    .ant-modal-close {
+      padding-top: 8px;
+      padding-right: 6px;
+
+      &-x {
+        color: #021429;
+        font-size: 24px;
+      }
+    }
+  }
+
+  &-drawer {
+    .ant-drawer-header-title {
+      flex-direction: row-reverse;
+    }
+  }
+
+  .bsicon {
+    color: #9aa1a9;
+    font-size: 16px !important;
+  }
+  .bsicon:hover {
+    color: var(--io-i-, #165dff);
+  }
+
+  .bsicon.shanchu:hover {
+    color: #fb5547;
+  }
+
+  .zhuge.icon-shanchu:hover {
+    color: #fb5547;
+  }
+
+  &-alert-info {
+    background-color: #e6f7ff;
+    border: 1px solid #91d5ff;
+    border-radius: 2px;
+  }
+
+  &-form {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    &-item {
+      display: flex;
+      gap: 8px;
+      align-items: center;
+
+      .bsicon {
+        color: #fd9f41;
+      }
+
+      .bsicon:hover {
+        color: var(--io-i-, #fd9f41);
+      }
+    }
+
+    .ant-btn-sm {
+      height: 32px;
+      padding: 4px 16px;
+    }
+  }
+
+  .ant-divider-horizontal {
+    margin: 14px 0;
+  }
+
+  .biz-loading-container.loading {
+    margin-top: 100px;
+  }
+
+  &-disabled,
+  &-disabled:hover,
+  &-disabled:focus {
+    cursor: not-allowed !important;
+  }
+
+  .ant-btn-primary[disabled],
+  .ant-btn-primary[disabled]:hover,
+  .ant-btn-primary[disabled]:focus,
+  .ant-btn-primary[disabled]:active {
+    color: #fff;
+    background: var(--io-i2-, #d0dfff);
+    border: 1px solid #d0dfff;
+  }
+
+  .settings-card {
+    gap: 6px;
+    height: 120px;
+  }
+  &-rowContent {
+    height: calc(100vh - 302px);
+    overflow: overlay;
+  }
+  &-contentList-label {
+    display: grid;
+    grid-template-columns: 230px repeat(4, minmax(90px, 1fr)) 135px 90px 260px;
+    align-items: center;
+    padding-right: 14px;
+    border-bottom: 1px solid #ecedf0;
+  }
+  &-contentList-item-name {
+    color: #000;
+    font-weight: bold;
+    font-size: 14px;
+  }
+  &-contentList-item-status-icon0,
+  &-contentList-item-status-icon1 {
+    display: inline-block;
+    width: 6px;
+    height: 6px;
+    margin-right: 3px;
+    border-radius: 50%;
+    transform: translateY(-1px);
+  }
+  &-contentList-item-status-icon0 {
+    background: #67727f;
+  }
+  &-contentList-item-status-icon1 {
+    background: #165dff;
+  }
+}

package/es/modules/createDemand/constants.js

@@ -132,7 +132,7 @@ var demandTabList = [{
   value: 6,
   key: 'nodename6',
   color: '#165dff',
-  buttonName: '需求完成'
+  buttonName: '测试完成'
 }, {
   label: '已完成',
   value: 101,

package/es/modules/createDemand/index.js

@@ -202,6 +202,15 @@ var CreateDemand = function CreateDemand(props) {
     });
   };
   useEffect(function () {
+    if (props.data && props.data.demand && (props === null || props === void 0 ? void 0 : props.data.demand.demandName)) {
+      setDemandName(props === null || props === void 0 ? void 0 : props.data.demand.demandName);
+      setDemandDescribe(props === null || props === void 0 ? void 0 : props.data.demand.demandDescribe);
+      setCompletionTime(moment(new Date(props === null || props === void 0 ? void 0 : props.data.demand.completionTime)));
+      setDemandFile({
+        fileName: props === null || props === void 0 ? void 0 : props.data.demand.fileName,
+        filePath: props === null || props === void 0 ? void 0 : props.data.demand.filePath
+      });
+    }
     getAppAutoEvent();
   }, []);
   var getDemand = function getDemand() {
@@ -312,8 +321,10 @@ var CreateDemand = function CreateDemand(props) {
       return false;
     }
   };
+  // type on单击事件 save保存 flow
   var onCreate = function onCreate() {
-    var back = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'save';
+    var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     if (!demandName) {
       message.warning('请填写需求名称');
       return;
@@ -337,13 +348,13 @@ var CreateDemand = function CreateDemand(props) {
         pointEventIds: pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
           return item.id;
         }),
-        pointEventStatus: pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
+        pointEventStatus: type != 'flow' ? pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
           return item.status;
-        })
-      })
+        }) : []
+      }, data)
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
-        if (back) {
+        if (type == 'on') {
           message.success('保存成功');
           props.onBack && props.onBack();
         }
@@ -353,14 +364,6 @@ var CreateDemand = function CreateDemand(props) {
       }
     });
   };
-  var removeInfo = function removeInfo(type, info) {
-    if (isRead) return message.error('查看状态不可修改');
-    var data = _.clone(pointEventInfo);
-    setPointEventInfo(data ? data.filter(function (item) {
-      return item.id !== info.id;
-    }) : []);
-    message.success('移除成功');
-  };
   var downloadFile = function downloadFile() {
     if (!isRead) return;
     request(apis.fileDownload, {
@@ -381,7 +384,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');
@@ -392,8 +394,6 @@ var CreateDemand = function CreateDemand(props) {
       default:
         break;
     }
-    // setEventAttrListShow(true);
-    // setEventProp(record.event_attrs);
   };
   var onBack = function onBack() {
     if (isEdit) {
@@ -673,8 +673,7 @@ var CreateDemand = function CreateDemand(props) {
   };
   // 新的埋点表格列表
   var newColumns = function newColumns() {
-    //埋点列表label数据
-    return [].concat(_toConsumableArray(columnsEvent(gotoPage, isControl)), [{
+    var columns = [].concat(_toConsumableArray(columnsEvent(gotoPage, isControl)), [{
       title: '状态',
       width: 120,
       dataIndex: 'status',
@@ -682,6 +681,27 @@ var CreateDemand = function CreateDemand(props) {
         return statusDiv(status);
       }
     }]);
+    //处于需求完成和埋点信息为上线状态
+    if (demandStatus == 101 && tabIndex == 1) {
+      columns.push({
+        title: '是否有数据上报',
+        width: 150,
+        dataIndex: 'hasData',
+        render: function render(hasData) {
+          return hasData == 1 ? (/*#__PURE__*/React.createElement("div", {
+            style: {
+              color: '#2cbe54'
+            }
+          }, "\u662F")) : (/*#__PURE__*/React.createElement("div", {
+            style: {
+              color: '#fb5547'
+            }
+          }, "\u5426"));
+        }
+      });
+    }
+    //埋点列表label数据
+    return columns;
   };
   //埋点需求列表选择
   var onSelectChange = function onSelectChange(val) {
@@ -755,20 +775,24 @@ var CreateDemand = function CreateDemand(props) {
       request(apis.setting.designateProcessor, {
         method: 'POST',
         data: {
+          appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
           id: props.demandId || ((_props$data5 = props.data) === null || _props$data5 === void 0 ? void 0 : _props$data5.demand.id),
           processorId: userSelect.id,
           processorName: userSelect.userName
         }
       }).then(function (res) {
-        setShowUser(false);
-        if (props.data && props.data.demand) {
-          setDemandData(function (val) {
-            return val.demand.currentProcessorName = userSelect.userName;
+        if (res && res.code == '100000') {
+          setShowUser(false);
+          if (props.data && props.data.demand) {
+            setDemandData(function (val) {
+              val.demand.currentProcessorName = userSelect.userName;
+              return _objectSpread({}, val);
+            });
+          }
+          notification.success({
+            message: '修改成功'
           });
         }
-        notification.success({
-          message: '修改成功'
-        });
       });
     } else {
       submitApproval(1);
@@ -813,7 +837,7 @@ var CreateDemand = function CreateDemand(props) {
     var _props$data8;
     setIsEdit(false);
     //先保存当前设置
-    onCreate(false);
+    onCreate('flow');
     //提交进入下一个流程
     request(apis.submitApproval, {
       method: 'post',
@@ -832,6 +856,10 @@ var CreateDemand = function CreateDemand(props) {
         });
         setShowUser(false);
         props.onBack && props.onBack();
+      } else {
+        notification.success({
+          message: res.msg
+        });
       }
     }).catch(function (err) {
       console.log(err);
@@ -884,7 +912,7 @@ var CreateDemand = function CreateDemand(props) {
   }, "\u9700\u6C42ID"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content")
   }, /*#__PURE__*/React.createElement("span", {
-    className: "".concat(classPrefix, "-info-item-content-tip")
+    className: "".concat(classPrefix, "-info-item-content-tip  ").concat(classPrefix, "-info-item-content-ptxt")
   }, demandData && (demandData === null || demandData === void 0 ? void 0 : demandData.demand.id)))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
@@ -892,7 +920,7 @@ var CreateDemand = function CreateDemand(props) {
   }, "\u521B\u5EFA\u4EBA"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content")
   }, /*#__PURE__*/React.createElement("span", {
-    className: "".concat(classPrefix, "-info-item-content-tip")
+    className: "".concat(classPrefix, "-info-item-content-tip  ").concat(classPrefix, "-info-item-content-ptxt")
   }, demandData && (demandData === null || demandData === void 0 ? void 0 : demandData.demand.creatorName)))), demandStatus > 1 && (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
@@ -900,7 +928,7 @@ var CreateDemand = function CreateDemand(props) {
   }, "\u5904\u7406\u4EBA"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content")
   }, /*#__PURE__*/React.createElement("span", {
-    className: "".concat(classPrefix, "-info-item-content-tip")
+    className: "".concat(classPrefix, "-info-item-content-tip  ").concat(classPrefix, "-info-item-content-ptxt")
   }, demandData && (demandData === null || demandData === void 0 ? void 0 : demandData.demand.currentProcessorName))))))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
@@ -981,7 +1009,7 @@ var CreateDemand = function CreateDemand(props) {
     onClick: function onClick() {
       downloadFile();
     }
-  }, demandFile.fileName), !isRead && (/*#__PURE__*/React.createElement(IconFont, {
+  }, demandFile.fileName), !isRead && demandType != 'manage' && (/*#__PURE__*/React.createElement(IconFont, {
     type: "qingchu",
     style: {
       color: '#67727F'
@@ -999,19 +1027,15 @@ var CreateDemand = function CreateDemand(props) {
     type: "tianjia1"
   }), "\u6DFB\u52A0\u6587\u4EF6")), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content-tip")
-  }, "\uFF08\u652F\u6301 ZIP\u3001RAR \u683C\u5F0F\u300110M\u4EE5\u5185\uFF09"))))), demandStatus == 101 || demandStatus == 102 && (/*#__PURE__*/React.createElement("div", {
+  }, "\uFF08\u652F\u6301 ZIP\u3001RAR \u683C\u5F0F\u300110M\u4EE5\u5185\uFF09"))))), (demandStatus == 101 || demandStatus == 102) && (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-txt")
   }, "\u4E0A\u7EBF\u65F6\u95F4"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content")
-  }, /*#__PURE__*/React.createElement(DatePicker, {
-    className: "".concat(classPrefix, "-info-item-content-picker"),
-    value: demandData === null || demandData === void 0 ? void 0 : demandData.demand.onlineTime,
-    disabledDate: disabledDate,
-    showTime: true,
-    disabled: true
-  }))))), (demandType != 'edit' && demandStatus > 0 || isRead) && (/*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "".concat(classPrefix, "-info-item-content-tip  ").concat(classPrefix, "-info-item-content-ptxt")
+  }, (demandData === null || demandData === void 0 ? void 0 : demandData.demand) && (demandData === null || demandData === void 0 ? void 0 : demandData.demand.onlineTime)))))), demandType != 'edit' && demandStatus > 1 && (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item"),
     style: {
       paddingLeft: 24,
@@ -1052,13 +1076,13 @@ var CreateDemand = function CreateDemand(props) {
     shape: "round",
     className: "button",
     onClick: function onClick() {
-      setIsEdit(true);
       props.setIsShowSelectList && props.setIsShowSelectList(function (val) {
         setPointEventInfo(val.map(function (val) {
           return _objectSpread(_objectSpread({}, val), {}, {
             status: 0
           });
         }));
+        onCreate('save');
       }, pointEventInfo);
     }
   }, "\u57CB\u70B9\u8BBE\u8BA1")), /*#__PURE__*/React.createElement("div", {
@@ -1068,18 +1092,31 @@ var CreateDemand = function CreateDemand(props) {
     shape: "round",
     onClick: function onClick() {
       setStatusMethod(1);
+      onCreate('save');
     }
   }, getLableValue(demandStatus, 'buttonName'))), isRead ? null : demandStatus == 2 && (/*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-info-right-button forbiddenColor"),
     onClick: function onClick() {
-      setPointEventInfo(pointEventInfo ? pointEventInfo.filter(function (item) {
-        return selectedRowKeys.indexOf(item.id) == -1;
-      }) : []);
+      var list = pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
+        if (selectedRowKeys.indexOf(item.id) == -1) {
+          pointEventInfo.slice(selectedRowKeys.indexOf(item.id));
+        }
+      });
+      setPointEventInfo(list);
+      onCreate('save', {
+        pointEventIds: list.map(function (res) {
+          return res.id;
+        }),
+        pointEventStatus: list.map(function (res) {
+          return res.status;
+        })
+      });
     }
   }, "\u79FB\u9664")), isRead ? null : (demandStatus == 3 || demandStatus == 4) && (/*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-info-right-button forbiddenColor"),
     onClick: function onClick() {
       setStatusMethod(2);
+      onCreate('save');
     }
   }, "\u9A73\u56DE")))), /*#__PURE__*/React.createElement(Table, {
     style: {
@@ -1087,7 +1124,7 @@ var CreateDemand = function CreateDemand(props) {
       borderRadius: 8,
       overflow: 'hidden'
     },
-    columns: isRead ? newColumns() : _toConsumableArray(newColumns()),
+    columns: newColumns(),
     rowKey: "id",
     rowSelection: {
       selectedRowKeys: selectedRowKeys,
@@ -1117,7 +1154,9 @@ var CreateDemand = function CreateDemand(props) {
       setTabKey('history');
       getOperateList();
     }
-  }, "\u64CD\u4F5C\u5386\u53F2")), tabKey == 'comment' && comments.map(function (item) {
+  }, "\u64CD\u4F5C\u5386\u53F2")), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-comment-content")
+  }, tabKey == 'comment' && comments.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-comment-list"),
       key: item.id
@@ -1140,7 +1179,7 @@ var CreateDemand = function CreateDemand(props) {
     });
   }), operateList.length == 0 && tabKey == 'history' && (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-comment-empty")
-  }, "\u6682\u65E0\u64CD\u4F5C\u5386\u53F2"))))), /*#__PURE__*/React.createElement("div", {
+  }, "\u6682\u65E0\u64CD\u4F5C\u5386\u53F2")))))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-right"),
     id: "xsd4"
   }, nodeData.length ? (/*#__PURE__*/React.createElement(ProcessCanvas, {
@@ -1203,11 +1242,11 @@ var CreateDemand = function CreateDemand(props) {
       setCommentText('');
       setShowComment(true);
     }
-  }, "\u6DFB\u52A0\u8BC4\u8BBA")), !isDemo && !isRead && demandType == 'edit' && [0, 1, 2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u6DFB\u52A0\u8BC4\u8BBA")), !isDemo && !isRead && [0, 1, 2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && demandType != 'manage' && (/*#__PURE__*/React.createElement(Button, {
     type: 'primary',
     className: "commentBtn",
     onClick: function onClick() {
-      return onCreate();
+      return onCreate('on');
     }
   }, demandData ? '保存' : '提交')), !isDemo && !isRead && demandStatus > 0 && demandStatus <= 6 && demandType == 'manage' && (/*#__PURE__*/React.createElement(Button, {
     type: 'primary',
@@ -1286,7 +1325,8 @@ var CreateDemand = function CreateDemand(props) {
     closable: true,
     onOk: function onOk() {
       if (onlineTime) {
-        onCreate(false);
+        //走流程
+        onCreate('flow');
         submitApproval(1);
         setShowOnlineTime(false);
       }