@zgfe/modules-dm 1.0.57-zhongyuan.8 → 1.0.57-zhongyuan.80

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/dataMap/component/drawerAdd.js

@@ -33,7 +33,8 @@ var DrawerAdd = function DrawerAdd(props) {
     name: ''
   };
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    envs = _useContext.envs;
   // 关闭抽屉并重置表单
   useEffect(function () {
     setIsOpen(props.open);
@@ -304,7 +305,7 @@ var DrawerAdd = function DrawerAdd(props) {
     eventIdList: [event.id],
     onChange: onChangeFilters,
     onConditionsCount: setCount
-  }), count < 10 ? (/*#__PURE__*/React.createElement(Link, {
+  }), count < ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 10) ? (/*#__PURE__*/React.createElement(Link, {
     target: "_blank",
     onClick: function onClick() {
       return onAdd();

package/es/modules/dataMap/component/leftTree.js

@@ -20,6 +20,7 @@ import { mapContext } from '../../CutsModal';
 import { ValuesList, BizGlobalDataContext } from '@zgfe/business-lib';
 import apis from '../../../constants/api';
 import request from '../../../utils/ajax';
+var DirectoryTree = Tree.DirectoryTree;
 var pageClassName = 'leftTreePage';
 var LeftTree = function LeftTree(props) {
   var _mapData$, _mapData$2;
@@ -190,7 +191,7 @@ var LeftTree = function LeftTree(props) {
     }), "\u57CB\u70B9\u5730\u56FE")
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
     placeholder: "\u8BF7\u9009\u62E9\u5730\u56FE",
-    allowClear: true,
+    // allowClear
     value: currentMap.id,
     fieldNames: {
       label: 'mapName',
@@ -232,17 +233,18 @@ var LeftTree = function LeftTree(props) {
     }
   }, /*#__PURE__*/React.createElement(Spin, {
     tip: "\u67E5\u8BE2\u4E2D"
-  }))) : (/*#__PURE__*/React.createElement(Tree, {
+  }))) : (/*#__PURE__*/React.createElement(DirectoryTree, {
     blockNode: true,
-    showLine: true,
+    // showLine={{showLeafIcon:false}}
+    showLine: false,
+    showIcon: false,
     switcherIcon: /*#__PURE__*/React.createElement(CaretDownOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
     }),
     autoExpandParent: true,
     selectedKeys: [(currentTree === null || currentTree === void 0 ? void 0 : currentTree.key) || ''],
-    expandedKeys: [(currentTree === null || currentTree === void 0 ? void 0 : currentTree.key) || ''],
-    defaultExpandedKeys: [(currentTree === null || currentTree === void 0 ? void 0 : currentTree.key) || ''],
+    multiple: true,
     onSelect: onSelect,
     fieldNames: {
       title: 'pageAttrName'

package/es/modules/dataMap/component/rightDetail.js

@@ -21,6 +21,7 @@ import { Card, Form, Input, Upload, message, Table, Button, Space, Empty, Spin }
 import { LoadingOutlined, PlusOutlined, SlidersTwoTone } from '@ant-design/icons';
 import React, { useState, useContext, useEffect } from 'react';
 import { IconFont, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
+import { fetchEventAttrs } from '@zgfe/business-lib/es/utils/eventApi';
 import apis from '../../../constants/api';
 import request from '../../../utils/ajax';
 import { guid } from '../../../utils/index';
@@ -264,7 +265,7 @@ var RightDetail = function RightDetail(props) {
   }();
   var handleButtonPage = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(flag) {
-      var filterJsonList, obj, xifenList, attrFilterJsonList, modulePageJsonList, _eventNameMap$current, _eventNameMap$current2, _eventNameMap$current3, _eventNameMap$current4, moduleAttrObj, pageAttrObj, _obj, obj1, allFilterObj, globalDimensionsList, resultParams;
+      var filterJsonList, obj, xifenList, attrFilterJsonList, modulePageJsonList, _attrListApi$filter, _attrListApi$filter2, attrListApi, moduleAttrObj, pageAttrObj, _obj, obj1, allFilterObj, globalDimensionsList, resultParams;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -300,55 +301,65 @@ var RightDetail = function RightDetail(props) {
             });
             // page module 的值拼接
             modulePageJsonList = [];
-            if (eventNameMap && (currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName)) {
-              moduleAttrObj = (_eventNameMap$current = eventNameMap[currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName]) === null || _eventNameMap$current === void 0 ? void 0 : (_eventNameMap$current2 = _eventNameMap$current.attrList.filter(function (o) {
-                return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.moduleAttrName);
-              })) === null || _eventNameMap$current2 === void 0 ? void 0 : _eventNameMap$current2[0];
-              pageAttrObj = (_eventNameMap$current3 = eventNameMap[currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName]) === null || _eventNameMap$current3 === void 0 ? void 0 : (_eventNameMap$current4 = _eventNameMap$current3.attrList.filter(function (o) {
-                return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.pageAttrName);
-              })) === null || _eventNameMap$current4 === void 0 ? void 0 : _eventNameMap$current4[0];
-              if (moduleAttrObj) {
-                _obj = {
-                  attrId: moduleAttrObj.id,
-                  attrName: moduleAttrObj.label,
-                  dimensionSub: moduleAttrObj.dimensionSub,
-                  label: moduleAttrObj.label,
-                  operator: 'equal',
-                  propCategory: 'eventProp',
-                  type: moduleAttrObj.type,
-                  values: moduleAttrObj === null || moduleAttrObj === void 0 ? void 0 : moduleAttrObj.values
-                };
-                modulePageJsonList.push(_obj);
-              }
-              if (pageAttrObj) {
-                obj1 = {
-                  attrId: pageAttrObj.id,
-                  attrName: pageAttrObj.label,
-                  dimensionSub: pageAttrObj.dimensionSub,
-                  label: pageAttrObj.label,
-                  operator: 'equal',
-                  propCategory: 'eventProp',
-                  type: pageAttrObj.type,
-                  values: pageAttrObj === null || pageAttrObj === void 0 ? void 0 : pageAttrObj.values
-                };
-                modulePageJsonList.push(obj1);
-              }
+            if (!(eventNameMap && (currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName))) {
+              _context3.next = 14;
+              break;
             }
+            _context3.next = 9;
+            return fetchEventAttrs(currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+          case 9:
+            attrListApi = _context3.sent;
+            // 事件下的细分
+            moduleAttrObj = (_attrListApi$filter = attrListApi.filter(function (o) {
+              return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.moduleAttrName);
+            })) === null || _attrListApi$filter === void 0 ? void 0 : _attrListApi$filter[0];
+            pageAttrObj = (_attrListApi$filter2 = attrListApi.filter(function (o) {
+              return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.pageAttrName);
+            })) === null || _attrListApi$filter2 === void 0 ? void 0 : _attrListApi$filter2[0];
+            if (moduleAttrObj) {
+              _obj = {
+                attrId: moduleAttrObj.id,
+                attrName: moduleAttrObj.label,
+                dimensionSub: moduleAttrObj.dimensionSub,
+                label: moduleAttrObj.label,
+                operator: 'equal',
+                propCategory: 'eventProp',
+                type: moduleAttrObj.type,
+                values: [currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.moduleAttrName]
+              };
+              modulePageJsonList.push(_obj);
+            }
+            if (pageAttrObj) {
+              obj1 = {
+                attrId: pageAttrObj.id,
+                attrName: pageAttrObj.label,
+                dimensionSub: pageAttrObj.dimensionSub,
+                label: pageAttrObj.label,
+                operator: 'equal',
+                propCategory: 'eventProp',
+                type: pageAttrObj.type,
+                values: [currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.pageAttrName]
+              };
+              modulePageJsonList.push(obj1);
+            }
+          case 14:
             allFilterObj = {
               relation: 'and',
               conditions: [].concat(_toConsumableArray(filterJsonList), attrFilterJsonList, modulePageJsonList)
             }; // console.log(allFilterObj, 'allFilterObj');
             // 细分的 属性值
             globalDimensionsList = [];
-            xifenList.forEach(function (o) {
-              var obj = {
-                propCategory: o.inquire.propCategory,
-                type: o.inquire.type,
-                attrId: o.inquire.id,
-                attrName: o.inquire.label
-              };
-              globalDimensionsList.push(obj);
-            });
+            if (xifenList) {
+              xifenList.forEach(function (o) {
+                var obj = {
+                  propCategory: o.inquire.propCategory,
+                  type: o.inquire.type,
+                  attrId: o.inquire.id,
+                  attrName: o.inquire.label
+                };
+                globalDimensionsList.push(obj);
+              });
+            }
             resultParams = {
               data: {
                 chartType: 'line',
@@ -376,7 +387,7 @@ var RightDetail = function RightDetail(props) {
                 }
               });
             });
-          case 12:
+          case 19:
           case "end":
             return _context3.stop();
         }
