@zgfe/modules-settings 2.0.0-zhongyuan.22 → 2.0.0-zhongyuan.24

package/es/modules/demandManage/index.js

@@ -402,7 +402,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     onChange: function onChange(e) {
       return setDemandName(e.target.value);
     },
-    placeholder: "\u8BF7\u8F93\u5165\u9700\u6C42\u540D\u79F0/\u521B\u5EFA\u8005",
+    placeholder: "\u8BF7\u8F93\u5165\u9700\u6C42\u540D\u79F0",
     prefix: /*#__PURE__*/React.createElement(IconFont, {
       type: "sousuo"
     })

package/es/modules/pointMap/pageInfo.js

@@ -27,10 +27,9 @@ import util from '../../utils/util';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import PicCircleSelect from '../../components/picCircleSelect';
-import constants from '../../utils/constants';
 import { uuid } from '@antv/x6/lib/util/string/uuid';
 var getImgUrl = function getImgUrl(src, pageId) {
-  return constants.regExp.url.test(src) ? src : "".concat(window.location.origin, "/web/img/report/").concat(pageId, "/").concat(src);
+  return src.indexOf('data:image') != -1 ? src : "".concat(window.location.origin, "/web/img/report/").concat(pageId, "/").concat(src);
   // return constants.regExp.url.test(src)
   //   ? src
   //   : `${'https://test01.zhugeapi.com'}/web/img/report/${pageId}/${src}`;
@@ -164,8 +163,11 @@ var PageInfo = function PageInfo(props) {
         setIsHasData(!!res.data.detail);
         setDescribe(res.data.detail ? res.data.detail.pageDescribe : '');
         setId(res.data.detail ? res.data.detail.id : undefined);
-        setImgPath(res.data.detail && res.data.detail.imgUrl ? getImgUrl(res.data.detail.imgUrl, props.pageData.id) : undefined);
-        setImgUrl(res.data.detail ? res.data.detail.uuid : undefined);
+        setImgPath(res.data.detail && res.data.detail.zosImgUrl ? getImgUrl(res.data.detail.zosImgUrl, props.pageData.id) : undefined);
+        setImgUrl(res.data.detail ? {
+          uuid: res.data.detail.uuid,
+          zosFileKey: res.data.detail.zosFileKey
+        } : undefined);
         // getPointTree()
         setEventAttrList(res.data.eventInfos ? res.data.eventInfos.map(function (item, index) {
           return {
@@ -175,7 +177,7 @@ var PageInfo = function PageInfo(props) {
             describe: item.pointDescribe,
             pointSelect: item.pointSelect,
             pv: item.pv,
-            imgPath: item.imgUrl ? getImgUrl(item.imgUrl, props.pageData.id) : '',
+            imgPath: item.zosImgUrl ? getImgUrl(item.zosImgUrl, props.pageData.id) : '',
             key: uuid(),
             index: index,
             approvalStatus: item.approvalStatus,
@@ -539,8 +541,8 @@ var PageInfo = function PageInfo(props) {
     render: function render(imgPath1, record, index) {
       return /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-content-img-select")
-      }, imgPath1 || record.imgUrl ? (/*#__PURE__*/React.createElement(Image, {
-        src: imgPath1 || record.imgUrl,
+      }, imgPath1 || record.zosImgUrl ? (/*#__PURE__*/React.createElement(Image, {
+        src: imgPath1 || record.zosImgUrl,
         preview: {
           mask: (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
             type: "a-yanjingkai"

package/es/modules/pointMap/tree.js

@@ -242,6 +242,7 @@ var pointMap = function pointMap(props) {
           });
           getPointTree();
         } else if (selectedKeys && param.id === selectedKeys[0] && param.isDel) {
+          getPointTree();
           setSelectedKeys(undefined);
           props.onChangePage(undefined);
           props.refreshPage && props.refreshPage();

package/package.json

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