@zgfe/modules-dm 1.0.57-zhongyuan.64 → 1.0.57-zhongyuan.66

package/es/modules/clearRule/addRule.js

@@ -472,14 +472,14 @@ var AddRule = function AddRule(_ref) {
       viewDisabled: ruleRowView,
       id: o.uniqueId,
       editStatus: currentRuleDetail ? true : false
-    }), /*#__PURE__*/React.createElement("div", {
+    }), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
       style: {
         cursor: 'pointer'
       },
       onClick: function onClick() {
         return handleRuleDel(o.uniqueId);
       }
-    }, "X"));
+    }, "X")));
   }))), /*#__PURE__*/React.createElement(Space, null, !ruleRowView && options.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Button, {
       key: index,

package/es/modules/dataManage/collectionAttributeList.js

@@ -993,8 +993,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     removeAttrData = _useState34[0],
     setRemoveAttrData = _useState34[1];
   var saveRemoveAttrData = function saveRemoveAttrData(record) {
-    // 新加逻辑--在数据清洗自定义规则中绑定有此原事件不可删除。canDel:false 不允许删除
-    if (!record.canDel) {
+    // // 新加逻辑--在数据清洗自定义规则中绑定有此原事件不可删除。canDel:false 不允许删除
+    if (source == 'event' && !record.canUpdate) {
       UseModal({
         onOk: function onOk() {},
         okText: '确定',

package/es/modules/dataManage/collectionEventList.js

@@ -577,7 +577,8 @@ var CollectionEventList = function CollectionEventList(props) {
             request(apis.createExport, {
               method: 'get',
               params: {
-                demandId: values === null || values === void 0 ? void 0 : values.demandId
+                demandId: values === null || values === void 0 ? void 0 : values.demandId,
+                appId: getAppID(currentApp)
               },
               responseType: 'blob',
               fileName: "\u6D4B\u8BD5\u62A5\u544A_".concat(moment().format('YYYYMMDD'))
@@ -624,7 +625,8 @@ var CollectionEventList = function CollectionEventList(props) {
             request(apis.exportData, {
               method: 'get',
               params: {
-                demandId: values === null || values === void 0 ? void 0 : values.demandId
+                demandId: values === null || values === void 0 ? void 0 : values.demandId,
+                appId: getAppID(currentApp)
               },
               responseType: 'blob',
               fileName: "\u6570\u636E\u5305_".concat(moment().format('YYYYMMDD'))
@@ -633,17 +635,21 @@ var CollectionEventList = function CollectionEventList(props) {
               message: '生成数据包成功！'
             });
             setIsExportData(false);
-            _context2.next = 12;
+            // 清空需求id
+            formExport.setFieldsValue({
+              demandId: ''
+            });
+            _context2.next = 13;
             break;
-          case 9:
-            _context2.prev = 9;
+          case 10:
+            _context2.prev = 10;
             _context2.t0 = _context2["catch"](0);
             console.log(_context2.t0, '测试数据包失败');
-          case 12:
+          case 13:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 9]]);
+      }, _callee2, null, [[0, 10]]);
     }));
     return function submitExport() {
       return _ref2.apply(this, arguments);

package/es/modules/dataManage/components/tablePlus.js

@@ -1025,7 +1025,7 @@ var TablePlus = function TablePlus(props) {
           setPanelShow(true);
           setCurrentRow(record);
         }
-      }, ' ', panelCount || 0, ' ');
+      }, panelCount || 0);
     }
   }, {
     title: '创建时间',
@@ -1051,7 +1051,7 @@ var TablePlus = function TablePlus(props) {
         ellipsis: {
           tooltip: text
         }
-      }, text), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
+      }, text), record.groupId === undefined && (/*#__PURE__*/React.createElement(IconFont, {
         type: "bianji1",
         onClick: function onClick() {
           if (!authority[1000003]) {

package/es/modules/dataMap/component/leftTree.js

@@ -20,6 +20,7 @@ import { mapContext } from '../../CutsModal';
 import { ValuesList, BizGlobalDataContext } from '@zgfe/business-lib';
 import apis from '../../../constants/api';
 import request from '../../../utils/ajax';
+var DirectoryTree = Tree.DirectoryTree;
 var pageClassName = 'leftTreePage';
 var LeftTree = function LeftTree(props) {
   var _mapData$, _mapData$2;
@@ -232,16 +233,18 @@ var LeftTree = function LeftTree(props) {
     }
   }, /*#__PURE__*/React.createElement(Spin, {
     tip: "\u67E5\u8BE2\u4E2D"
-  }))) : (/*#__PURE__*/React.createElement(Tree, {
+  }))) : (/*#__PURE__*/React.createElement(DirectoryTree, {
     blockNode: true,
-    showLine: true,
+    // showLine={{showLeafIcon:false}}
+    showLine: false,
+    showIcon: false,
     switcherIcon: /*#__PURE__*/React.createElement(CaretDownOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
     }),
     autoExpandParent: true,
     selectedKeys: [(currentTree === null || currentTree === void 0 ? void 0 : currentTree.key) || ''],
-    defaultExpandedKeys: [(currentTree === null || currentTree === void 0 ? void 0 : currentTree.key) || ''],
+    multiple: true,
     onSelect: onSelect,
     fieldNames: {
       title: 'pageAttrName'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.64",
+  "version": "1.0.57-zhongyuan.66",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "fdf0720153c00cd11ce0af8b6a6d73efb57c114b",
+  "gitHead": "d8374986d034d8bc9129dc2b6be6598e7d3ff0f7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }