@zgfe/modules-dm 1.0.57-zhongyuan.32 → 1.0.57-zhongyuan.34

package/es/modules/clearRule/addRule.js

@@ -20,6 +20,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import { BizEventSelector, BizAttributeSelector, BizGlobalDataContext } from '@zgfe/business-lib';
 import './css/index.less';
 import request from '../../utils/ajax';
+import { generateUniqueId } from '../../utils/index';
 import apis from '../../constants/api';
 var TextArea = Input.TextArea;
 var AddRule = function AddRule(_ref) {
@@ -61,7 +62,7 @@ var AddRule = function AddRule(_ref) {
     }, 300);
   };
   var onFinish = function onFinish(values) {
-    console.log('Success:', values);
+    console.log('Success:', values, optionsRule);
     if (currentRuleDetail) {
       // currentRuleDetail 有值为修改状态
       request(apis.rule.updateRule, {
@@ -170,25 +171,28 @@ var AddRule = function AddRule(_ref) {
     if (type === 3) {
       setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
         ruleType: type,
-        content: '(1,1)'
+        content: '(1,1)',
+        uniqueId: generateUniqueId()
       }]));
       return;
     }
     if (type === 1) {
       setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
         ruleType: type,
-        content: bizAttributeSelectorValue.type
+        content: bizAttributeSelectorValue.type,
+        uniqueId: generateUniqueId()
       }]));
       return;
     }
     setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
       ruleType: type,
-      content: undefined
+      content: undefined,
+      uniqueId: generateUniqueId()
     }]));
   };
-  var handleRuleDel = function handleRuleDel(index) {
+  var handleRuleDel = function handleRuleDel(uniqueId) {
     setOptionsRule(optionsRule.filter(function (o, i) {
-      return i !== index;
+      return o.uniqueId !== uniqueId;
     }));
   };
   // 校验对象的类型 eventProp：事件校验    user：用户校验
@@ -238,12 +242,12 @@ var AddRule = function AddRule(_ref) {
         value: _value
       }));
       // 初始化属性基础类型
-      var newArr = optionsRule.map(function (o) {
-        if (o.ruleType == 1) {
-          o.content = attr.type;
-        }
-      });
-      setOptionsRule(newArr);
+      // const newArr = optionsRule.map((o) => {
+      //   if (o.ruleType == 1) {
+      //     o.content = attr.type;
+      //   }
+      // });
+      // setOptionsRule(newArr);
       setOptions(attr.type != '3' ? [].concat(initOptions, [{
         label: '字典校验',
         value: 6
@@ -386,13 +390,14 @@ var AddRule = function AddRule(_ref) {
     }, /*#__PURE__*/React.createElement("div", null, (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || bizAttributeSelectorValue.name), /*#__PURE__*/React.createElement(TypeComponent, {
       type: o.ruleType,
       optionsValue: optionsRule,
+      id: o.uniqueId,
       editStatus: currentRuleDetail ? true : false
     }), /*#__PURE__*/React.createElement("div", {
       style: {
         cursor: 'pointer'
       },
       onClick: function onClick() {
-        return handleRuleDel(index);
+        return handleRuleDel(o.uniqueId);
       }
     }, "X"));
   }))), /*#__PURE__*/React.createElement(Space, null, options.map(function (item, index) {
@@ -422,9 +427,11 @@ function parseRange(str) {
   };
 }
 var TypeComponent = function TypeComponent(_ref2) {
+  var _optionsValue$find;
   var type = _ref2.type,
     optionsValue = _ref2.optionsValue,
-    editStatus = _ref2.editStatus;
+    editStatus = _ref2.editStatus,
+    id = _ref2.id;
   // type:1 string    2:正则   3：数字区间 4：枚举
   var Component = null;
   var _useContext2 = useContext(BizGlobalDataContext),
@@ -437,7 +444,7 @@ var TypeComponent = function TypeComponent(_ref2) {
   var handleEnumChange = function handleEnumChange(value) {
     setEnumValue(value);
     optionsValue.filter(function (r) {
-      return r.ruleType == type;
+      return r.uniqueId == id;
     })[0].content = value;
   };
   // 区间
@@ -485,9 +492,6 @@ var TypeComponent = function TypeComponent(_ref2) {
   useEffect(function () {
     if (editStatus) {
       var _optionsValue$filter, _optionsValue$filter$;
-      console.log(optionsValue, 'optionsValue', optionsValue.filter(function (o) {
-        return o.ruleType == 3;
-      }));
       if ((_optionsValue$filter = optionsValue.filter(function (o) {
         return o.ruleType == 3;
       })) === null || _optionsValue$filter === void 0 ? void 0 : (_optionsValue$filter$ = _optionsValue$filter[0]) === null || _optionsValue$filter$ === void 0 ? void 0 : _optionsValue$filter$.content) {
@@ -505,12 +509,16 @@ var TypeComponent = function TypeComponent(_ref2) {
       getDictList();
     }
   }, []);
+  var _useState27 = useState((_optionsValue$find = optionsValue.find(function (o) {
+      return o.uniqueId == id;
+    })) === null || _optionsValue$find === void 0 ? void 0 : _optionsValue$find.content),
+    _useState28 = _slicedToArray(_useState27, 2),
+    typeValue = _useState28[0],
+    setTypeValue = _useState28[1];
   switch (type) {
     case 1:
       Component = /*#__PURE__*/React.createElement(Select, {
-        value: Number(optionsValue.filter(function (r) {
-          return r.ruleType == type;
-        })[0].content),
+        value: Number(typeValue),
         // disabled={true}
         options: [{
           value: 1,
@@ -523,8 +531,9 @@ var TypeComponent = function TypeComponent(_ref2) {
           label: '日期类型'
         }],
         onChange: function onChange(value) {
+          setTypeValue(value);
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = value;
         }
       });
@@ -533,11 +542,11 @@ var TypeComponent = function TypeComponent(_ref2) {
       Component = /*#__PURE__*/React.createElement(Input, {
         placeholder: "\u8BF7\u8F93\u5165\u6B63\u5219\u8868\u5355\u5F0F",
         value: optionsValue.filter(function (r) {
-          return r.ruleType == type;
+          return r.uniqueId == id;
         })[0].content,
         onChange: function onChange(event) {
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = event.target.value;
         }
       });
@@ -554,7 +563,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         onClick: function onClick() {
           setIncludedMinState(function (pre) {
             optionsValue.filter(function (r) {
-              return r.ruleType == type;
+              return r.uniqueId == id;
             })[0].content = "".concat(!includedMinState ? '[' : '(').concat(minNum, ",").concat(maxNum).concat(includedMaxState ? ']' : ')');
             return !pre;
           });
@@ -566,7 +575,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         onChange: function onChange(value) {
           setMinNum(value);
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = "".concat(includedMinState ? '[' : '(').concat(value, ",").concat(maxNum).concat(includedMaxState ? ']' : ')');
         }
       }), "-", /*#__PURE__*/React.createElement(InputNumber, {
@@ -576,7 +585,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         onChange: function onChange(value) {
           setMaxNum(value);
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = "".concat(includedMinState ? '[' : '(').concat(minNum, ",").concat(value).concat(includedMaxState ? ']' : ')');
         }
       }), /*#__PURE__*/React.createElement(Tooltip, {
@@ -588,7 +597,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         onClick: function onClick() {
           setIncludedMaxState(function (pre) {
             optionsValue.filter(function (r) {
-              return r.ruleType == type;
+              return r.uniqueId == id;
             })[0].content = "".concat(includedMinState ? '[' : '(').concat(minNum, ",").concat(maxNum).concat(!includedMaxState ? ']' : ')');
             return !pre;
           });
@@ -603,7 +612,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         },
         placeholder: "\u8BF7\u8F93\u5165",
         value: optionsValue.filter(function (r) {
-          return r.ruleType == type;
+          return r.uniqueId == id;
         })[0].content,
         onChange: handleEnumChange,
         options: optionsEnum
@@ -612,14 +621,14 @@ var TypeComponent = function TypeComponent(_ref2) {
     case 6:
       Component = /*#__PURE__*/React.createElement(Select, {
         defaultValue: Number(optionsValue.filter(function (r) {
-          return r.ruleType == type;
+          return r.uniqueId == id;
         })[0].content),
         // value={optionsValue.filter((r) => r.ruleType == type)[0].content}
         placeholder: "\u9009\u62E9\u5B57\u5178\u89C4\u5219",
         options: dictList,
         onChange: function onChange(value) {
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = value;
         }
       });

package/es/modules/clearRule/index.js

@@ -27,7 +27,8 @@ var className = 'clearRule';
 var ClearRule = function ClearRule() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var columns = [{
     title: '规则名',
     dataIndex: 'ruleName',
@@ -430,7 +431,7 @@ var ClearRule = function ClearRule() {
   }, /*#__PURE__*/React.createElement(Switch, {
     checked: allOpenRule,
     onChange: handleAllOpenStatus
-  }))), authority[170928557418] && (/*#__PURE__*/React.createElement(Button, {
+  }))), authority[170928557418] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DiffOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -438,7 +439,7 @@ var ClearRule = function ClearRule() {
     onClick: function onClick() {
       return setIsModalOpen(true);
     }
-  }, "\u751F\u6210\u62A5\u544A")), authority[170928557417] && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u751F\u6210\u62A5\u544A")), authority[170928557417] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DownloadOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -448,7 +449,7 @@ var ClearRule = function ClearRule() {
     type: "primary",
     onClick: handleAddRule,
     disabled: !authority[170928557411]
-  }, "\u65B0\u5EFA\u89C4\u5219"), authority[170928557415] && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u65B0\u5EFA\u89C4\u5219"), authority[170928557415] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       return setOpenImportModal(true);

package/es/modules/dataManage/collectionAttributeList.js

@@ -34,7 +34,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     isDemo = _useContext.isDemo,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var isOpen = props.isOpen,
     queryPlanData = props.queryPlanData,
     source = props.source,
@@ -1171,14 +1172,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     onClick: function onClick() {
       return setCreateAttrShow(true);
     }
-  }, "\u521B\u5EFA\u5C5E\u6027"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u521B\u5EFA\u5C5E\u6027"), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     shape: "round",
     className: "button",
     disabled: isDemo || !authority[1722838544],
     onClick: function onClick() {
       return setOpenImportModal(true);
     }
-  }, "\u5BFC\u5165\u5C5E\u6027")))), /*#__PURE__*/React.createElement(Table, {
+  }, "\u5BFC\u5165\u5C5E\u6027"))))), /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
     id: 'dataManageAttrTable',

package/es/modules/dataManage/collectionEventList.js

@@ -37,7 +37,8 @@ var CollectionEventList = function CollectionEventList(props) {
     currentApp = _useContext.currentApp,
     authority = _useContext.authority,
     route = _useContext.route,
-    isDemo = _useContext.isDemo;
+    isDemo = _useContext.isDemo,
+    showProdDownload = _useContext.showProdDownload;
   var _useContext2 = useContext(DmContext),
     state = _useContext2.state;
   var _useState = useState(0),
@@ -474,7 +475,7 @@ var CollectionEventList = function CollectionEventList(props) {
     }), /*#__PURE__*/React.createElement("span", null, "\u4E8B\u4EF6\u5206\u7EC4\u7BA1\u7406")))
   }, {
     key: '3',
-    disabled: isDemo || !authority[1722837260],
+    disabled: (isDemo || !authority[1722837260]) && !showProdDownload,
     label: (/*#__PURE__*/React.createElement("a", {
       className: "".concat(classPrefix, "-downItems"),
       onClick: function onClick() {
@@ -487,7 +488,7 @@ var CollectionEventList = function CollectionEventList(props) {
     }), " ", /*#__PURE__*/React.createElement("span", null, "\u5BFC\u5165\u4E8B\u4EF6")))
   }, {
     key: '4',
-    disabled: isDemo || !authority[1722837261],
+    disabled: (isDemo || !authority[1722837261]) && !showProdDownload,
     label: (/*#__PURE__*/React.createElement("a", {
       className: "".concat(classPrefix, "-downItems"),
       onClick: exportEvent
@@ -510,6 +511,7 @@ var CollectionEventList = function CollectionEventList(props) {
     }), ' ', /*#__PURE__*/React.createElement("span", null, "\u5F00\u53D1\u7BA1\u7406")))
   }, {
     key: '6',
+    disabled: !showProdDownload,
     label: (/*#__PURE__*/React.createElement("a", {
       className: "".concat(classPrefix, "-downItems"),
       onClick: function onClick() {
@@ -522,6 +524,7 @@ var CollectionEventList = function CollectionEventList(props) {
     }), ' ', /*#__PURE__*/React.createElement("span", null, "\u751F\u6210\u6D4B\u8BD5\u62A5\u544A")))
   }, {
     key: '7',
+    disabled: !showProdDownload,
     label: (/*#__PURE__*/React.createElement("a", {
       className: "".concat(classPrefix, "-downItems"),
       onClick: function onClick() {

package/es/modules/dataPlan/addPlan.js

@@ -27,7 +27,8 @@ var AddPlan = function AddPlan(props) {
   var classPrefix = 'add-plan';
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
-    isDemo = _useContext.isDemo;
+    isDemo = _useContext.isDemo,
+    showProdDownload = _useContext.showProdDownload;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     spinning = _useState2[0],
@@ -636,7 +637,7 @@ var AddPlan = function AddPlan(props) {
     value: "0"
   }, "\u6240\u6709\u884C"), /*#__PURE__*/React.createElement(Option, {
     value: "1"
-  }, "\u5F53\u524D\u884C"))), /*#__PURE__*/React.createElement(Button, {
+  }, "\u5F53\u524D\u884C"))), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     loading: downloadingPlanTemp,
     onClick: function onClick() {
       setDownloadingPlanTemp(true);
@@ -654,11 +655,11 @@ var AddPlan = function AddPlan(props) {
     }
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "xiazai1"
-  }), "\u4E0B\u8F7D\u6A21\u677F"), /*#__PURE__*/React.createElement(Upload, _objectSpread({}, uploadProps), /*#__PURE__*/React.createElement(Button, {
+  }), "\u4E0B\u8F7D\u6A21\u677F")), showProdDownload && (/*#__PURE__*/React.createElement(Upload, _objectSpread({}, uploadProps), /*#__PURE__*/React.createElement(Button, {
     disabled: isDemo
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "daochu"
-  }), "\u6587\u4EF6\u4E0A\u4F20")))), /*#__PURE__*/React.createElement(Search, {
+  }), "\u6587\u4EF6\u4E0A\u4F20"))))), /*#__PURE__*/React.createElement(Search, {
     type: listTab == '1' ? 'event' : 'user',
     total: searchTotal,
     searchData: searchData,

package/es/modules/formulateRule/index.js

@@ -26,7 +26,8 @@ var className = 'formulateRule';
 var FormulateRule = function FormulateRule() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var columns = [{
     title: '任务名',
     dataIndex: 'ruleName',
@@ -391,7 +392,7 @@ var FormulateRule = function FormulateRule() {
   }, /*#__PURE__*/React.createElement(Switch, {
     checked: allOpenRule,
     onChange: handleAllOpenStatus
-  }))), authority[170928557426] && (/*#__PURE__*/React.createElement(Button, {
+  }))), authority[170928557426] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DiffOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined

package/es/utils/index.d.ts

@@ -1,3 +1,5 @@
+/**随机id */
+export declare const generateUniqueId: () => string;
 /**
  * 虚拟事件编辑 判断内容是否有改动；有改动返回true
  */

package/es/utils/index.js

@@ -1,3 +1,12 @@
+/**随机id */
+export var generateUniqueId = function generateUniqueId() {
+  // 时间戳（毫秒级，确保随时间递增）
+  var timestamp = Date.now().toString(36); // 转为36进制，缩短长度
+  // 随机数（36进制，6位，约100万种可能）
+  var random = Math.random().toString(36).substring(2, 8);
+  // 拼接为唯一ID（如："1h8z5a-xyz789"）
+  return "".concat(timestamp, "-").concat(random);
+};
 /**
  * 虚拟事件编辑 判断内容是否有改动；有改动返回true
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.32",
+  "version": "1.0.57-zhongyuan.34",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -46,7 +46,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.1",
+    "@zgfe/business-lib": "1.2.70-hxd.31",
     "antd": "4.24.10",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d2142aab2ab62aa1975346e1a7b6211ba0f360b7",
+  "gitHead": "13acec8ea76fa8e9ce7f1b9384ac66e9fa4304ba",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }