@zgfe/modules-dm 1.0.56-zhongyuan.17 → 1.0.56-zhongyuan.18

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.
Files changed (3) hide show
  1. package/es/modules/dataManage/components/createMetaDrawer.js +1 -5
  2. package/es/modules/dataMap/component/rightDetail.js +15 -12
  3. package/package.json +2 -2
package/es/modules/dataManage/components/createMetaDrawer.js CHANGED
@@ -471,11 +471,7 @@ var CreateMeta = function CreateMeta(props) {
471
471
  }
472
472
  })), /*#__PURE__*/React.createElement(Form.Item, {
473
473
  name: "demandId",
474
- label: "\u9700\u6C42ID",
475
- rules: [{
476
- required: true,
477
- message: "\u8BF7\u8F93\u5165\u9700\u6C42ID"
478
- }]
474
+ label: "\u9700\u6C42ID"
479
475
  }, /*#__PURE__*/React.createElement(Input, {
480
476
  placeholder: "\u8BF7\u8F93\u5165\u9700\u6C42ID",
481
477
  showCount: true,
package/es/modules/dataMap/component/rightDetail.js CHANGED
@@ -112,10 +112,12 @@ var RightDetail = function RightDetail(props) {
112
112
  }
113
113
  };
114
114
  var handleRemoveFile = function handleRemoveFile(file) {
115
+ console.log(file, imageUrl, 'kk');
115
116
  var newArr = imageUrl === null || imageUrl === void 0 ? void 0 : imageUrl.filter(function (o) {
116
117
  return o.name != file.name;
117
118
  });
118
119
  setImageUrl(newArr);
120
+ setImagePath('');
119
121
  };
120
122
  var uploadImg = function uploadImg(file) {
121
123
  var data = new FormData();
@@ -194,22 +196,21 @@ var RightDetail = function RightDetail(props) {
194
196
  pageName: currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.pageAttrName
195
197
  }
196
198
  }).then(function (res) {
197
- var _res$data, _res$data2, _res$data3, _res$data4, _res$data5, _res$data6;
199
+ var _res$data, _res$data2, _res$data3, _res$data4, _res$data5, _res$data6, _res$data7;
198
200
  setLoadingDetail(false);
199
- if (!res) return;
200
- setCurrentTreeDetail(res === null || res === void 0 ? void 0 : res.data);
201
201
  pageDetailForm.setFieldsValue({
202
202
  pageName: currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.pageAttrName,
203
- remarkName: currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.remarkAttrName,
203
+ remarkName: res.data.remark || (currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.remarkAttrName),
204
204
  description: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.pageDescribe) || ''
205
205
  });
206
+ setCurrentTreeDetail(res === null || res === void 0 ? void 0 : res.data);
206
207
  setImagePath(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.pagePath);
207
- (res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.pageUrl) && setImageUrl([{
208
+ (res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.pageUrl) ? setImageUrl([{
208
209
  status: 'done',
209
- name: '',
210
- url: (res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.pageUrl) && getImgUrl(res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.pageUrl, '-99'),
211
- uid: res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.pagePath
212
- }]);
210
+ name: res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.pagePath,
211
+ url: (res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.pageUrl) && getImgUrl(res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.pageUrl, '-99'),
212
+ uid: res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.pagePath
213
+ }]) : setImageUrl([]);
213
214
  });
214
215
  }
215
216
  }, [currentTreeData]);
@@ -228,6 +229,7 @@ var RightDetail = function RightDetail(props) {
228
229
  data: {
229
230
  mapId: currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.mapId,
230
231
  pageName: currentTreeData.pageAttrName,
232
+ remark: values.remarkName,
231
233
  pagePath: imagePath,
232
234
  pageDescribe: values.description
233
235
  }
@@ -493,8 +495,8 @@ var RightDetail = function RightDetail(props) {
493
495
  userGroup: [0]
494
496
  }
495
497
  }).then(function (res) {
496
- var _res$data7, _res$data7$series, _res$data7$series$, _res$data7$series$$va;
497
- resolve((res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : (_res$data7$series = _res$data7.series) === null || _res$data7$series === void 0 ? void 0 : (_res$data7$series$ = _res$data7$series[0]) === null || _res$data7$series$ === void 0 ? void 0 : (_res$data7$series$$va = _res$data7$series$.values) === null || _res$data7$series$$va === void 0 ? void 0 : _res$data7$series$$va[0]) || 0);
498
+ var _res$data8, _res$data8$series, _res$data8$series$, _res$data8$series$$va;
499
+ resolve((res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : (_res$data8$series = _res$data8.series) === null || _res$data8$series === void 0 ? void 0 : (_res$data8$series$ = _res$data8$series[0]) === null || _res$data8$series$ === void 0 ? void 0 : (_res$data8$series$$va = _res$data8$series$.values) === null || _res$data8$series$$va === void 0 ? void 0 : _res$data8$series$$va[0]) || 0);
498
500
  });
499
501
  });
500
502
  };
@@ -510,10 +512,11 @@ var RightDetail = function RightDetail(props) {
510
512
  bordered: false,
511
513
  extra: isEdit ? (/*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
512
514
  onClick: function onClick() {
515
+ setImagePath('');
513
516
  (currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pageUrl) ? setImageUrl([{
514
517
  status: 'done',
515
518
  // name: currentTreeDetail?.pageUrl,
516
- name: '',
519
+ name: currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pagePath,
517
520
  url: (currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pageUrl) && getImgUrl(currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pageUrl, '-99'),
518
521
  uid: currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pagePath
519
522
  }]) : setImageUrl([]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-dm",
3
- "version": "1.0.56-zhongyuan.17",
3
+ "version": "1.0.56-zhongyuan.18",
4
4
  "license": "ISC",
5
5
  "module": "es/index.js",
6
6
  "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
57
57
  "umi-request": "^1.4.0",
58
58
  "yorkie": "^2.0.0"
59
59
  },
60
- "gitHead": "8a5e9f3df4613e312ec87f2d66911511156de122",
60
+ "gitHead": "c7d5e8ec5ea8956767cb47c4f83781c9f8409053",
61
61
  "gitHooks": {
62
62
  "pre-commit": "lint-staged"
63
63
  }