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

package/es/modules/formulateRule/addFormulate.js

@@ -41,12 +41,11 @@ 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.sourceValueId,
-        targetValue: o.targetValueId
+        sourceValue: o.sourceValueId || o.sourceValue,
+        targetValue: o.targetValueId || o.sourceValue
       };
     });
     var api = detailData ? apis.clearRule.modifyRule : apis.clearRule.addRule;

package/es/modules/formulateRule/addRule.js

@@ -434,19 +434,18 @@ var AddRule = function AddRule(_ref) {
     });
   }, []);
   // 数值类型禁用
-  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]);
+  // const [shuzhiArr1, setShuzhiArr1] = useState<
+  //   { value: number; label: string; disabled?: boolean }[]
+  // >([...shuzhiArr]);
+  // const shuzhisourceValueId = Form.useWatch('sourceValueId', shuzhiForm);
+  // useEffect(() => {
+  //   if (!shuzhisourceValueId) return;
+  //   const arr = shuzhiArr1.map((o) => {
+  //     o.disabled = shuzhisourceValueId == o.value ? true : false;
+  //     return { ...o };
+  //   });
+  //   setShuzhiArr1(arr);
+  // }, [shuzhisourceValueId]);
   var component = null;
   switch (currentType) {
     case 1:
@@ -568,7 +567,7 @@ var AddRule = function AddRule(_ref) {
           message: '请选择属性原类型'
         }]
       }, /*#__PURE__*/React.createElement(Select, {
-        options: shuzhiArr1,
+        options: shuzhiArr,
         disabled: true
       })), /*#__PURE__*/React.createElement(Form.Item, {
         label: "\u8F6C\u6362\u540E\u5C5E\u6027\u7C7B\u578B",
@@ -578,7 +577,7 @@ var AddRule = function AddRule(_ref) {
           message: '请选择转换后的属性类型'
         }]
       }, /*#__PURE__*/React.createElement(Select, {
-        options: shuzhiArr1
+        options: shuzhiArr
       })));
       break;
     case 4:

package/es/modules/formulateRule/data.js

@@ -1,9 +1,6 @@
 export var typeArr = [{
   value: 1,
   label: '值变换'
-}, {
-  value: 2,
-  label: '日期转换'
 }, {
   value: 3,
   label: '类型转换'

package/es/modules/formulateRule/index.js

@@ -374,6 +374,17 @@ var FormulateRule = function FormulateRule() {
     setDownloadDate([]);
     setIsModalOpen(false);
   };
+  // 选择近两年数据
+  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: "clearRule"
   }, /*#__PURE__*/React.createElement("div", {
@@ -449,6 +460,7 @@ var FormulateRule = function FormulateRule() {
   }, /*#__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/package.json

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