@@ -396,31 +407,57 @@ var RightDetail = function RightDetail(props) {
   }, [currentTreeData]);
   var xunapi = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var haveEventName, haveModuleAttr, havePageAttr, objConditions, b1, b7, b30;
+      var haveEventName, attrListApi, haveModuleAttr, havePageAttr, filterJsonList, obj, xifenList, attrFilterJsonList, objConditions, b1, b7, b30;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             // console.log(currentTreeData, currentMap, eventGroupList,eventNameMap, 'currentTreeData');
             haveEventName = eventNameMap === null || eventNameMap === void 0 ? void 0 : eventNameMap[currentTreeData.eventName]; // 查找事件
-            haveModuleAttr = haveEventName === null || haveEventName === void 0 ? void 0 : haveEventName.attrList.find(function (o) {
+            _context4.next = 3;
+            return fetchEventAttrs(currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.eventId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+          case 3:
+            attrListApi = _context4.sent;
+            // 事件下的细分
+            haveModuleAttr = attrListApi.find(function (o) {
               return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.moduleAttrName);
             }); // 事件模块的属性
             if (haveModuleAttr) {
               haveModuleAttr['values'] = [currentTreeData.moduleAttrName];
             }
-            havePageAttr = haveEventName === null || haveEventName === void 0 ? void 0 : haveEventName.attrList.find(function (o) {
+            havePageAttr = attrListApi.find(function (o) {
               return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.pageAttrName);
             }); // 事件页面的属性
             if (havePageAttr) {
               havePageAttr['values'] = [currentTreeData.pageAttrName];
             }
             if (haveModuleAttr) {
-              _context4.next = 8;
+              _context4.next = 11;
               break;
             }
             message.warning("".concat(currentMap === null || currentMap === void 0 ? void 0 : currentMap.moduleAttrName, "\u4E0B\u7684").concat(currentMap === null || currentMap === void 0 ? void 0 : currentMap.pageAttrName, "\u6CA1\u6709"));
             return _context4.abrupt("return");
-          case 8:
+          case 11:
+            filterJsonList = (currentMap === null || currentMap === void 0 ? void 0 : currentMap.filterJson) ? JSON.parse(currentMap === null || currentMap === void 0 ? void 0 : currentMap.filterJson).conditions : []; // 搜索的值 细分的值
+            obj = _objectSpread({}, props.filterValue); // 查询是的值
+            xifenList = (currentMap === null || currentMap === void 0 ? void 0 : currentMap.attributeJson) && JSON.parse(currentMap === null || currentMap === void 0 ? void 0 : currentMap.attributeJson);
+            attrFilterJsonList = [];
+            Object.keys(obj).forEach(function (o) {
+              if (o != 'mapId') {
+                if (obj[o]) {
+                  var indexNum = toNumber(o.substr(o.length - 1, 1));
+                  attrFilterJsonList.push({
+                    attrId: xifenList[indexNum - 1].inquire.id,
+                    attrName: xifenList[indexNum - 1].inquire.label,
+                    dimensionSub: xifenList[indexNum - 1].inquire.dimensionSub,
+                    label: xifenList[indexNum - 1].inquire.label,
+                    operator: 'equal',
+                    propCategory: 'eventProp',
+                    type: xifenList[indexNum - 1].inquire.type,
+                    values: [obj[o]]
+                  });
+                }
+              }
+            });
             objConditions = [{
               attrId: haveModuleAttr === null || haveModuleAttr === void 0 ? void 0 : haveModuleAttr.id,
               propCategory: 'eventProp',
@@ -439,19 +476,19 @@ var RightDetail = function RightDetail(props) {
               dimensionSub: 'event_attr',
               label: havePageAttr === null || havePageAttr === void 0 ? void 0 : havePageAttr.label,
               attrName: havePageAttr === null || havePageAttr === void 0 ? void 0 : havePageAttr.label
-            }]; // console.log(objConditions, 'kkk');
+            }].concat(attrFilterJsonList, _toConsumableArray(filterJsonList)); // console.log(objConditions, 'kkk');
             setInterviewLoading(true);
-            _context4.next = 12;
+            _context4.next = 20;
             return dayValues(objConditions, moment().subtract(1, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), [1, 0]);
-          case 12:
+          case 20:
             b1 = _context4.sent;
-            _context4.next = 15;
+            _context4.next = 23;
             return dayValues(objConditions, moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), [7, 0]);
-          case 15:
+          case 23:
             b7 = _context4.sent;
-            _context4.next = 18;
+            _context4.next = 26;
             return dayValues(objConditions, moment().subtract(30, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), [30, 0]);
-          case 18:
+          case 26:
             b30 = _context4.sent;
             setInterviewLoading(false);
             setData([{
@@ -461,7 +498,7 @@ var RightDetail = function RightDetail(props) {
               nearlyDays: b7,
               nearlyDays1: b30
             }]);
-          case 21:
+          case 29:
           case "end":
             return _context4.stop();
         }

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/addFormulate.d.ts

@@ -16,5 +16,6 @@ declare const AddFormulate: React.FC<{
     addruleShow: boolean;
     onSetclose: Function;
     detailData: Result | null;
+    ruleRowView?: boolean;
 }>;
 export default AddFormulate;

package/es/modules/formulateRule/addFormulate.js

@@ -1,3 +1,5 @@
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -17,12 +19,13 @@ import AddRule from './addRule';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import UseModal from '../CutsModal';
-import { typeArr } from './data';
+import { typeArr, shuzhiArr } from './data';
 var TextArea = Input.TextArea;
 var AddFormulate = function AddFormulate(_ref) {
   var addruleShow = _ref.addruleShow,
     onSetclose = _ref.onSetclose,
-    detailData = _ref.detailData;
+    detailData = _ref.detailData,
+    ruleRowView = _ref.ruleRowView;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   // 关闭抽屉框
@@ -44,8 +47,8 @@ var AddFormulate = function AddFormulate(_ref) {
     var arr = dataSource.map(function (o) {
       return {
         ruleType: o.currentType,
-        sourceValue: o.sourceValue,
-        targetValue: o.targetValue
+        sourceValue: o.currentType == 3 ? o.sourceValueId : o.sourceValue,
+        targetValue: o.currentType == 3 ? o.targetValueId : o.targetValue
       };
     });
     var api = detailData ? apis.clearRule.modifyRule : apis.clearRule.addRule;
@@ -76,9 +79,6 @@ var AddFormulate = function AddFormulate(_ref) {
       }
     });
   };
-  var handleSave = function handleSave() {
-    ruleForm.submit();
-  };
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     dataSource = _useState4[0],
@@ -87,7 +87,19 @@ var AddFormulate = function AddFormulate(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     dataSourceItemEdit = _useState6[0],
     setDataSoureItemEdit = _useState6[1];
-  var columns = [{
+  var columns = ruleRowView ? [{
+    title: '类型',
+    dataIndex: 'currentTypeName',
+    key: 'currentTypeName'
+  }, {
+    title: '原属性',
+    dataIndex: 'sourceValue',
+    key: 'sourceValue'
+  }, {
+    title: '清洗后属性',
+    dataIndex: 'targetValue',
+    key: 'targetValue'
+  }] : [{
     title: '类型',
     dataIndex: 'currentTypeName',
     key: 'currentTypeName'
@@ -141,7 +153,7 @@ var AddFormulate = function AddFormulate(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     openRule = _useState10[0],
     setOpenRule = _useState10[1];
-  var _useState11 = useState([]),
+  var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
     ruleList = _useState12[0],
     setRuleList = _useState12[1];
@@ -155,6 +167,20 @@ var AddFormulate = function AddFormulate(_ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     tableParams = _useState14[0],
     setTableParams = _useState14[1];
+  var typeValue = function typeValue(detailRow, tag) {
+    var str = tag == 1 ? detailRow.sourceValue : detailRow.targetValue;
+    //类型转换
+    if (detailRow.ruleType == 3) {
+      var _shuzhiArr$find;
+      // if (!detailRow.sourceValue || !detailRow.targetValue) {
+      //   return str;
+      // }
+      str = (_shuzhiArr$find = shuzhiArr.find(function (o) {
+        return o.value == (tag == 1 ? detailRow === null || detailRow === void 0 ? void 0 : detailRow.sourceValue : detailRow === null || detailRow === void 0 ? void 0 : detailRow.targetValue);
+      })) === null || _shuzhiArr$find === void 0 ? void 0 : _shuzhiArr$find.label;
+    }
+    return str;
+  };
   var getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     request(apis.rule.getRuleList, {
@@ -169,6 +195,42 @@ 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;
+          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: 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 {
+              currentType: o.ruleType,
+              currentTypeName: typeArr.filter(function (j) {
+                return j.value == o.ruleType;
+              })[0].label,
+              sourceValue: o.ruleType == 5 ? '' : typeValue(o, 1),
+              targetValue: typeValue(o, 2),
+              sourceValueId: o.ruleType == 3 && ((_shuzhiArr$find2 = shuzhiArr.find(function (j) {
+                return j.value == o.sourceValue;
+              })) === null || _shuzhiArr$find2 === void 0 ? void 0 : _shuzhiArr$find2.value),
+              targetValueId: o.ruleType == 3 && ((_shuzhiArr$find3 = shuzhiArr.find(function (j) {
+                return j.value == o.targetValue;
+              })) === null || _shuzhiArr$find3 === void 0 ? void 0 : _shuzhiArr$find3.value),
+              key: o.id
+            };
+          });
+          setDataSoure(function () {
+            return arr || [];
+          });
+        }
       }
     });
   };
@@ -196,34 +258,65 @@ 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);
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    currentBizAttributeSelectorValue = _useState16[0],
+    setCurrentBizAttributeSelectorValue = _useState16[1];
+  // 判断是否都包含
+  var isAllTypeIncluded = function isAllTypeIncluded(arrA, arrB) {
+    // 边界处理：arrA 为空数组 → 默认全包含（无需要检查的 type）
+    if (!arrA || arrA.length === 0) return true;
+    // 边界处理：arrB 为空数组 → 不可能包含任何 type → 返回 false
+    if (!arrB || arrB.length === 0) return false;
+    // 步骤 1：提取 arrA 中所有不重复的 type（去重后检查更高效）
+    var arrATypes = new Set(arrA.map(function (item) {
+      return item;
+    })); // 去重，避免重复检查
+    // 步骤 2：提取 arrB 中所有的“有效对比值”（支持 arrB 是字符串数组或对象数组）
+    var arrBValues = new Set(arrB.map(function (item) {
+      // 若 arrB 元素是对象，取其 type 属性；若为字符串，直接用元素本身
+      return _typeof(item) === 'object' && item !== null ? item.currentType : item;
+    }));
+    // 步骤 3：检查 arrA 的每个 type 是否都在 arrB 的值中
+    var _iterator = _createForOfIteratorHelper(arrATypes),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var type = _step.value;
+        if (!arrBValues.has(type)) {
+          return false; // 找到一个不包含的 type，直接返回 false
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
-  }, []);
+    return true; // 所有 type 都包含，返回 true
+  };
+  // 添加校验规则按钮禁用状态
+  var addBtndisabled = function addBtndisabled() {
+    var type = [1, 2, 3, 4];
+    // 查看数据时禁用按钮
+    if (ruleRowView) {
+      return true;
+    }
+    if (dataSource.length >= 1 && dataSource.find(function (j) {
+      return j.currentType == 5;
+    })) {
+      return true;
+    }
+    // 值类型也限制了
+    // if (isAllTypeIncluded(type, dataSource)) {
+    //   return true;
+    // }
+    return false;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "addRule"
   }, /*#__PURE__*/React.createElement(Drawer, {
     className: "addRuleForm",
-    title: /*#__PURE__*/React.createElement("div", null, detailData ? '修改自定义校验规则清洗' : '新建自定义校验规则清洗', /*#__PURE__*/React.createElement("div", {
+    title: /*#__PURE__*/React.createElement("div", null, ruleRowView ? '查看自定义校验规则清洗' : detailData ? '修改自定义校验规则清洗' : '新建自定义校验规则清洗', /*#__PURE__*/React.createElement("div", {
       className: "drawerCloseIcon",
       onClick: onClose
     }, /*#__PURE__*/React.createElement(CloseOutlined, {
@@ -237,12 +330,15 @@ var AddFormulate = function AddFormulate(_ref) {
     width: "700px",
     footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
       onClick: onClose
-    }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
+    }, "\u53D6\u6D88"), ruleRowView === false && (/*#__PURE__*/React.createElement(Button, {
       type: "primary",
-      onClick: handleSave
-    }, "\u786E\u5B9A")))
+      onClick: function onClick() {
+        return ruleForm.submit();
+      }
+    }, "\u786E\u5B9A"))))
   }, /*#__PURE__*/React.createElement(Form, {
     form: ruleForm,
+    disabled: ruleRowView,
     labelCol: {
       span: 4
     },
@@ -252,7 +348,8 @@ var AddFormulate = function AddFormulate(_ref) {
     initialValues: {
       name: '',
       desctiption: '',
-      ruleobj: []
+      ruleobj: [],
+      target: ''
     },
     onFinish: onFinish,
     labelAlign: "left"
@@ -286,6 +383,11 @@ var AddFormulate = function AddFormulate(_ref) {
     style: {
       width: '320px'
     },
+    onChange: function onChange(value) {
+      setCurrentBizAttributeSelectorValue(JSON.parse(ruleList === null || ruleList === void 0 ? void 0 : ruleList.find(function (o) {
+        return o.ruleId == value;
+      }).extraMes));
+    },
     placeholder: "\u8BF7\u9009\u62E9\u6E05\u6D17\u7684\u89C4\u5219\u5BF9\u8C61",
     fieldNames: {
       label: 'ruleName',
@@ -303,6 +405,7 @@ var AddFormulate = function AddFormulate(_ref) {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
     }),
+    disabled: addBtndisabled(),
     type: "link",
     onClick: function onClick() {
       setOpenRule(true);
@@ -318,6 +421,8 @@ var AddFormulate = function AddFormulate(_ref) {
   }, "*\u6CE8\uFF1A\u6E05\u6D17\u53EA\u9488\u5BF9\u6CA1\u901A\u8FC7\u81EA\u5B9A\u4E49\u6821\u9A8C\u89C4\u5219\u7684\u6570\u636E\u8FDB\u884C\u6E05\u6D17\uFF0C\u4E0D\u4F1A\u5BF9\u5DF2\u5165\u5E93\u6570\u636E\u8FDB\u884C\u6E05\u6D17")), openRule && (/*#__PURE__*/React.createElement(AddRule, {
     addruleShow: openRule,
     oneRow: oneRow,
+    allDataSource: dataSource,
+    currentBizAttributeSelectorValue: currentBizAttributeSelectorValue,
     editStatus: dataSourceItemEdit,
     onSetclose: function onSetclose() {
       return setOpenRule(false);

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

@@ -15,5 +15,7 @@ declare const AddRule: React.FC<{
     onSave: Function;
     oneRow: null | TypeRule;
     editStatus: boolean;
+    currentBizAttributeSelectorValue?: any;
+    allDataSource?: TypeRule[];
 }>;
 export default AddRule;