@zgfe/modules-dm 1.0.35 → 1.0.37-sessopm.0

package/es/components/demo.js

@@ -16,7 +16,7 @@ var DemoWrapper2 = function DemoWrapper2(props) {
     }
   }, /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 318
+    defaultApp: 502306
   }, props.children)));
 };
 export default DemoWrapper2;

package/es/modules/dataCollection/components/createVirtualDrawer.js

@@ -23,6 +23,7 @@ import EventFilter from './eventFilter';
 import SelectAttributes from './selectAttributes';
 import _ from 'lodash';
 var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
+  var _formSubmitData$event;
   var classPrefix = 'create-virtual-drawer';
   var createVirtualShow = props.createVirtualShow,
     setCreateVirtualShow = props.setCreateVirtualShow,
@@ -267,7 +268,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     htmlType: "submit",
-    disabled: !formSubmit
+    disabled: !formSubmit || virtualDrawerType === 'edit' && (editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.isStop) === 1 && (formSubmitData === undefined || formSubmitData && ((_formSubmitData$event = formSubmitData.eventJson) === null || _formSubmitData$event === void 0 ? void 0 : _formSubmitData$event.length) <= 0)
   }, "\u4FDD\u5B58"))), /*#__PURE__*/React.createElement(SelectAttributes, {
     selectAttributesShow: selectAttributesShow,
     setSelectAttributesShow: setSelectAttributesShow,

package/es/modules/dataCollection/index.js

@@ -13,6 +13,7 @@ import { getAppID } from '../../utils';
 import EventList from './collectionEventList';
 import CollectionAttributeList from './collectionAttributeList';
 import VirtualEventList from './virtualEventList';
+import { SessionManage } from '@zgfe/modules-session';
 var DataCollection = function DataCollection(props) {
   var _props$extraTabs, _props$extraTabs2;
   var classPrefix = 'data-collection';
@@ -76,7 +77,9 @@ var DataCollection = function DataCollection(props) {
     value: 3
   }, "\u865A\u62DF\u4E8B\u4EF6"), authority[100021] && /*#__PURE__*/React.createElement(Radio.Button, {
     value: 2
-  }, "\u7528\u6237\u5C5E\u6027\u7BA1\u7406"), (_props$extraTabs = props.extraTabs) === null || _props$extraTabs === void 0 ? void 0 : _props$extraTabs.map(function (item) {
+  }, "\u7528\u6237\u5C5E\u6027\u7BA1\u7406"), authority[1701310624] && /*#__PURE__*/React.createElement(Radio.Button, {
+    value: "session"
+  }, "Session\u7BA1\u7406"), (_props$extraTabs = props.extraTabs) === null || _props$extraTabs === void 0 ? void 0 : _props$extraTabs.map(function (item) {
     return /*#__PURE__*/React.createElement(Radio.Button, {
       key: item.key,
       value: item.key,
@@ -89,7 +92,7 @@ var DataCollection = function DataCollection(props) {
     isOpen: isOpen,
     queryPlanData: queryPlanData,
     source: "user"
-  }), (_props$extraTabs2 = props.extraTabs) === null || _props$extraTabs2 === void 0 ? void 0 : _props$extraTabs2.map(function (item) {
+  }), listTab == 'session' && authority[1701310624] && /*#__PURE__*/React.createElement(SessionManage, null), (_props$extraTabs2 = props.extraTabs) === null || _props$extraTabs2 === void 0 ? void 0 : _props$extraTabs2.map(function (item) {
     return listTab === item.key ? /*#__PURE__*/React.createElement("div", {
       key: item.key
     }, item.children) : null;

package/es/utils/index.js

@@ -2,6 +2,7 @@
  * 虚拟事件编辑 判断内容是否有改动；有改动返回true
  */
 export var getVirtualContentChange = function getVirtualContentChange(oldData, newData) {
+  if (oldData.isStop === 1) return false;
   var eventJson = function eventJson(_old, _new) {
     var flag = 0;
     if (_old.length !== _new.length) {
@@ -70,7 +71,7 @@ export var getSubmitHandleData = function getSubmitHandleData(selectAttributes,
     if (eventAttr.hasOwnProperty(item.eventId)) {
       item.attrs = eventAttr[item.eventId];
     } else {
-      item.attrs = [""];
+      item.attrs = [''];
     }
   });
   return submitData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.35",
+  "version": "1.0.37-sessopm.0",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -40,18 +40,19 @@
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
     "@zgfe/business-lib": "1.2.3-heyh.1",
+    "@zgfe/modules-session": "1.0.1-alpha.1",
     "antd": "4.24.10",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",
-    "lerna": "^5.1.7",
+    "lerna": "^4.0.0",
     "lint-staged": "^10.0.7",
     "lodash": "^4.17.21",
     "prettier": "^2.2.1",
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "8c0daba1c89e4ca8484e9485f58e5f7e94a2c509",
+  "gitHead": "a549a9990b4acee97db13a3661109a46ad6f83ef",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }