@zgfe/modules-dm 1.0.57-zhongyuan.2 → 1.0.57-zhongyuan.21

package/es/modules/dataManage/types.d.ts

@@ -84,3 +84,7 @@ export interface CreateMetaDrawerProps {
 }
 export interface DevelopModelProps {
 }
+export interface eventTag {
+    label: string;
+    value: number;
+}

package/es/modules/formulateRule/addFormulate.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 interface Result {
     appId: number;
     isDelete: number;

package/es/modules/formulateRule/addFormulate.js

@@ -12,7 +12,7 @@ import { Drawer, Input, Button, Space, Form, Table, Select, message } from 'antd
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import React, { useState, useEffect, useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 import AddRule from './addRule';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
@@ -169,6 +169,31 @@ var AddFormulate = function AddFormulate(_ref) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         setRuleList(res.data.data);
+        // 回显
+        if (detailData) {
+          var _detailData$rinseObje2, _detailData$rinseShif;
+          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,
+            ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
+          });
+          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) {
+            return {
+              currentType: o.ruleType,
+              currentTypeName: typeArr.filter(function (j) {
+                return j.value == o.ruleType;
+              })[0].label,
+              sourceValue: o.ruleType == 5 ? '' : o.sourceValue,
+              targetValue: o.targetValue,
+              key: o.id
+            };
+          });
+          setDataSoure(arr || []);
+        }
       }
     });
   };
@@ -196,29 +221,6 @@ var AddFormulate = function AddFormulate(_ref) {
       });
     }
   };
-  // 回显
-  useEffect(function () {
-    if (detailData) {
-      ruleForm.setFieldsValue({
-        name: detailData.ruleName,
-        description: detailData.ruleDescription,
-        target: detailData.rinseObjects[0],
-        ruleArr: detailData.rinseShiftRuleDetails
-      });
-      var arr = detailData.rinseShiftRuleDetails.map(function (o) {
-        return {
-          currentType: o.ruleType,
-          currentTypeName: typeArr.filter(function (j) {
-            return j.value == o.ruleType;
-          })[0].label,
-          sourceValue: o.ruleType == 5 ? '' : o.sourceValue,
-          targetValue: o.targetValue,
-          key: o.id
-        };
-      });
-      setDataSoure(arr);
-    }
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "addRule"
   }, /*#__PURE__*/React.createElement(Drawer, {

package/es/modules/formulateRule/addRule.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 interface TypeRule {
     key: string;
     currentType: number;

package/es/modules/formulateRule/addRule.js

@@ -17,7 +17,7 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { Drawer, Input, Button, Space, Form, Table, Select } from 'antd';
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import React, { useEffect, useState } from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 import { typeArr, dateArr, tianchongArr, shuzhiArr } from './data';
 var AddRule = function AddRule(_ref) {
   var addruleShow = _ref.addruleShow,

package/es/modules/formulateRule/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 declare const FormulateRule: React.FC;
 export default FormulateRule;

package/es/modules/formulateRule/index.js

@@ -18,7 +18,7 @@ import UseModal from '../CutsModal';
 import AddFormulate from './addFormulate';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 import moment from 'moment';
 var Text = Typography.Text;
 var RangePicker = DatePicker.RangePicker;
@@ -72,12 +72,12 @@ 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);
         }
-      }), authority[170928557422] && (/*#__PURE__*/React.createElement("a", {
+      })), authority[170928557422] && (/*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           handleEdit(record.ruleId);
         }
@@ -96,7 +96,7 @@ var FormulateRule = function FormulateRule() {
     openAddDraw = _useState2[0],
     setOpenAddDraw = _useState2[1];
   var handleOpenStatus = function handleOpenStatus(ruleObj) {
-    request(apis.clearRule.checkStatis, {
+    request(apis.clearRule.checkStatus, {
       method: 'post',
       data: {
         ruleId: ruleObj.ruleId,
@@ -104,13 +104,11 @@ 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') {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100001') {
         if (res.data.data == 1) {
           UseModal({
             onOk: function onOk() {
-              setDetailData(ruleObj);
-              setOpenAddDraw(true);
+              getDetail(ruleObj.ruleId);
             },
             okText: '去修改',
             title: '自定义校验规则已删除',
@@ -152,8 +150,13 @@ var FormulateRule = function FormulateRule() {
           });
           return;
         }
+        return;
+      }
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         endOpen(ruleObj);
+        return;
       }
+      message.error(res.msg);
     });
   };
   var endOpen = function endOpen(ruleObj) {
@@ -164,10 +167,11 @@ 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);
+      } else {
+        message.error(res.msg);
       }
     });
   };
@@ -182,14 +186,18 @@ var FormulateRule = function FormulateRule() {
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         if (res.data == 1) {
           UseModal({
-            onOk: function onOk() {},
-            okText: '确定',
+            onOk: function onOk() {
+              getDetail(ruleId);
+            },
+            okText: '去修改',
             title: '校验对象已被删除',
             content: "\u6821\u9A8C\u5BF9\u8C61\u5DF2\u88AB\u5220\u9664\uFF0C\u5C06\u4E0D\u4F1A\u8FDB\u884C\u4F7F\u7528\uFF0C\u8BF7\u8FDB\u884C\u4FEE\u6539"
           });
           return;
         }
         getDetail(ruleId);
+      } else {
+        message.error(res.msg);
       }
     });
   };
@@ -260,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) {
@@ -278,6 +287,7 @@ var FormulateRule = function FormulateRule() {
             total: res.data.total
           });
         });
+        setAllOpenRule(res.data.status == 1 ? true : false);
       } else {
         message.error('查询列表失败！');
       }
@@ -286,13 +296,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, {
@@ -325,6 +336,8 @@ var FormulateRule = function FormulateRule() {
         message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
         setAllOpenRule(value);
         getList(ruleSearchName);
+      } else {
+        message.error(res.msg);
       }
     }).finally(function () {
       setStatusLoading(false);
@@ -378,7 +391,7 @@ var FormulateRule = function FormulateRule() {
   }, /*#__PURE__*/React.createElement(Switch, {
     checked: allOpenRule,
     onChange: handleAllOpenStatus
-  }))), /*#__PURE__*/React.createElement(Button, {
+  }))), authority[170928557426] && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DiffOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -386,7 +399,7 @@ var FormulateRule = function FormulateRule() {
     onClick: function onClick() {
       return setIsModalOpen(true);
     }
-  }, "\u751F\u6210\u62A5\u544A"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u751F\u6210\u62A5\u544A")), /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.2",
+  "version": "1.0.57-zhongyuan.21",
   "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": "4cd164cffdc1b9cf867e4dba929d3d8433bd16c2",
+  "gitHead": "56c5481dfd276b587d3d9c9c43d95e9306b42186",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }