@zgfe/modules-dm 1.0.57-zhongyuan.15 → 1.0.57-zhongyuan.17

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

@@ -248,7 +248,7 @@ var ClearRule = function ClearRule() {
   };
   var handlePage = function handlePage(pagination) {
     setTableParams(pagination);
-    _getList(ruleSearchName);
+    _getList(ruleSearchName, pagination);
   };
   var _useState25 = useState({
       current: 1,
@@ -263,12 +263,13 @@ var ClearRule = function ClearRule() {
   }, []);
   var _getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var pagination = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : tableParams;
     request(apis.rule.getRuleList, {
       method: 'post',
       data: {
         ruleName: searchName,
-        pageNo: tableParams.current,
-        pageSize: tableParams.pageSize,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {

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);
         }
@@ -268,12 +268,13 @@ var FormulateRule = function FormulateRule() {
   }, []);
   var getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var pagination = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : tableParams;
     request(apis.clearRule.getList, {
       method: 'post',
       data: {
         ruleName: searchName,
-        pageNo: tableParams.current,
-        pageSize: tableParams.pageSize,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
@@ -294,13 +295,14 @@ var FormulateRule = function FormulateRule() {
   var searchChange = function searchChange(e) {
     var _value = e.currentTarget.value;
     setRuleSearchName(_value);
+    getList(_value);
   };
   var handleSearch = function handleSearch() {
     getList(ruleSearchName);
   };
   var handlePage = function handlePage(pagination) {
     setTableParams(pagination);
-    getList(ruleSearchName);
+    getList(ruleSearchName, pagination);
   };
   // 总状态
   var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.15",
+  "version": "1.0.57-zhongyuan.17",
   "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": "be3a68dfd5263d9e770933501924bdc6d717fddf",
+  "gitHead": "087369ef6a231814f24d9d6716c415a6e16a12d3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }