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

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'))

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.65",
+  "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": "dd0f9305428fbb1d2391e1ed4ca733ef420e5853",
+  "gitHead": "d8374986d034d8bc9129dc2b6be6598e7d3ff0f7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }