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

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.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,9 @@ 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';
     if (!demandName) {
       message.warning('请填写需求名称');
       return;
@@ -337,13 +347,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;
-        })
+        }) : [] //走流程不用传状态 状态会自动修改成0
       })
     }).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 +363,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 +383,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 +393,6 @@ var CreateDemand = function CreateDemand(props) {
       default:
         break;
     }
-    // setEventAttrListShow(true);
-    // setEventProp(record.event_attrs);
   };
   var onBack = function onBack() {
     if (isEdit) {
@@ -673,8 +672,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 +680,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 +774,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 +836,7 @@ var CreateDemand = function CreateDemand(props) {
     var _props$data8;
     setIsEdit(false);
     //先保存当前设置
-    onCreate(false);
+    onCreate('flow');
     //提交进入下一个流程
     request(apis.submitApproval, {
       method: 'post',
@@ -832,6 +855,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 +911,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 +919,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 +927,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 +1008,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 +1026,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,
@@ -1059,6 +1082,7 @@ var CreateDemand = function CreateDemand(props) {
             status: 0
           });
         }));
+        onCreate('save');
       }, pointEventInfo);
     }
   }, "\u57CB\u70B9\u8BBE\u8BA1")), /*#__PURE__*/React.createElement("div", {
@@ -1068,6 +1092,7 @@ 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"),
@@ -1075,11 +1100,13 @@ var CreateDemand = function CreateDemand(props) {
       setPointEventInfo(pointEventInfo ? pointEventInfo.filter(function (item) {
         return selectedRowKeys.indexOf(item.id) == -1;
       }) : []);
+      onCreate('save');
     }
   }, "\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 +1114,7 @@ var CreateDemand = function CreateDemand(props) {
       borderRadius: 8,
       overflow: 'hidden'
     },
-    columns: isRead ? newColumns() : _toConsumableArray(newColumns()),
+    columns: newColumns(),
     rowKey: "id",
     rowSelection: {
       selectedRowKeys: selectedRowKeys,
@@ -1117,7 +1144,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 +1169,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 +1232,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 +1315,8 @@ var CreateDemand = function CreateDemand(props) {
     closable: true,
     onOk: function onOk() {
       if (onlineTime) {
-        onCreate(false);
+        //走流程
+        onCreate('flow');
         submitApproval(1);
         setShowOnlineTime(false);
       }

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

@@ -191,6 +191,10 @@
           font-style: normal;
           line-height: normal;
         }
+        &-ptxt {
+          display: block;
+          transform: translateY(6px);
+        }
         &-row {
           display: flex;
           flex-direction: row;
@@ -246,6 +250,9 @@
             border: 1px solid #1454e5;
           }
         }
+        &-content {
+          min-height: 300px;
+        }
       }
     }
     &-right {
@@ -355,7 +362,7 @@
         font-size: 12px;
       }
       &-text {
-        margin-top: 10px;
+        margin-top: 5px;
         color: #9aa1a9;
         font-size: 12px;
       }

package/es/modules/demandManage/index.js

@@ -213,7 +213,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }
   }, {
     title: '操作',
-    width: 250,
+    width: 260,
     fixed: 'right',
     render: function render(record) {
       return /*#__PURE__*/React.createElement(DealDom, {
@@ -293,7 +293,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           }
         });
       }
-    }, "\u590D\u5236"), /*#__PURE__*/React.createElement(Button, {
+    }, "\u590D\u5236"), [101, 102].indexOf(props.record.demandStatus) == -1 && (/*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
       onClick: function onClick() {
@@ -303,7 +303,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           demand: props.record
         });
       }
-    }, "\u7F16\u8F91"));
+    }, "\u7F16\u8F91")));
   };
   //关闭功能
   var disableDemand = function disableDemand(data) {

package/es/modules/personalSetting/index.js

@@ -16,13 +16,12 @@ import util from '../../utils/util';
 import SecurityLog from './securityLog';
 import CreateProcess from '../messageList';
 var PersonalSetting = function PersonalSetting(_ref) {
-  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$query = route.query) === null || _route$query === void 0 ? void 0 : _route$query.currentKey) || '1'),
+  var _useState = useState('1'),
     _useState2 = _slicedToArray(_useState, 2),
     currentKey = _useState2[0],
     setCurrentKey = _useState2[1];
@@ -32,8 +31,10 @@ var PersonalSetting = function PersonalSetting(_ref) {
     className: "tab-header-title"
   }, "\u4E2A\u4EBA\u8BBE\u7F6E"));
   useEffect(function () {
+    var _route$query, _route$query2;
     var query = util.getHrefData(window.location.href);
     if (query.password) setCurrentKey('2');
+    if (route === null || route === void 0 ? void 0 : (_route$query = route.query) === null || _route$query === void 0 ? void 0 : _route$query.currentKey) setCurrentKey(route === null || route === void 0 ? void 0 : (_route$query2 = route.query) === null || _route$query2 === void 0 ? void 0 : _route$query2.currentKey);
   }, []);
   var items = [{
     key: '1',

package/package.json

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