@zgfe/modules-dm 1.0.57-zhongyuan.16 → 1.0.57-zhongyuan.18

package/es/modules/clearRule/addRule.js

@@ -509,7 +509,7 @@ var TypeComponent = function TypeComponent(_ref2) {
           label: '字符串类型'
         }, {
           value: 2,
-          label: '数字类型'
+          label: '数值类型'
         }, {
           value: 3,
           label: '日期类型'

package/es/modules/clearRule/index.js

@@ -227,17 +227,53 @@ var ClearRule = function ClearRule() {
       fileName: "\u89C4\u5219\u5217\u8868_".concat(moment().format('YYYYMMDD'))
     }).then(function (res) {});
   };
+  // 总状态
+  var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
+    style: {
+      fontSize: 24
+    },
+    spin: true,
+    onPointerEnterCapture: undefined,
+    onPointerLeaveCapture: undefined
+  });
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    allOpenRule = _useState22[0],
+    setAllOpenRule = _useState22[1];
+  var _useState23 = useState(false),
+    _useState24 = _slicedToArray(_useState23, 2),
+    statusLoading = _useState24[0],
+    setStatusLoading = _useState24[1];
+  var handleAllOpenStatus = function handleAllOpenStatus(value) {
+    setStatusLoading(true);
+    request(apis.rule.allOpenStatus, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        status: value ? 1 : 0
+      }
+    }).then(function (res) {
+      if (!res) return;
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
+        setAllOpenRule(value);
+        _getList(ruleSearchName);
+      }
+    }).finally(function () {
+      setStatusLoading(false);
+    });
+  };
   /**
    * 规则列表， 搜索名称， 规则列表状态开启/关闭， 删除规则
    */
-  var _useState21 = useState([]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    ruleList = _useState22[0],
-    setRuleList = _useState22[1];
-  var _useState23 = useState(''),
-    _useState24 = _slicedToArray(_useState23, 2),
-    ruleSearchName = _useState24[0],
-    setRuleSearchName = _useState24[1];
+  var _useState25 = useState([]),
+    _useState26 = _slicedToArray(_useState25, 2),
+    ruleList = _useState26[0],
+    setRuleList = _useState26[1];
+  var _useState27 = useState(''),
+    _useState28 = _slicedToArray(_useState27, 2),
+    ruleSearchName = _useState28[0],
+    setRuleSearchName = _useState28[1];
   var searchChange = function searchChange(e) {
     var _value = e.currentTarget.value;
     setRuleSearchName(_value);
@@ -250,14 +286,14 @@ var ClearRule = function ClearRule() {
     setTableParams(pagination);
     _getList(ruleSearchName, pagination);
   };
-  var _useState25 = useState({
+  var _useState29 = useState({
       current: 1,
       pageSize: 10,
       total: 0
     }),
-    _useState26 = _slicedToArray(_useState25, 2),
-    tableParams = _useState26[0],
-    setTableParams = _useState26[1];
+    _useState30 = _slicedToArray(_useState29, 2),
+    tableParams = _useState30[0],
+    setTableParams = _useState30[1];
   useEffect(function () {
     _getList();
   }, []);
@@ -282,6 +318,7 @@ var ClearRule = function ClearRule() {
             total: res.data.total
           });
         });
+        setAllOpenRule(res.data.status == 1 ? true : false);
       } else {
         message.error('查询列表失败！');
       }
@@ -374,42 +411,6 @@ var ClearRule = function ClearRule() {
       }
     });
   };
-  // 总状态
-  var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
-    style: {
-      fontSize: 24
-    },
-    spin: true,
-    onPointerEnterCapture: undefined,
-    onPointerLeaveCapture: undefined
-  });
-  var _useState27 = useState(false),
-    _useState28 = _slicedToArray(_useState27, 2),
-    allOpenRule = _useState28[0],
-    setAllOpenRule = _useState28[1];
-  var _useState29 = useState(false),
-    _useState30 = _slicedToArray(_useState29, 2),
-    statusLoading = _useState30[0],
-    setStatusLoading = _useState30[1];
-  var handleAllOpenStatus = function handleAllOpenStatus(value) {
-    setStatusLoading(true);
-    request(apis.rule.allOpenStatus, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        status: value ? 1 : 0
-      }
-    }).then(function (res) {
-      if (!res) return;
-      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
-        setAllOpenRule(value);
-        _getList(ruleSearchName);
-      }
-    }).finally(function () {
-      setStatusLoading(false);
-    });
-  };
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(className)
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -139,7 +139,6 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     eventMoveShow = _useState8[0],
     setEventMoveShow = _useState8[1];
-  var eventMoveChangeId = -1;
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
     eventMoveOption = _useState10[0],
@@ -160,7 +159,6 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     if (data.length > 0) {
       setEventMoveShow(groupId);
       dmEventGroupId = groupId;
-      eventMoveChangeId = data.groupingOption[0].value;
       dmEventMoveChangeId = data.groupingOption[0].value;
     } else {
       setEventMoveShow(undefined);
@@ -197,7 +195,6 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     });
   };
   var moveContent = function moveContent() {
-    eventMoveChangeId = eventMoveOption[0].value || -1;
     return /*#__PURE__*/React.createElement("div", {
       className: "move-content"
     }, /*#__PURE__*/React.createElement("div", null, "\u5C06", eventMoveLength, "\u4E2A\u6307\u6807\u79FB\u52A8\u5230\u4EE5\u4E0B\u5206\u7EC4"), /*#__PURE__*/React.createElement("div", null, "\u9009\u62E9\u5206\u7EC4", ' ', /*#__PURE__*/React.createElement(Select, {
@@ -206,7 +203,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         width: 120
       },
       onChange: function onChange(id) {
-        eventMoveChangeId = id;
+        dmEventMoveChangeId = id;
       },
       options: eventMoveOption
     })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {

package/es/modules/formulateRule/index.js

@@ -72,16 +72,16 @@ var FormulateRule = function FormulateRule() {
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
         size: "middle"
-      }, /*#__PURE__*/React.createElement(Switch, {
+      }, authority[170928557425] && (/*#__PURE__*/React.createElement(Switch, {
         checked: record.status == 0 ? false : true,
         onChange: function onChange() {
           return handleOpenStatus(record);
         }
-      }), /*#__PURE__*/React.createElement("a", {
+      })), authority[170928557422] && (/*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           handleEdit(record.ruleId);
         }
-      }, "\u7F16\u8F91"), authority[170928557423] && /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91")), authority[170928557423] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return handleDetale(record.ruleId);
         }
@@ -104,7 +104,6 @@ var FormulateRule = function FormulateRule() {
         status: ruleObj.status ? 0 : 1
       }
     }).then(function (res) {
-      if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100001') {
         if (res.data.data == 1) {
           UseModal({
@@ -151,11 +150,13 @@ var FormulateRule = function FormulateRule() {
           });
           return;
         }
-      } else if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        return;
+      }
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         endOpen(ruleObj);
-      } else {
-        message.error(res.msg);
+        return;
       }
+      message.error(res.msg);
     });
   };
   var endOpen = function endOpen(ruleObj) {
@@ -166,7 +167,6 @@ var FormulateRule = function FormulateRule() {
         status: ruleObj.status ? 0 : 1
       }
     }).then(function (res) {
-      if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         message.success("".concat(ruleObj.status ? '关闭' : '开启', "\u6210\u529F\uFF01"));
         getList(ruleSearchName);
@@ -287,6 +287,7 @@ var FormulateRule = function FormulateRule() {
             total: res.data.total
           });
         });
+        setAllOpenRule(res.data.status == 1 ? true : false);
       } else {
         message.error('查询列表失败！');
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.16",
+  "version": "1.0.57-zhongyuan.18",
   "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": "ae5a4f3ac9e73ed587b1e684e9205131491f3afc",
+  "gitHead": "fe517a7f5a8a22179a9cb203fbc04ac34e347df3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }