@zgfe/modules-dm 1.0.57-zhongyuan.41 → 1.0.57-zhongyuan.44

package/es/modules/clearRule/index.js

@@ -77,11 +77,11 @@ var ClearRule = function ClearRule() {
         onChange: function onChange(e) {
           return _onChange(e, record);
         }
-      })), authority[170928557412] && /*#__PURE__*/React.createElement("a", {
+      })), authority[170928557412] && (/*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return handleEditRule(record);
         }
-      }, "\u7F16\u8F91"), authority[170928557413] && /*#__PURE__*/React.createElement("a", {
+      }, record.status == 1 ? '查看' : '编辑')), authority[170928557413] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return handleDeleteRule(record === null || record === void 0 ? void 0 : record.ruleId);
         }
@@ -105,7 +105,13 @@ var ClearRule = function ClearRule() {
     _useState8 = _slicedToArray(_useState7, 2),
     isCheckRuleModalOpen = _useState8[0],
     setIsCheckRuleModalOpen = _useState8[1];
+  // 行数据 修改查看时需要
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    ruleRowEdit = _useState10[0],
+    setRuleRowEdit = _useState10[1];
   var handleEditRule = function handleEditRule(ruleRow) {
+    setRuleRowEdit(ruleRow);
     request(apis.rule.checkRule, {
       method: 'post',
       data: {
@@ -160,23 +166,23 @@ var ClearRule = function ClearRule() {
     setIsCheckRuleModalOpen(false);
   };
   // 新建规则显示
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    addruleShow = _useState10[0],
-    setAddruleshow = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    addruleShow = _useState12[0],
+    setAddruleshow = _useState12[1];
   var handleAddRule = function handleAddRule() {
     setAddruleshow(true);
     setEditStatus(false);
   };
   // 下载报告
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isModalOpen = _useState12[0],
-    setIsModalOpen = _useState12[1];
-  var _useState13 = useState([]),
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    downloadDate = _useState14[0],
-    setDownloadDate = _useState14[1];
+    isModalOpen = _useState14[0],
+    setIsModalOpen = _useState14[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    downloadDate = _useState16[0],
+    setDownloadDate = _useState16[1];
   var handleSelectDate = function handleSelectDate(date) {
     setDownloadDate(date);
   };
@@ -198,18 +204,18 @@ var ClearRule = function ClearRule() {
     setIsModalOpen(false);
   };
   // 导入规则
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    openImportModal = _useState16[0],
-    setOpenImportModal = _useState16[1];
   var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    openImportModalResult = _useState18[0],
-    setOpenImportModalResult = _useState18[1];
-  var _useState19 = useState(),
+    openImportModal = _useState18[0],
+    setOpenImportModal = _useState18[1];
+  var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    errorRule = _useState20[0],
-    setErrorRule = _useState20[1];
+    openImportModalResult = _useState20[0],
+    setOpenImportModalResult = _useState20[1];
+  var _useState21 = useState(),
+    _useState22 = _slicedToArray(_useState21, 2),
+    errorRule = _useState22[0],
+    setErrorRule = _useState22[1];
   var handleImportResultOk = function handleImportResultOk() {
     setOpenImportModal(false);
     setOpenImportModalResult(false);
@@ -237,14 +243,14 @@ var ClearRule = function ClearRule() {
     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];
+    allOpenRule = _useState24[0],
+    setAllOpenRule = _useState24[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    statusLoading = _useState26[0],
+    setStatusLoading = _useState26[1];
   var handleAllOpenStatus = function handleAllOpenStatus(value) {
     setStatusLoading(true);
     request(apis.rule.allOpenStatus, {
@@ -267,14 +273,14 @@ var ClearRule = function ClearRule() {
   /**
    * 规则列表， 搜索名称， 规则列表状态开启/关闭， 删除规则
    */
-  var _useState25 = useState([]),
-    _useState26 = _slicedToArray(_useState25, 2),
-    ruleList = _useState26[0],
-    setRuleList = _useState26[1];
-  var _useState27 = useState(''),
+  var _useState27 = useState([]),
     _useState28 = _slicedToArray(_useState27, 2),
-    ruleSearchName = _useState28[0],
-    setRuleSearchName = _useState28[1];
+    ruleList = _useState28[0],
+    setRuleList = _useState28[1];
+  var _useState29 = useState(''),
+    _useState30 = _slicedToArray(_useState29, 2),
+    ruleSearchName = _useState30[0],
+    setRuleSearchName = _useState30[1];
   var searchChange = function searchChange(e) {
     var _value = e.currentTarget.value;
     setRuleSearchName(_value);
@@ -287,14 +293,14 @@ var ClearRule = function ClearRule() {
     setTableParams(pagination);
     _getList(ruleSearchName, pagination);
   };
-  var _useState29 = useState({
+  var _useState31 = useState({
       current: 1,
       pageSize: 10,
       total: 0
     }),
-    _useState30 = _slicedToArray(_useState29, 2),
-    tableParams = _useState30[0],
-    setTableParams = _useState30[1];
+    _useState32 = _slicedToArray(_useState31, 2),
+    tableParams = _useState32[0],
+    setTableParams = _useState32[1];
   useEffect(function () {
     _getList();
   }, []);
@@ -408,10 +414,32 @@ var ClearRule = function ClearRule() {
         message.success("".concat(ruleRow.status == 0 ? '规则开启成功！' : '规则关闭成功'));
         handleSearch();
       } else {
+        if (res.data == 1) {
+          // getDetail(ruleRow.ruleId)
+          // setEditStatus(true)
+          UseModal({
+            onOk: function onOk() {},
+            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;
+        }
         message.error(res.msg);
       }
     });
   };
+  // 选择近两年数据
+  var disabledDate = function disabledDate(current) {
+    var isAfterToday = current && current > moment().endOf('day');
+    var twoYearsAgo = moment().subtract(2, 'year').startOf('day');
+    var isBeforeTwoYearsAgo = current && current < twoYearsAgo;
+    // 1. 计算上一年的年份（如当前是 2025，则上一年是 2024）
+    var lastYear = moment().year() - 1;
+    // 2. 上一年的时间边界：开始（1月1日 00:00:00）、结束（12月31日 23:59:59）
+    var lastYearStart = moment("".concat(lastYear, "-01-01")).startOf('day'); // 上一年1月1日 00:00
+    return isAfterToday || current < lastYearStart;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(className)
   }, /*#__PURE__*/React.createElement("div", {
@@ -462,6 +490,7 @@ var ClearRule = function ClearRule() {
     onChange: handlePage
   }), addruleShow && (/*#__PURE__*/React.createElement(AddRule, {
     addruleShow: addruleShow,
+    ruleRowEdit: ruleRowEdit === null || ruleRowEdit === void 0 ? void 0 : ruleRowEdit.status,
     currentRuleDetail: editStatus ? ruleDetail : null,
     getList: function getList() {
       return _getList(ruleSearchName);
@@ -493,6 +522,7 @@ var ClearRule = function ClearRule() {
   }, /*#__PURE__*/React.createElement("div", null, "\u9009\u62E9\u65F6\u95F4\u8303\u56F4\u751F\u6210\u62A5\u544A"), /*#__PURE__*/React.createElement(RangePicker, {
     open: true,
     placement: "topRight",
+    disabledDate: disabledDate,
     onChange: handleSelectDate,
     getPopupContainer: function getPopupContainer(trigger) {
       var parent = trigger.parentElement;

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

@@ -72,7 +72,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.updateEventInfo, {
       method: 'post',
       data: {
-        appId: getAppID(currentApp),
+        appId: Number(getAppID(currentApp)),
         aliasName: aliasNameInput,
         eventId: aliasNameId
       }
@@ -126,7 +126,7 @@ var TablePlus = function TablePlus(props) {
       data: {
         eventGroupName: eventNameInput,
         eventGroupId: eventNameData.groupId,
-        appId: getAppID(currentApp),
+        appId: Number(getAppID(currentApp)),
         platform: 0
       }
     }).then(function (res) {
@@ -156,7 +156,7 @@ var TablePlus = function TablePlus(props) {
         request(apis.deleteEventGroup, {
           method: 'post',
           data: {
-            appId: getAppID(currentApp),
+            appId: Number(getAppID(currentApp)),
             eventGroupId: eventGroupId
           }
         }).then(function (res) {
@@ -185,7 +185,7 @@ var TablePlus = function TablePlus(props) {
       request(apis.getPanelUseEvent, {
         method: 'POST',
         data: {
-          appId: getAppID(currentApp),
+          appId: Number(getAppID(currentApp)),
           eventId: record.event_id
         }
       }).then(function (re) {
@@ -193,7 +193,7 @@ var TablePlus = function TablePlus(props) {
           request(apis.checkEventStatus, {
             method: 'get',
             params: {
-              appId: getAppID(currentApp),
+              appId: Number(getAppID(currentApp)),
               eventId: record.event_id
             }
           }).then(function (res) {
@@ -256,7 +256,7 @@ var TablePlus = function TablePlus(props) {
         request(apis.deleteEventMeta, {
           method: 'post',
           data: {
-            appId: getAppID(currentApp),
+            appId: Number(getAppID(currentApp)),
             eventId: eventId
           }
         }).then(function (res) {
@@ -291,7 +291,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.updateEventInfo, {
       method: 'post',
       data: _objectSpread({
-        appId: getAppID(currentApp),
+        appId: Number(getAppID(currentApp)),
         eventId: record.event_id
       }, _temp)
     }).then(function () {
@@ -383,7 +383,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.operateGroupRelations, {
       method: 'post',
       data: _objectSpread({
-        appId: getAppID(currentApp),
+        appId: Number(getAppID(currentApp)),
         platform: 0,
         hasPublicAttrView: true,
         eventIds: groupCheckedData[data.groupId].join(',')
@@ -597,7 +597,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.dict.eventTag, {
       method: 'post',
       data: {
-        appId: getAppID(currentApp),
+        appId: Number(getAppID(currentApp)),
         labelType: type
       }
     }).then(function (res) {
@@ -632,7 +632,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.updateEventInfo, {
       method: 'post',
       data: _objectSpread({
-        appId: getAppID(currentApp),
+        appId: Number(getAppID(currentApp)),
         eventId: eventData === null || eventData === void 0 ? void 0 : eventData.event_id
       }, params)
     }).then(function (res) {
@@ -653,7 +653,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.dict.delLabelRelation, {
       method: 'post',
       data: {
-        appId: getAppID(currentApp),
+        appId: Number(getAppID(currentApp)),
         eventId: eventData === null || eventData === void 0 ? void 0 : eventData.event_id,
         labelType: type,
         id: id
@@ -1158,7 +1158,7 @@ var TablePlus = function TablePlus(props) {
       method: 'post',
       data: {
         eventId: currentRow === null || currentRow === void 0 ? void 0 : currentRow.event_id,
-        appId: getAppID(currentApp),
+        appId: Number(getAppID(currentApp)),
         reason: offlineText
       }
     }).then(function (res) {

package/es/modules/formulateRule/addFormulate.js

@@ -41,11 +41,12 @@ var AddFormulate = function AddFormulate(_ref) {
     }, 300);
   };
   var onFinish = function onFinish(values) {
+    console.log(values, 'values');
     var arr = dataSource.map(function (o) {
       return {
         ruleType: o.currentType,
-        sourceValue: o.sourceValue,
-        targetValue: o.targetValue
+        sourceValue: o.sourceValueId,
+        targetValue: o.targetValueId
       };
     });
     var api = detailData ? apis.clearRule.modifyRule : apis.clearRule.addRule;
@@ -221,6 +222,10 @@ var AddFormulate = function AddFormulate(_ref) {
       });
     }
   };
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    currentBizAttributeSelectorValue = _useState16[0],
+    setCurrentBizAttributeSelectorValue = _useState16[1];
   return /*#__PURE__*/React.createElement("div", {
     className: "addRule"
   }, /*#__PURE__*/React.createElement(Drawer, {
@@ -288,6 +293,11 @@ var AddFormulate = function AddFormulate(_ref) {
     style: {
       width: '320px'
     },
+    onChange: function onChange(value) {
+      setCurrentBizAttributeSelectorValue(JSON.parse(ruleList.find(function (o) {
+        return o.ruleId == value;
+      }).extraMes));
+    },
     placeholder: "\u8BF7\u9009\u62E9\u6E05\u6D17\u7684\u89C4\u5219\u5BF9\u8C61",
     fieldNames: {
       label: 'ruleName',
@@ -320,6 +330,7 @@ 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,
+    currentBizAttributeSelectorValue: currentBizAttributeSelectorValue,
     editStatus: dataSourceItemEdit,
     onSetclose: function onSetclose() {
       return setOpenRule(false);

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

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

package/es/modules/formulateRule/addRule.js

@@ -1,4 +1,5 @@
 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 _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 _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); }
@@ -14,7 +15,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-import { Drawer, Input, Button, Space, Form, Table, Select } from 'antd';
+import { Drawer, Input, Button, Space, Form, Table, Select, message } from 'antd';
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import React, { useEffect, useState } from 'react';
 import '../clearRule/css/index.less';
@@ -24,7 +25,8 @@ var AddRule = function AddRule(_ref) {
     onSetclose = _ref.onSetclose,
     onSave = _ref.onSave,
     oneRow = _ref.oneRow,
-    editStatus = _ref.editStatus;
+    editStatus = _ref.editStatus,
+    currentBizAttributeSelectorValue = _ref.currentBizAttributeSelectorValue;
   var _useState = useState(addruleShow),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -74,6 +76,27 @@ var AddRule = function AddRule(_ref) {
     errorTip = _useState6[0],
     setErrorTip = _useState6[1]; // 值变换的提示信息
   var handleSave = function handleSave() {
+    if (hasDuplicate(dataSource).duplicateObjs.length >= 1) {
+      var resultaArr = hasDuplicate(dataSource).duplicateObjs;
+      var arr = dataSource.map(function (o) {
+        return _objectSpread(_objectSpread({}, o), {}, {
+          status: resultaArr.find(function (item) {
+            return item.key == o.key;
+          }) ? 'error' : 'success'
+        });
+      });
+      setDataSoure(_toConsumableArray(arr));
+      message.error('有原始值相同');
+      return;
+    }
+    if (dataSource.find(function (o) {
+      return !o.sourceValue;
+    }) || dataSource.find(function (o) {
+      return !o.targetValue;
+    })) {
+      message.error('有原始值和新值为空');
+      return;
+    }
     if (currentType == 1) {
       if (editStatus) {
         var _SelectValueForm$getF = SelectValueForm.getFieldsValue(),
@@ -151,11 +174,14 @@ var AddRule = function AddRule(_ref) {
     dataIndex: 'sourceValue',
     key: 'sourceValue',
     render: function render(_, record) {
-      return /*#__PURE__*/React.createElement(Input, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Input, {
+        status: record.status,
         onChange: function onChange(e) {
           return handleName(record, e.target.value);
         }
-      });
+      }), record.status == 'error' && (/*#__PURE__*/React.createElement("span", {
+        className: "sourceValueErrortext"
+      }, "\u5DF2\u6709\u76F8\u540C\u539F\u59CB\u503C")));
     }
   }, {
     title: '新值',
@@ -203,7 +229,67 @@ var AddRule = function AddRule(_ref) {
     });
     setDataSoure(arr);
   };
+  var hasDuplicate = function hasDuplicate(arr) {
+    if (!arr || arr.length <= 1) {
+      return {
+        hasDuplicate: false,
+        duplicateAValues: [],
+        duplicateObjs: []
+      };
+    }
+    var aValueMap = new Map();
+    var duplicateAValues = new Set();
+    var duplicateObjs = [];
+    // 第一步：统计次数，标记重复的 a 值
+    var _iterator = _createForOfIteratorHelper(arr),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var obj = _step.value;
+        var aValue = obj.sourceValue;
+        aValueMap.set(aValue, (aValueMap.get(aValue) || 0) + 1);
+      }
+      // 第二步：收集重复 a 值对应的所有对象
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    var _iterator2 = _createForOfIteratorHelper(arr),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _obj = _step2.value;
+        var _aValue = _obj.sourceValue;
+        if (aValueMap.get(_aValue) > 1) {
+          duplicateObjs.push(_obj);
+          duplicateAValues.add(_aValue); // 去重重复的 a 值
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    return {
+      hasDuplicate: duplicateAValues.size > 0,
+      duplicateAValues: Array.from(duplicateAValues),
+      duplicateObjs: duplicateObjs // 对应的对象：[{a:1,b:2}, {a:1,b:3}]
+    };
+  };
   var handleAddValue = function handleAddValue() {
+    if (hasDuplicate(dataSource).duplicateObjs.length >= 1) {
+      var resultaArr = hasDuplicate(dataSource).duplicateObjs;
+      var arr = dataSource.map(function (o) {
+        return _objectSpread(_objectSpread({}, o), {}, {
+          status: resultaArr.find(function (item) {
+            return item.key == o.key;
+          }) ? 'error' : 'success'
+        });
+      });
+      setDataSoure(_toConsumableArray(arr));
+      return;
+    }
     setDataSoure([].concat(_toConsumableArray(dataSource), [{
       key: getKey(),
       sourceValue: '',
@@ -215,9 +301,20 @@ var AddRule = function AddRule(_ref) {
     }]));
   };
   var handleReduceValue = function handleReduceValue(record) {
-    setDataSoure(dataSource.filter(function (o) {
+    var newArr = dataSource.filter(function (o) {
       return o.key != record.key;
-    }));
+    });
+    setDataSoure(function () {
+      return _toConsumableArray(newArr);
+    });
+    if (hasDuplicate(newArr).duplicateObjs.length == 0) {
+      var newArr1 = newArr.map(function (o) {
+        return _objectSpread(_objectSpread({}, o), {}, {
+          status: 'success'
+        });
+      });
+      setDataSoure(_toConsumableArray(newArr1));
+    }
   };
   // 日期转换
   var _useState9 = useState(undefined),
@@ -336,6 +433,20 @@ var AddRule = function AddRule(_ref) {
       currentType: currentType
     });
   }, []);
+  // 数值类型禁用
+  var _useState13 = useState(_toConsumableArray(shuzhiArr)),
+    _useState14 = _slicedToArray(_useState13, 2),
+    shuzhiArr1 = _useState14[0],
+    setShuzhiArr1 = _useState14[1];
+  var shuzhisourceValueId = Form.useWatch('sourceValueId', shuzhiForm);
+  useEffect(function () {
+    if (!shuzhisourceValueId) return;
+    var arr = shuzhiArr1.map(function (o) {
+      o.disabled = shuzhisourceValueId == o.value ? true : false;
+      return _objectSpread({}, o);
+    });
+    setShuzhiArr1(arr);
+  }, [shuzhisourceValueId]);
   var component = null;
   switch (currentType) {
     case 1:
@@ -445,7 +556,7 @@ var AddRule = function AddRule(_ref) {
           span: 19
         },
         initialValues: {
-          sourceValueId: undefined,
+          sourceValueId: (currentBizAttributeSelectorValue === null || currentBizAttributeSelectorValue === void 0 ? void 0 : currentBizAttributeSelectorValue.type) || 1,
           targetValueId: undefined
         },
         onFinish: onShuzhiFinish
@@ -457,7 +568,8 @@ var AddRule = function AddRule(_ref) {
           message: '请选择属性原类型'
         }]
       }, /*#__PURE__*/React.createElement(Select, {
-        options: shuzhiArr
+        options: shuzhiArr1,
+        disabled: true
       })), /*#__PURE__*/React.createElement(Form.Item, {
         label: "\u8F6C\u6362\u540E\u5C5E\u6027\u7C7B\u578B",
         name: "targetValueId",
@@ -466,7 +578,7 @@ var AddRule = function AddRule(_ref) {
           message: '请选择转换后的属性类型'
         }]
       }, /*#__PURE__*/React.createElement(Select, {
-        options: shuzhiArr
+        options: shuzhiArr1
       })));
       break;
     case 4:

package/package.json

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