@zgfe/modules-dm 1.0.57-zhongyuan.55 → 1.0.57-zhongyuan.57

package/es/modules/clearRule/addRule.js

@@ -240,7 +240,7 @@ var AddRule = function AddRule(_ref) {
     setEvent(val === null || val === void 0 ? void 0 : val.event);
   };
   // 细分属性初始值
-  var _useState13 = useState(false),
+  var _useState13 = useState(true),
     _useState14 = _slicedToArray(_useState13, 2),
     hasEvent = _useState14[0],
     setHasEvent = _useState14[1];
@@ -250,7 +250,6 @@ var AddRule = function AddRule(_ref) {
     setBizAttributeSelectorValue = _useState16[1];
   // 细分属性
   var onChangeAttr = function onChangeAttr(attr) {
-    setHasEvent(false);
     if (attr === undefined) {
       // 删除细分属性
       setBizAttributeSelectorValue(undefined);
@@ -431,9 +430,9 @@ var AddRule = function AddRule(_ref) {
     value: 'eventProp'
   }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), ruleRowView && (/*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
     type: "link"
-  }, "\u4E8B\u4EF6\u5C5E\u6027\uFF1A", currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : (_currentRuleDetail$ve = currentRuleDetail.verifyObject) === null || _currentRuleDetail$ve === void 0 ? void 0 : _currentRuleDetail$ve.split('|||')[0]), /*#__PURE__*/React.createElement(Button, {
+  }, "\u4E8B\u4EF6\u540D\u79F0\uFF1A", currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : (_currentRuleDetail$ve = currentRuleDetail.verifyObject) === null || _currentRuleDetail$ve === void 0 ? void 0 : _currentRuleDetail$ve.split('|||')[0]), /*#__PURE__*/React.createElement(Button, {
     type: "link"
-  }, "\u7EC6\u5206\u5C5E\u6027\uFF1A", (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.name)))), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
+  }, "\u5C5E\u6027\u540D\u79F0\uFF1A", (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.name)))), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
     className: "selectVent"
   }, selectType == 'eventProp' && (/*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,

package/es/modules/clearRule/index.js

@@ -311,7 +311,8 @@ var ClearRule = function ClearRule() {
       current: 1,
       pageSize: 10,
       total: 0,
-      showQuickJumper: true
+      showQuickJumper: true,
+      showSizeChanger: true
     }),
     _useState32 = _slicedToArray(_useState31, 2),
     tableParams = _useState32[0],

package/es/modules/formulateRule/addFormulate.js

@@ -198,15 +198,17 @@ var AddFormulate = function AddFormulate(_ref) {
         // 回显
         if (detailData) {
           var _detailData$rinseObje2, _detailData$rinseShif;
+          var currentTargetObj = res.data.data.find(function (o) {
+            var _detailData$rinseObje;
+            return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
+          });
           ruleForm.setFieldsValue({
             name: detailData.ruleName,
             description: detailData === null || detailData === void 0 ? void 0 : detailData.ruleDescription,
-            target: res.data.data.find(function (o) {
-              var _detailData$rinseObje;
-              return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
-            }) ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
+            target: currentTargetObj ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
             ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
           });
+          currentTargetObj && setCurrentBizAttributeSelectorValue(JSON.parse(currentTargetObj === null || currentTargetObj === void 0 ? void 0 : currentTargetObj.extraMes));
           var arr = detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseShif = detailData.rinseShiftRuleDetails) === null || _detailData$rinseShif === void 0 ? void 0 : _detailData$rinseShif.map(function (o) {
             var _shuzhiArr$find2, _shuzhiArr$find3;
             return {

package/es/modules/formulateRule/index.js

@@ -272,7 +272,8 @@ var FormulateRule = function FormulateRule() {
       current: 1,
       pageSize: 10,
       total: 0,
-      showQuickJumper: true
+      showQuickJumper: true,
+      showSizeChanger: true
     }),
     _useState8 = _slicedToArray(_useState7, 2),
     tableParams = _useState8[0],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.55",
+  "version": "1.0.57-zhongyuan.57",
   "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": "536301f132b432e8a8814b07cddf610c9854e1b0",
+  "gitHead": "aafe5183c6743111fc15d932e7696d0a35bce045",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }