@zgfe/modules-settings 2.1.0-zhongyuan-set.2 → 2.1.0-zhongyuan-set.5

package/es/modules/demandManage/index.js

@@ -287,6 +287,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }, "\u67E5\u770B"), /*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
+      disabled: props.record.demandStatus == 102,
       onClick: function onClick() {
         Modal.confirm({
           wrapClassName: "".concat(classPrefix, "-confirm"),
@@ -319,7 +320,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           }
         });
       }
-    }, "\u590D\u5236"), [101, 102].indexOf(props.record.demandStatus) == -1 && (/*#__PURE__*/React.createElement(Button, {
+    }, "\u590D\u5236"), [101, 102, 103].indexOf(props.record.demandStatus) == -1 && (/*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
       onClick: function onClick() {

package/es/modules/pointMap/createMetaDrawer.js

@@ -131,35 +131,21 @@ var CreateMeta = function CreateMeta(props) {
             resultArr = [];
             newArr = findDuplicateObjects(eventAttrList);
             if (!(newArr.length >= 1)) {
-              _context.next = 18;
+              _context.next = 16;
               break;
             }
             notification.warning({
               message: '有事件属性名称相同'
             });
-            resultArr = eventAttrList.map(function (j) {
-              if (newArr.find(function (k) {
-                return j.name || j.attr_name == k;
-              })) {
-                return _objectSpread(_objectSpread({}, j), {}, {
-                  status: 'error'
-                });
-              }
-              return j;
-            });
-            setEventAttrList(resultArr);
+            // resultArr = eventAttrList.map((j) => {
+            //   if (newArr.find((k) => j.name == k)) {
+            //     return { ...j, status: 'error' };
+            //   }
+            //   return j;
+            // });
+            // setEventAttrList(resultArr);
             return _context.abrupt("return");
-          case 18:
-            if (newArr.length == 0) {
-              resultArr = eventAttrList.map(function (o) {
-                return _objectSpread(_objectSpread({}, o), {}, {
-                  status: undefined
-                });
-              });
-              setEventAttrList(function () {
-                return _toConsumableArray(resultArr);
-              });
-            }
+          case 16:
             //把参数传递给主页面
             if (props.onSubmit) {
               props.onSubmit({
@@ -177,17 +163,17 @@ var CreateMeta = function CreateMeta(props) {
                 eventAttrList: eventAttrList
               }, props.data ? 'update' : 'create');
             }
-            _context.next = 25;
+            _context.next = 22;
             break;
-          case 22:
-            _context.prev = 22;
+          case 19:
+            _context.prev = 19;
             _context.t0 = _context["catch"](1);
             console.log('表单验证失败:', _context.t0);
-          case 25:
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 22]]);
+      }, _callee, null, [[1, 19]]);
     }));
     return function submit() {
       return _ref.apply(this, arguments);
@@ -356,6 +342,7 @@ var CreateMeta = function CreateMeta(props) {
         disabled: homeType == 'get',
         onChange: function onChange(e) {
           setIsChange(true);
+          changeItemInfo(index, 'prop_type', e);
           changeItemInfo(index, 'type', e);
         },
         options: [{
@@ -431,6 +418,7 @@ var CreateMeta = function CreateMeta(props) {
         disabled: homeType == 'get',
         onChange: function onChange(e) {
           setIsChange(true);
+          changeItemInfo(index, 'encryption_type', e);
           changeItemInfo(index, 'encryptionType', e);
         },
         options: [{

package/es/modules/pointMap/index.js

@@ -92,7 +92,9 @@ var pointMap = function pointMap(props) {
     pageStatusIsEdit: pageStatusIsEdit,
     onChangePage: function onChangePage(data) {
       setPageData(data);
-      props.setTreeData && props.setTreeData(data.treeName + '_点击'); // 树选择发生变化元事件名称一起变化
+      if (data) {
+        props.setTreeData && props.setTreeData(data.treeName + '_点击'); // 树选择发生变化元事件名称一起变化
+      }
     },
     refreshPage: function refreshPage() {
       return setKey(new Date().getTime());

package/es/modules/pointMap/tree.js

@@ -45,6 +45,7 @@ var formatTreeData = function formatTreeData(list, storey) {
     }
     return listTemp;
   }
+  return [];
 };
 var formatTreeArr = function formatTreeArr(list, arrTemp, parentName) {
   var listTemp = JSON.parse(JSON.stringify(list));
@@ -73,6 +74,7 @@ var formatTreeArr = function formatTreeArr(list, arrTemp, parentName) {
     }
     return arrTemp;
   }
+  return [];
 };
 var pageNum = 1;
 var pointMap = function pointMap(props) {
@@ -203,7 +205,7 @@ var pointMap = function pointMap(props) {
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
-        pageNum = ((res === null || res === void 0 ? void 0 : res.data.length) || 0) + 1;
+        pageNum = (res.data ? res.data.length : 0) + 1;
         setTreeData(formatTreeData((res === null || res === void 0 ? void 0 : res.data) || []));
         setTreeArr(formatTreeArr((res === null || res === void 0 ? void 0 : res.data) || [], [], '') || []);
         if (!selectedKeys) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan-set.2",
+  "version": "2.1.0-zhongyuan-set.5",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fad8f4db780d0a3e86a320836033e70809bebbc1",
+  "gitHead": "85210d4143066bddf90309d5798b2f205bf80ede",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }