@zgfe/modules-settings 2.0.0-zhongyuan.43 → 2.0.0-zhongyuan.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,6 @@ import './styles/index.less';
3
3
  declare const CreateDemand: React.FC<{
4
4
  demandId?: number;
5
5
  data?: any;
6
- isRead?: boolean;
7
6
  saveObj?: any;
8
7
  setSaveObj?: Function;
9
8
  setIsShowSelectList?: Function;
@@ -90,96 +90,93 @@ var CreateDemand = function CreateDemand(props) {
90
90
  _useState18 = _slicedToArray(_useState17, 2),
91
91
  currentNodenumber = _useState18[0],
92
92
  setCurrentNodenumber = _useState18[1];
93
- var _useState19 = useState(props.isRead),
94
- _useState20 = _slicedToArray(_useState19, 1),
95
- isRead = _useState20[0];
93
+ var _useState19 = useState(false),
94
+ _useState20 = _slicedToArray(_useState19, 2),
95
+ isShowBackConfirm = _useState20[0],
96
+ setIsShowBackConfirm = _useState20[1];
96
97
  var _useState21 = useState(false),
97
98
  _useState22 = _slicedToArray(_useState21, 2),
98
- isShowBackConfirm = _useState22[0],
99
- setIsShowBackConfirm = _useState22[1];
100
- var _useState23 = useState(false),
101
- _useState24 = _slicedToArray(_useState23, 2),
102
- isEdit = _useState24[0],
103
- setIsEdit = _useState24[1];
99
+ isEdit = _useState22[0],
100
+ setIsEdit = _useState22[1];
104
101
  // const [processingNode, setProcessingNode] = useState();
105
- var _useState25 = useState(),
102
+ var _useState23 = useState(),
103
+ _useState24 = _slicedToArray(_useState23, 2),
104
+ demandData = _useState24[0],
105
+ setDemandData = _useState24[1];
106
+ var _useState25 = useState(0),
106
107
  _useState26 = _slicedToArray(_useState25, 2),
107
- demandData = _useState26[0],
108
- setDemandData = _useState26[1];
109
- var _useState27 = useState(0),
110
- _useState28 = _slicedToArray(_useState27, 2),
111
- demandStatus = _useState28[0],
112
- setDemandStatus = _useState28[1];
108
+ demandStatus = _useState26[0],
109
+ setDemandStatus = _useState26[1];
113
110
  //需求操作类型
114
- var _useState29 = useState((props === null || props === void 0 ? void 0 : (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.type) || 'get'),
115
- _useState30 = _slicedToArray(_useState29, 1),
116
- demandType = _useState30[0];
111
+ var _useState27 = useState((props === null || props === void 0 ? void 0 : (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.type) || 'edit'),
112
+ _useState28 = _slicedToArray(_useState27, 1),
113
+ demandType = _useState28[0];
117
114
  //埋点列表选择key
115
+ var _useState29 = useState([]),
116
+ _useState30 = _slicedToArray(_useState29, 2),
117
+ selectedRowKeys = _useState30[0],
118
+ setSelectedRowKeys = _useState30[1];
119
+ //公司用户列表
118
120
  var _useState31 = useState([]),
119
121
  _useState32 = _slicedToArray(_useState31, 2),
120
- selectedRowKeys = _useState32[0],
121
- setSelectedRowKeys = _useState32[1];
122
- //公司用户列表
123
- var _useState33 = useState([]),
122
+ userList = _useState32[0],
123
+ setUserList = _useState32[1];
124
+ var _useState33 = useState(false),
124
125
  _useState34 = _slicedToArray(_useState33, 2),
125
- userList = _useState34[0],
126
- setUserList = _useState34[1];
127
- var _useState35 = useState(false),
126
+ showUser = _useState34[0],
127
+ setShowUser = _useState34[1];
128
+ var _useState35 = useState({}),
128
129
  _useState36 = _slicedToArray(_useState35, 2),
129
- showUser = _useState36[0],
130
- setShowUser = _useState36[1];
131
- var _useState37 = useState({}),
130
+ userSelect = _useState36[0],
131
+ setUserSelect = _useState36[1];
132
+ var _useState37 = useState(''),
132
133
  _useState38 = _slicedToArray(_useState37, 2),
133
- userSelect = _useState38[0],
134
- setUserSelect = _useState38[1];
135
- var _useState39 = useState(''),
136
- _useState40 = _slicedToArray(_useState39, 2),
137
- userSelectType = _useState40[0],
138
- setUserSelectType = _useState40[1];
134
+ userSelectType = _useState38[0],
135
+ setUserSelectType = _useState38[1];
139
136
  //评论参数列表
140
- var _useState41 = useState('comment'),
137
+ var _useState39 = useState('comment'),
138
+ _useState40 = _slicedToArray(_useState39, 2),
139
+ tabKey = _useState40[0],
140
+ setTabKey = _useState40[1];
141
+ var _useState41 = useState([]),
141
142
  _useState42 = _slicedToArray(_useState41, 2),
142
- tabKey = _useState42[0],
143
- setTabKey = _useState42[1];
144
- var _useState43 = useState([]),
143
+ comments = _useState42[0],
144
+ setComments = _useState42[1];
145
+ var _useState43 = useState(''),
145
146
  _useState44 = _slicedToArray(_useState43, 2),
146
- comments = _useState44[0],
147
- setComments = _useState44[1];
148
- var _useState45 = useState(''),
147
+ commentText = _useState44[0],
148
+ setCommentText = _useState44[1];
149
+ var _useState45 = useState([]),
149
150
  _useState46 = _slicedToArray(_useState45, 2),
150
- commentText = _useState46[0],
151
- setCommentText = _useState46[1];
152
- var _useState47 = useState([]),
151
+ operateList = _useState46[0],
152
+ setOperateList = _useState46[1];
153
+ var _useState47 = useState(false),
153
154
  _useState48 = _slicedToArray(_useState47, 2),
154
- operateList = _useState48[0],
155
- setOperateList = _useState48[1];
155
+ showComment = _useState48[0],
156
+ setShowComment = _useState48[1];
157
+ //上线时间
156
158
  var _useState49 = useState(false),
157
159
  _useState50 = _slicedToArray(_useState49, 2),
158
- showComment = _useState50[0],
159
- setShowComment = _useState50[1];
160
- //上线时间
161
- var _useState51 = useState(false),
160
+ showOnlineTime = _useState50[0],
161
+ setShowOnlineTime = _useState50[1];
162
+ var _useState51 = useState(),
162
163
  _useState52 = _slicedToArray(_useState51, 2),
163
- showOnlineTime = _useState52[0],
164
- setShowOnlineTime = _useState52[1];
165
- var _useState53 = useState(),
166
- _useState54 = _slicedToArray(_useState53, 2),
167
- onlineTime = _useState54[0],
168
- setOnlineTime = _useState54[1];
164
+ onlineTime = _useState52[0],
165
+ setOnlineTime = _useState52[1];
169
166
  //设置时间
170
- var _useState55 = useState(1),
171
- _useState56 = _slicedToArray(_useState55, 2),
172
- tabIndex = _useState56[0],
173
- setTabIndex = _useState56[1];
167
+ var _useState53 = useState(1),
168
+ _useState54 = _slicedToArray(_useState53, 2),
169
+ tabIndex = _useState54[0],
170
+ setTabIndex = _useState54[1];
174
171
  //查看埋点内容
175
- var _useState57 = useState(false),
172
+ var _useState55 = useState(false),
173
+ _useState56 = _slicedToArray(_useState55, 2),
174
+ createMetaShow = _useState56[0],
175
+ setCreateMetaShow = _useState56[1];
176
+ var _useState57 = useState({}),
176
177
  _useState58 = _slicedToArray(_useState57, 2),
177
- createMetaShow = _useState58[0],
178
- setCreateMetaShow = _useState58[1];
179
- var _useState59 = useState({}),
180
- _useState60 = _slicedToArray(_useState59, 2),
181
- metaData = _useState60[0],
182
- setMetaData = _useState60[1];
178
+ metaData = _useState58[0],
179
+ setMetaData = _useState58[1];
183
180
  useEffect(function () {
184
181
  if (props.demandId) {
185
182
  getDemand();
@@ -187,10 +184,10 @@ var CreateDemand = function CreateDemand(props) {
187
184
  getNode();
188
185
  }
189
186
  }, [props.demandId]);
190
- var _useState61 = useState(false),
191
- _useState62 = _slicedToArray(_useState61, 2),
192
- isControl = _useState62[0],
193
- setIsControl = _useState62[1];
187
+ var _useState59 = useState(false),
188
+ _useState60 = _slicedToArray(_useState59, 2),
189
+ isControl = _useState60[0],
190
+ setIsControl = _useState60[1];
194
191
  var getAppAutoEvent = function getAppAutoEvent() {
195
192
  request(apis.getAppAutoEvent, {
196
193
  method: 'post',
@@ -302,11 +299,11 @@ var CreateDemand = function CreateDemand(props) {
302
299
  showUploadList: false,
303
300
  beforeUpload: function beforeUpload(file) {
304
301
  setIsEdit(true);
305
- var regex = /\.(zip|rar)$/i;
302
+ var regex = /\.(zip|rar|doc|docx|xlsx|xls|pdf)$/i;
306
303
  var isZip = regex.test(file.name);
307
- var is10M = file.size < 10 * 1024 * 1024;
304
+ var is10M = file.size < 50 * 1024 * 1024;
308
305
  if (!isZip || !is10M) {
309
- message.error("\u4EC5\u652F\u6301\u4E0A\u4F20\u4E00\u4E2A10M\u4EE5\u5185\u7684ZIP\u3001RAR\u683C\u5F0F\u538B\u7F29\u5305\u9644\u4EF6");
306
+ message.error("\u4EC5\u652F\u6301\u4E0A\u4F20\u4E00\u4E2A50M\u4EE5\u5185\u7684Word\u3001Excel\u3001PDF\u3001ZIP\u3001ZIP\u3001RAR\u683C\u5F0F\u538B\u7F29\u5305\u9644\u4EF6");
310
307
  } else {
311
308
  // setValueLoading(true);
312
309
  var formData = new FormData();
@@ -357,9 +354,9 @@ var CreateDemand = function CreateDemand(props) {
357
354
  }).map(function (item) {
358
355
  return item.id;
359
356
  }),
360
- pointEventStatus: type != 'flow' ? pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
357
+ pointEventStatus: pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
361
358
  return item.status;
362
- }) : [],
359
+ }),
363
360
  eventList: pointEventInfo
364
361
  }, data)
365
362
  }).then(function (res) {
@@ -367,7 +364,18 @@ var CreateDemand = function CreateDemand(props) {
367
364
  if (type == 'on') {
368
365
  message.success('保存成功');
369
366
  props.onBack && props.onBack();
367
+ return;
370
368
  }
369
+ setPointEventInfo(function (val) {
370
+ return val === null || val === void 0 ? void 0 : val.map(function (item, index) {
371
+ var _res$data;
372
+ return _objectSpread(_objectSpread({}, item), {}, {
373
+ id: (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.pointEventInfo[index].id
374
+ });
375
+ });
376
+ });
377
+ //每次修改刷新历史记录
378
+ getOperateList();
371
379
  // props.onSubmit && props.onSubmit()
372
380
  } else {
373
381
  message.error('保存失败');
@@ -375,7 +383,6 @@ var CreateDemand = function CreateDemand(props) {
375
383
  });
376
384
  };
377
385
  var downloadFile = function downloadFile() {
378
- if (!isRead) return;
379
386
  request(apis.fileDownload, {
380
387
  method: 'POST',
381
388
  data: {
@@ -413,7 +420,6 @@ var CreateDemand = function CreateDemand(props) {
413
420
  }
414
421
  };
415
422
  var downloadData = function downloadData() {
416
- if (!isRead) return;
417
423
  request(apis.downloadEvent, {
418
424
  method: 'POST',
419
425
  data: {
@@ -604,12 +610,18 @@ var CreateDemand = function CreateDemand(props) {
604
610
  color: '#fda145'
605
611
  }
606
612
  }, "\u8BBE\u8BA1\u4E2D");
607
- } else {
613
+ } else if (status == 1) {
608
614
  return /*#__PURE__*/React.createElement("div", {
609
615
  style: {
610
616
  color: '#2cbe54'
611
617
  }
612
618
  }, "\u8BBE\u8BA1\u5B8C\u6210");
619
+ } else {
620
+ return /*#__PURE__*/React.createElement("div", {
621
+ style: {
622
+ color: '#fb5547'
623
+ }
624
+ }, "\u5BA1\u6838\u4E0D\u901A\u8FC7");
613
625
  }
614
626
  } else if (demandStatus == 3 || demandStatus == 4) {
615
627
  if (status == 0) {
@@ -846,8 +858,6 @@ var CreateDemand = function CreateDemand(props) {
846
858
  var submitApproval = function submitApproval(status) {
847
859
  var _props$data8;
848
860
  setIsEdit(false);
849
- //先保存当前设置
850
- onCreate('flow');
851
861
  //提交进入下一个流程
852
862
  request(apis.submitApproval, {
853
863
  method: 'post',
@@ -961,7 +971,7 @@ var CreateDemand = function CreateDemand(props) {
961
971
  setIsEdit(true);
962
972
  setDemandName(e.currentTarget.value);
963
973
  },
964
- disabled: isRead || demandStatus == 102 || demandStatus == 101 || demandType == 'manage'
974
+ disabled: demandStatus == 102 || demandStatus == 101 || demandType != 'edit'
965
975
  }), /*#__PURE__*/React.createElement("div", {
966
976
  className: "".concat(classPrefix, "-info-item-content-input-num")
967
977
  }, /*#__PURE__*/React.createElement("span", {
@@ -983,7 +993,7 @@ var CreateDemand = function CreateDemand(props) {
983
993
  setCompletionTime(e);
984
994
  },
985
995
  showTime: true,
986
- disabled: isRead || demandStatus == 102 || demandStatus == 101 || demandType == 'manage'
996
+ disabled: demandStatus == 102 || demandStatus == 101 || demandType != 'edit'
987
997
  }))), /*#__PURE__*/React.createElement("div", {
988
998
  className: "".concat(classPrefix, "-info-item")
989
999
  }, /*#__PURE__*/React.createElement("div", {
@@ -1002,7 +1012,7 @@ var CreateDemand = function CreateDemand(props) {
1002
1012
  setIsEdit(true);
1003
1013
  setDemandDescribe(e.currentTarget.value);
1004
1014
  },
1005
- disabled: isRead || demandStatus == 102 || demandStatus == 101 || demandType == 'manage'
1015
+ disabled: demandStatus == 102 || demandStatus == 101 || demandType != 'edit'
1006
1016
  }), /*#__PURE__*/React.createElement("div", {
1007
1017
  className: "".concat(classPrefix, "-info-item-content-input-num")
1008
1018
  }, /*#__PURE__*/React.createElement("span", {
@@ -1024,7 +1034,7 @@ var CreateDemand = function CreateDemand(props) {
1024
1034
  onClick: function onClick() {
1025
1035
  downloadFile();
1026
1036
  }
1027
- }, demandFile.fileName), !isRead && demandType != 'manage' && (/*#__PURE__*/React.createElement(IconFont, {
1037
+ }, demandFile.fileName), demandType == 'edit' && (/*#__PURE__*/React.createElement(IconFont, {
1028
1038
  type: "qingchu",
1029
1039
  style: {
1030
1040
  color: '#67727F'
@@ -1035,7 +1045,7 @@ var CreateDemand = function CreateDemand(props) {
1035
1045
  })))) : (/*#__PURE__*/React.createElement("div", {
1036
1046
  className: "".concat(classPrefix, "-info-item-content-row")
1037
1047
  }, /*#__PURE__*/React.createElement(Upload, _objectSpread(_objectSpread({}, uploadProps), {}, {
1038
- disabled: isRead || demandStatus == 102 || demandStatus == 101 || demandType == 'manage'
1048
+ disabled: demandStatus == 102 || demandStatus == 101 || demandType != 'edit'
1039
1049
  }), /*#__PURE__*/React.createElement("div", {
1040
1050
  className: "".concat(classPrefix, "-info-item-content-btn")
1041
1051
  }, /*#__PURE__*/React.createElement(IconFont, {
@@ -1086,15 +1096,14 @@ var CreateDemand = function CreateDemand(props) {
1086
1096
  onClick: function onClick() {
1087
1097
  setTabIndex(0);
1088
1098
  }
1089
- }, "\u672A\u4E0A\u7EBF"))), isRead ? null : demandStatus == 2 && (/*#__PURE__*/React.createElement(Button, {
1090
- disabled: isRead,
1099
+ }, "\u672A\u4E0A\u7EBF"))), demandType == 'manage' && demandStatus == 2 && (/*#__PURE__*/React.createElement(Button, {
1091
1100
  shape: "round",
1092
1101
  className: "button",
1093
1102
  onClick: function onClick() {
1094
1103
  props.setIsShowSelectList && props.setIsShowSelectList(function (val) {
1095
1104
  var eventList = val.map(function (val) {
1096
1105
  return _objectSpread(_objectSpread({}, val), {}, {
1097
- status: val.status || 0
1106
+ status: val.status ? val.status == 2 ? 0 : val.status : 0
1098
1107
  });
1099
1108
  });
1100
1109
  setPointEventInfo(eventList);
@@ -1113,14 +1122,14 @@ var CreateDemand = function CreateDemand(props) {
1113
1122
  }
1114
1123
  }, "\u57CB\u70B9\u8BBE\u8BA1")), /*#__PURE__*/React.createElement("div", {
1115
1124
  className: "".concat(classPrefix, "-info-right")
1116
- }, isRead ? null : (/*#__PURE__*/React.createElement(Button, {
1125
+ }, demandType == 'manage' && (/*#__PURE__*/React.createElement(Button, {
1117
1126
  className: "button",
1118
1127
  shape: "round",
1119
1128
  onClick: function onClick() {
1120
1129
  setStatusMethod(1);
1121
1130
  onCreate('save');
1122
1131
  }
1123
- }, getLableValue(demandStatus, 'buttonName'))), isRead ? null : demandStatus == 2 && (/*#__PURE__*/React.createElement(Button, {
1132
+ }, getLableValue(demandStatus, 'buttonName'))), demandType == 'manage' && demandStatus == 2 && (/*#__PURE__*/React.createElement(Button, {
1124
1133
  className: "".concat(classPrefix, "-info-right-button forbiddenColor"),
1125
1134
  onClick: function onClick() {
1126
1135
  var list = pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.filter(function (item) {
@@ -1139,7 +1148,7 @@ var CreateDemand = function CreateDemand(props) {
1139
1148
  eventList: list
1140
1149
  });
1141
1150
  }
1142
- }, "\u79FB\u9664")), isRead ? null : (demandStatus == 3 || demandStatus == 4) && (/*#__PURE__*/React.createElement(Button, {
1151
+ }, "\u79FB\u9664")), demandType == 'manage' && (demandStatus == 3 || demandStatus == 4) && (/*#__PURE__*/React.createElement(Button, {
1143
1152
  className: "".concat(classPrefix, "-info-right-button forbiddenColor"),
1144
1153
  onClick: function onClick() {
1145
1154
  setStatusMethod(2);
@@ -1225,7 +1234,7 @@ var CreateDemand = function CreateDemand(props) {
1225
1234
  className: "".concat(classPrefix, "-right-title")
1226
1235
  }, "\u8282\u70B9\u9884\u89C8"))), /*#__PURE__*/React.createElement("div", {
1227
1236
  className: "".concat(classPrefix, "-footer")
1228
- }, !isDemo && !isRead && authority[1724922574] && [1, 2, 3, 4, 5, 6, 101].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
1237
+ }, !isDemo && demandType != 'get' && authority[1724922574] && [1, 2, 3, 4, 5, 6, 101].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
1229
1238
  shape: "round",
1230
1239
  className: "forbiddenColor",
1231
1240
  onClick: function onClick() {
@@ -1242,7 +1251,7 @@ var CreateDemand = function CreateDemand(props) {
1242
1251
  }
1243
1252
  });
1244
1253
  }
1245
- }, "\u5173\u95ED\u9700\u6C42")), !isRead && demandStatus == 0 && /*#__PURE__*/React.createElement(Button, {
1254
+ }, "\u5173\u95ED\u9700\u6C42")), demandType == 'edit' && /*#__PURE__*/React.createElement(Button, {
1246
1255
  onClick: onBack
1247
1256
  }, "\u53D6\u6D88"), !isDemo && authority[1724922574] && demandStatus > 0 && (/*#__PURE__*/React.createElement(Button, {
1248
1257
  shape: "round",
@@ -1254,7 +1263,7 @@ var CreateDemand = function CreateDemand(props) {
1254
1263
  onClick: downloadData
1255
1264
  }, "\u5BFC\u51FA\u57CB\u70B9\u8BBE\u8BA1")), /*#__PURE__*/React.createElement("div", {
1256
1265
  className: "".concat(classPrefix, "-footer-btnRight")
1257
- }, !isDemo && !isRead && demandType == 'manage' && [2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
1266
+ }, !isDemo && demandType != 'get' && [2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
1258
1267
  type: 'default',
1259
1268
  className: "commentBtn",
1260
1269
  onClick: function onClick() {
@@ -1269,22 +1278,25 @@ var CreateDemand = function CreateDemand(props) {
1269
1278
  setCommentText('');
1270
1279
  setShowComment(true);
1271
1280
  }
1272
- }, "\u6DFB\u52A0\u8BC4\u8BBA")), !isDemo && !isRead && [0, 1, 2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && demandType != 'manage' && (/*#__PURE__*/React.createElement(Button, {
1281
+ }, "\u6DFB\u52A0\u8BC4\u8BBA")), !isDemo && demandType == 'edit' && [0, 1, 2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
1273
1282
  type: 'primary',
1274
1283
  className: "commentBtn",
1275
1284
  onClick: function onClick() {
1276
1285
  return onCreate('on');
1277
1286
  }
1278
- }, demandData ? '保存' : '提交')), !isDemo && !isRead && demandStatus > 0 && demandStatus <= 6 && demandType == 'manage' && (/*#__PURE__*/React.createElement(Button, {
1287
+ }, demandData ? '保存' : '提交')), !isDemo && demandStatus > 0 && demandStatus <= 6 && demandType == 'manage' && (/*#__PURE__*/React.createElement(Button, {
1279
1288
  type: 'primary',
1280
1289
  className: "commentBtn",
1281
1290
  disabled: demandStatus > 1 ? !Boolean(pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.length) || Boolean(pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.filter(function (res) {
1282
1291
  return [0, 2].indexOf(res.status) != -1;
1283
1292
  }).length) : false,
1284
1293
  onClick: submitMethod
1285
- }, getLableValue(demandStatus, 'buttonName'))), !isDemo && !isRead && demandStatus > 2 && demandStatus <= 4 && demandType == 'manage' && (/*#__PURE__*/React.createElement(Button, {
1294
+ }, getLableValue(demandStatus, 'buttonName'))), !isDemo && demandStatus > 2 && demandStatus <= 4 && demandType == 'manage' && (/*#__PURE__*/React.createElement(Button, {
1286
1295
  type: 'primary',
1287
1296
  className: "commentBtn",
1297
+ disabled: !Boolean(pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.filter(function (res) {
1298
+ return res.status == 2;
1299
+ }).length),
1288
1300
  onClick: function onClick() {
1289
1301
  return Modal.confirm({
1290
1302
  wrapClassName: "".concat(classPrefix, "-confirm"),
@@ -1364,7 +1376,6 @@ var CreateDemand = function CreateDemand(props) {
1364
1376
  onOk: function onOk() {
1365
1377
  if (onlineTime) {
1366
1378
  //走流程
1367
- onCreate('flow');
1368
1379
  submitApproval(1);
1369
1380
  setShowOnlineTime(false);
1370
1381
  }
@@ -1381,8 +1392,7 @@ var CreateDemand = function CreateDemand(props) {
1381
1392
  setIsEdit(true);
1382
1393
  setOnlineTime(e);
1383
1394
  },
1384
- showTime: true,
1385
- disabled: isRead
1395
+ showTime: true
1386
1396
  })), /*#__PURE__*/React.createElement(CreateMetaDrawer, {
1387
1397
  isShow: createMetaShow,
1388
1398
  data: metaData,
@@ -367,6 +367,12 @@
367
367
  font-size: 12px;
368
368
  }
369
369
  }
370
+ &-content {
371
+ min-height: 200px;
372
+ // max-height: 400px;
373
+ // overflow-y:auto ;
374
+ // overflow-x: hidden;
375
+ }
370
376
  }
371
377
  &-history {
372
378
  &-list {
@@ -70,7 +70,24 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
70
70
  setTableTotal = _useState14[1];
71
71
  useEffect(function () {
72
72
  getDemandStatistics();
73
+ //如果有route则直接转跳从通知直接转跳
74
+ getLocationQuery();
73
75
  }, []);
76
+ var getLocationQuery = function getLocationQuery() {
77
+ var urlParams = new URLSearchParams(window.location.search);
78
+ if (urlParams.get('id')) {
79
+ props.onDeal && props.onDeal('revocation', {
80
+ type: 'manage',
81
+ demand: {
82
+ id: urlParams.get('id')
83
+ }
84
+ });
85
+ }
86
+ //跳转后清理query数据
87
+ router.replace({
88
+ name: routes.demandManage
89
+ });
90
+ };
74
91
  var onChangeTable = function onChangeTable(pagination, filters, sorter) {
75
92
  setPageData({
76
93
  orderBy: sorter.order ? sorter.field + ',' + sorterKey[sorter.order] : void 0,
@@ -262,7 +279,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
262
279
  message.error('无查看权限');
263
280
  return;
264
281
  }
265
- props.onDeal && props.onDeal('view', props.record.id);
282
+ props.onDeal && props.onDeal('revocation', {
283
+ type: 'get',
284
+ demand: props.record
285
+ });
266
286
  }
267
287
  }, "\u67E5\u770B"), /*#__PURE__*/React.createElement(Button, {
268
288
  color: "primary",
@@ -74,7 +74,7 @@ var CreateProcess = function CreateProcess(props) {
74
74
  });
75
75
  };
76
76
  var gotoPage = function gotoPage(businessId, content) {
77
- 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;
77
+ 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/demandManage?id=' + businessId;
78
78
  window.open(pageNmae, '_blank');
79
79
  // const pageNmae = businessId === -1 ? routes.dataAccess.manage : routes.createDemand;
80
80
  // const currentPage =
@@ -144,7 +144,7 @@ var PageInfo = function PageInfo(props) {
144
144
  _useState42 = _slicedToArray(_useState41, 2),
145
145
  navList = _useState42[0],
146
146
  setNavList = _useState42[1];
147
- var _useState43 = useState(0),
147
+ var _useState43 = useState(1),
148
148
  _useState44 = _slicedToArray(_useState43, 2),
149
149
  navIndex = _useState44[0],
150
150
  setNavIndex = _useState44[1];
@@ -1071,8 +1071,9 @@ var PageInfo = function PageInfo(props) {
1071
1071
  className: "".concat(classPrefix, "-info")
1072
1072
  }, /*#__PURE__*/React.createElement("div", {
1073
1073
  className: "".concat(classPrefix, "-info-nav")
1074
- }, navList.map(function (res) {
1074
+ }, navList.map(function (res, index) {
1075
1075
  return /*#__PURE__*/React.createElement("div", {
1076
+ key: index,
1076
1077
  className: "".concat(classPrefix, "-info-nav-item ").concat(navIndex == res.value ? "".concat(classPrefix, "-info-nav-itemActive") : ''),
1077
1078
  onClick: function onClick() {
1078
1079
  setNavIndex(res.value);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-settings",
3
- "version": "2.0.0-zhongyuan.43",
3
+ "version": "2.0.0-zhongyuan.45",
4
4
  "private": false,
5
5
  "module": "es/index.js",
6
6
  "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
67
67
  "publishConfig": {
68
68
  "access": "public"
69
69
  },
70
- "gitHead": "8b5043d081eb14ac5954fc1bcbcd72681337bb32",
70
+ "gitHead": "ef986b4fd63a5ab4379a9ee3eeb04ec086c118e2",
71
71
  "gitHooks": {
72
72
  "pre-commit": "lint-staged"
73
73
  }