@openli1115/lowcode-edit-pro-table 1.0.107 → 1.0.109

package/es/components/ProSearch/index.js

@@ -12,9 +12,6 @@ import { useState, useEffect } from 'react';
 import { SearchOutlined } from '@ant-design/icons';
 import moment from 'moment';
 var OPTION_OPTIONS = [{
-  label: '(留空)',
-  value: ''
-}, {
   label: '等于',
   value: 'EQ'
 }, {
@@ -68,12 +65,20 @@ var newCondRow = function newCondRow(sign) {
   return {
     id: genId(),
     sign: sign,
-    option: '',
+    option: 'EQ',
     low: '',
     high: ''
   };
 };
 
+/** 根据 low/high 是否都有值，自动推断比较符：都有值 → BT，否则 EQ */
+var autoAdjustOption = function autoAdjustOption(currentOpt, low, high) {
+  if (low && high) return 'BT';
+  // high 或 low 被清空时，若之前是 BT 则回退到 EQ
+  if (currentOpt === 'BT') return 'EQ';
+  return currentOpt;
+};
+
 // ConditionTable: multi-value rows inside the modal
 var ConditionTable = function ConditionTable(_ref) {
   var sign = _ref.sign,
@@ -82,7 +87,13 @@ var ConditionTable = function ConditionTable(_ref) {
   var update = function update(id, key, val) {
     return onChange(rows.map(function (r) {
       var _extends2;
-      return r.id === id ? _extends({}, r, (_extends2 = {}, _extends2[key] = val, _extends2)) : r;
+      if (r.id !== id) return r;
+      var updated = _extends({}, r, (_extends2 = {}, _extends2[key] = val, _extends2));
+      // 修改 low/high 时自动调整比较符：都有值 → BT，否则回退 EQ
+      if (key === 'low' || key === 'high') {
+        updated.option = autoAdjustOption(r.option, updated.low, updated.high);
+      }
+      return updated;
     }));
   };
   var remove = function remove(id) {
@@ -231,6 +242,50 @@ var ProSearch = function ProSearch(_ref2) {
   }, [fields.map(function (f) {
     return f.id;
   }).join(',')]);
+
+  /**
+   * 实时同步：fieldValues / fields 变化时，将查询条件写入 window.screenStructures 和 window.customTypeMap，
+   * 确保任何外部事件（按钮点击、页面加载等）触发 executeLogicEngine 时，generateStructureForm() 能读到最新数据。
+   */
+  useEffect(function () {
+    var win = window;
+    if (!win.screenStructures) win.screenStructures = {};
+    if (!win.customTypeMap) win.customTypeMap = {};
+    fields.forEach(function (f) {
+      var fv = fieldValues[f.id] || {
+        low: '',
+        high: '',
+        conditions: []
+      };
+      var si = f.screenInner || 'st_' + f.techName;
+      var screenRows = [];
+      if (fv.conditions.length) {
+        fv.conditions.forEach(function (c) {
+          if (c.low || c.high) {
+            screenRows.push({
+              sign: c.sign,
+              option: c.option || 'EQ',
+              low: c.low || '',
+              high: c.high || '',
+              selected_flag: null,
+              inner_status: null
+            });
+          }
+        });
+      } else if (fv.low || fv.high) {
+        screenRows.push({
+          sign: 'I',
+          option: fv.high ? 'BT' : 'EQ',
+          low: fv.low || '',
+          high: fv.high || '',
+          selected_flag: null,
+          inner_status: null
+        });
+      }
+      win.screenStructures[si] = screenRows;
+      win.customTypeMap[si] = '4';
+    });
+  }, [fieldValues, fields]);
   var updateVal = function updateVal(id, key, val) {
     return setFieldValues(function (prev) {
       var _extends3, _extends4;
@@ -280,9 +335,9 @@ var ProSearch = function ProSearch(_ref2) {
   var confirmModal = function confirmModal() {
     if (!activeFieldId) return;
     var conditions = [].concat(includeRows.filter(function (r) {
-      return r.low || r.option;
+      return r.low || r.high;
     }), excludeRows.filter(function (r) {
-      return r.low || r.option;
+      return r.low || r.high;
     }));
     setFieldValues(function (prev) {
       var _extends7;
@@ -364,14 +419,14 @@ var ProSearch = function ProSearch(_ref2) {
             if (modalTab === 'include') {
               setIncludeRows(function (prev) {
                 var base = prev.filter(function (r) {
-                  return r.low || r.high || r.option;
+                  return r.low || r.high;
                 });
                 return base.length ? [].concat(base, newRows) : newRows;
               });
             } else {
               setExcludeRows(function (prev) {
                 var base = prev.filter(function (r) {
-                  return r.low || r.high || r.option;
+                  return r.low || r.high;
                 });
                 return base.length ? [].concat(base, newRows) : newRows;
               });
@@ -403,7 +458,7 @@ var ProSearch = function ProSearch(_ref2) {
         });
       } else if (fv.low || fv.high) {
         var _rows$push2;
-        rows.push((_rows$push2 = {}, _rows$push2[si + "-sign"] = 'I', _rows$push2[si + "-option"] = 'EQ', _rows$push2[si + "-low"] = fv.low, _rows$push2[si + "-high"] = fv.high, _rows$push2));
+        rows.push((_rows$push2 = {}, _rows$push2[si + "-sign"] = 'I', _rows$push2[si + "-option"] = fv.high ? 'BT' : 'EQ', _rows$push2[si + "-low"] = fv.low, _rows$push2[si + "-high"] = fv.high, _rows$push2));
       }
       if (rows.length) data[si] = rows;
 
@@ -414,7 +469,7 @@ var ProSearch = function ProSearch(_ref2) {
       var screenRows = [];
       if (fv.conditions.length) {
         fv.conditions.forEach(function (c) {
-          if (c.low || c.high || c.option) {
+          if (c.low || c.high) {
             screenRows.push({
               sign: c.sign,
               option: c.option || 'EQ',
@@ -450,8 +505,24 @@ var ProSearch = function ProSearch(_ref2) {
     var val = displayCond ? key === 'low' ? displayCond.low : displayCond.high : fv[key];
     var _onChange = function onChange(v) {
       if (displayCond) {
-        // 将修改同步到多值弹窗的第一行对应字段
-        updateConditionRow(field.id, displayCond.id, key, v);
+        // 将修改同步到多值弹窗的第一行对应字段，并自动调整比较符
+        var newLow = key === 'low' ? v : displayCond.low;
+        var newHigh = key === 'high' ? v : displayCond.high;
+        var newOpt = autoAdjustOption(displayCond.option, newLow, newHigh);
+        setFieldValues(function (prev) {
+          var _extends9;
+          var fv = prev[field.id] || {
+            low: '',
+            high: '',
+            conditions: []
+          };
+          return _extends({}, prev, (_extends9 = {}, _extends9[field.id] = _extends({}, fv, {
+            conditions: fv.conditions.map(function (c) {
+              var _extends8;
+              return c.id === displayCond.id ? _extends({}, c, (_extends8 = {}, _extends8[key] = v, _extends8.option = newOpt, _extends8)) : c;
+            })
+          }), _extends9));
+        });
       } else {
         updateVal(field.id, key, v);
       }
@@ -549,6 +620,14 @@ var ProSearch = function ProSearch(_ref2) {
         })
       }, _sym);
     }
+    // 无多值条件时：low 和 high 都有值 → 显示绿底"~"（介于）
+    if (fv.low && fv.high) {
+      return /*#__PURE__*/React.createElement("span", {
+        style: _extends({}, badgeStyle, {
+          background: '#52c41a'
+        })
+      }, OPTION_SYMBOL['BT']);
+    }
     return null;
   };
   var headerSize = {
@@ -559,10 +638,10 @@ var ProSearch = function ProSearch(_ref2) {
     return f.id === activeFieldId;
   });
   var incCount = includeRows.filter(function (r) {
-    return r.low || r.option;
+    return r.low || r.high;
   }).length;
   var excCount = excludeRows.filter(function (r) {
-    return r.low || r.option;
+    return r.low || r.high;
   }).length;
   return /*#__PURE__*/React.createElement("div", {
     style: {

package/lib/components/ProSearch/index.js

@@ -11,16 +11,13 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _button = _interopRequireDefault(require("antd/lib/button"));
 var _input = _interopRequireDefault(require("antd/lib/input"));
 var _select = _interopRequireDefault(require("antd/lib/select"));
-var _extends8 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _extends0 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _icons = require("@ant-design/icons");
 var _moment = _interopRequireDefault(require("moment"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var OPTION_OPTIONS = [{
-  label: '(留空)',
-  value: ''
-}, {
   label: '等于',
   value: 'EQ'
 }, {
@@ -74,12 +71,20 @@ var newCondRow = function newCondRow(sign) {
   return {
     id: genId(),
     sign: sign,
-    option: '',
+    option: 'EQ',
     low: '',
     high: ''
   };
 };
 
+/** 根据 low/high 是否都有值，自动推断比较符：都有值 → BT，否则 EQ */
+var autoAdjustOption = function autoAdjustOption(currentOpt, low, high) {
+  if (low && high) return 'BT';
+  // high 或 low 被清空时，若之前是 BT 则回退到 EQ
+  if (currentOpt === 'BT') return 'EQ';
+  return currentOpt;
+};
+
 // ConditionTable: multi-value rows inside the modal
 var ConditionTable = function ConditionTable(_ref) {
   var sign = _ref.sign,
@@ -88,7 +93,13 @@ var ConditionTable = function ConditionTable(_ref) {
   var update = function update(id, key, val) {
     return onChange(rows.map(function (r) {
       var _extends2;
-      return r.id === id ? (0, _extends8["default"])({}, r, (_extends2 = {}, _extends2[key] = val, _extends2)) : r;
+      if (r.id !== id) return r;
+      var updated = (0, _extends0["default"])({}, r, (_extends2 = {}, _extends2[key] = val, _extends2));
+      // 修改 low/high 时自动调整比较符：都有值 → BT，否则回退 EQ
+      if (key === 'low' || key === 'high') {
+        updated.option = autoAdjustOption(r.option, updated.low, updated.high);
+      }
+      return updated;
     }));
   };
   var remove = function remove(id) {
@@ -237,10 +248,54 @@ var ProSearch = function ProSearch(_ref2) {
   }, [fields.map(function (f) {
     return f.id;
   }).join(',')]);
+
+  /**
+   * 实时同步：fieldValues / fields 变化时，将查询条件写入 window.screenStructures 和 window.customTypeMap，
+   * 确保任何外部事件（按钮点击、页面加载等）触发 executeLogicEngine 时，generateStructureForm() 能读到最新数据。
+   */
+  (0, _react.useEffect)(function () {
+    var win = window;
+    if (!win.screenStructures) win.screenStructures = {};
+    if (!win.customTypeMap) win.customTypeMap = {};
+    fields.forEach(function (f) {
+      var fv = fieldValues[f.id] || {
+        low: '',
+        high: '',
+        conditions: []
+      };
+      var si = f.screenInner || 'st_' + f.techName;
+      var screenRows = [];
+      if (fv.conditions.length) {
+        fv.conditions.forEach(function (c) {
+          if (c.low || c.high) {
+            screenRows.push({
+              sign: c.sign,
+              option: c.option || 'EQ',
+              low: c.low || '',
+              high: c.high || '',
+              selected_flag: null,
+              inner_status: null
+            });
+          }
+        });
+      } else if (fv.low || fv.high) {
+        screenRows.push({
+          sign: 'I',
+          option: fv.high ? 'BT' : 'EQ',
+          low: fv.low || '',
+          high: fv.high || '',
+          selected_flag: null,
+          inner_status: null
+        });
+      }
+      win.screenStructures[si] = screenRows;
+      win.customTypeMap[si] = '4';
+    });
+  }, [fieldValues, fields]);
   var updateVal = function updateVal(id, key, val) {
     return setFieldValues(function (prev) {
       var _extends3, _extends4;
-      return (0, _extends8["default"])({}, prev, (_extends4 = {}, _extends4[id] = (0, _extends8["default"])({}, prev[id] || {
+      return (0, _extends0["default"])({}, prev, (_extends4 = {}, _extends4[id] = (0, _extends0["default"])({}, prev[id] || {
         low: '',
         high: '',
         conditions: []
@@ -257,10 +312,10 @@ var ProSearch = function ProSearch(_ref2) {
         high: '',
         conditions: []
       };
-      return (0, _extends8["default"])({}, prev, (_extends6 = {}, _extends6[fieldId] = (0, _extends8["default"])({}, fv, {
+      return (0, _extends0["default"])({}, prev, (_extends6 = {}, _extends6[fieldId] = (0, _extends0["default"])({}, fv, {
         conditions: fv.conditions.map(function (c) {
           var _extends5;
-          return c.id === condId ? (0, _extends8["default"])({}, c, (_extends5 = {}, _extends5[key] = val, _extends5)) : c;
+          return c.id === condId ? (0, _extends0["default"])({}, c, (_extends5 = {}, _extends5[key] = val, _extends5)) : c;
         })
       }), _extends6));
     });
@@ -286,13 +341,13 @@ var ProSearch = function ProSearch(_ref2) {
   var confirmModal = function confirmModal() {
     if (!activeFieldId) return;
     var conditions = [].concat(includeRows.filter(function (r) {
-      return r.low || r.option;
+      return r.low || r.high;
     }), excludeRows.filter(function (r) {
-      return r.low || r.option;
+      return r.low || r.high;
     }));
     setFieldValues(function (prev) {
       var _extends7;
-      return (0, _extends8["default"])({}, prev, (_extends7 = {}, _extends7[activeFieldId] = (0, _extends8["default"])({}, prev[activeFieldId] || {
+      return (0, _extends0["default"])({}, prev, (_extends7 = {}, _extends7[activeFieldId] = (0, _extends0["default"])({}, prev[activeFieldId] || {
         low: '',
         high: ''
       }, {
@@ -370,14 +425,14 @@ var ProSearch = function ProSearch(_ref2) {
             if (modalTab === 'include') {
               setIncludeRows(function (prev) {
                 var base = prev.filter(function (r) {
-                  return r.low || r.high || r.option;
+                  return r.low || r.high;
                 });
                 return base.length ? [].concat(base, newRows) : newRows;
               });
             } else {
               setExcludeRows(function (prev) {
                 var base = prev.filter(function (r) {
-                  return r.low || r.high || r.option;
+                  return r.low || r.high;
                 });
                 return base.length ? [].concat(base, newRows) : newRows;
               });
@@ -409,7 +464,7 @@ var ProSearch = function ProSearch(_ref2) {
         });
       } else if (fv.low || fv.high) {
         var _rows$push2;
-        rows.push((_rows$push2 = {}, _rows$push2[si + "-sign"] = 'I', _rows$push2[si + "-option"] = 'EQ', _rows$push2[si + "-low"] = fv.low, _rows$push2[si + "-high"] = fv.high, _rows$push2));
+        rows.push((_rows$push2 = {}, _rows$push2[si + "-sign"] = 'I', _rows$push2[si + "-option"] = fv.high ? 'BT' : 'EQ', _rows$push2[si + "-low"] = fv.low, _rows$push2[si + "-high"] = fv.high, _rows$push2));
       }
       if (rows.length) data[si] = rows;
 
@@ -420,7 +475,7 @@ var ProSearch = function ProSearch(_ref2) {
       var screenRows = [];
       if (fv.conditions.length) {
         fv.conditions.forEach(function (c) {
-          if (c.low || c.high || c.option) {
+          if (c.low || c.high) {
             screenRows.push({
               sign: c.sign,
               option: c.option || 'EQ',
@@ -456,22 +511,38 @@ var ProSearch = function ProSearch(_ref2) {
     var val = displayCond ? key === 'low' ? displayCond.low : displayCond.high : fv[key];
     var _onChange = function onChange(v) {
       if (displayCond) {
-        // 将修改同步到多值弹窗的第一行对应字段
-        updateConditionRow(field.id, displayCond.id, key, v);
+        // 将修改同步到多值弹窗的第一行对应字段，并自动调整比较符
+        var newLow = key === 'low' ? v : displayCond.low;
+        var newHigh = key === 'high' ? v : displayCond.high;
+        var newOpt = autoAdjustOption(displayCond.option, newLow, newHigh);
+        setFieldValues(function (prev) {
+          var _extends9;
+          var fv = prev[field.id] || {
+            low: '',
+            high: '',
+            conditions: []
+          };
+          return (0, _extends0["default"])({}, prev, (_extends9 = {}, _extends9[field.id] = (0, _extends0["default"])({}, fv, {
+            conditions: fv.conditions.map(function (c) {
+              var _extends8;
+              return c.id === displayCond.id ? (0, _extends0["default"])({}, c, (_extends8 = {}, _extends8[key] = v, _extends8.option = newOpt, _extends8)) : c;
+            })
+          }), _extends9));
+        });
       } else {
         updateVal(field.id, key, v);
       }
     };
 
     // 将样式 tab 的所有属性直接应用于输入框
-    var inputStyle = style ? (0, _extends8["default"])({}, style) : {};
+    var inputStyle = style ? (0, _extends0["default"])({}, style) : {};
 
     // IS_EMPTY / IS_NOT_EMPTY 时输入框置灰
     var isEmptyOp = displayCond && (displayCond.option === 'IS_EMPTY' || displayCond.option === 'IS_NOT_EMPTY');
     var isDisabled = !!isEmptyOp;
     if (field.fieldType === 'date') {
       return /*#__PURE__*/React.createElement(_datePicker["default"], {
-        style: (0, _extends8["default"])({
+        style: (0, _extends0["default"])({
           width: '100%'
         }, inputStyle),
         value: val ? (0, _moment["default"])(val) : null,
@@ -483,7 +554,7 @@ var ProSearch = function ProSearch(_ref2) {
     }
     if (field.fieldType === 'time') {
       return /*#__PURE__*/React.createElement(_timePicker["default"], {
-        style: (0, _extends8["default"])({
+        style: (0, _extends0["default"])({
           width: '100%'
         }, inputStyle),
         value: val ? (0, _moment["default"])(val, 'HH:mm:ss') : null,
@@ -540,7 +611,7 @@ var ProSearch = function ProSearch(_ref2) {
       var sym = OPTION_SYMBOL[opt];
       if (!sym) return null;
       return /*#__PURE__*/React.createElement("span", {
-        style: (0, _extends8["default"])({}, badgeStyle, {
+        style: (0, _extends0["default"])({}, badgeStyle, {
           background: '#52c41a'
         })
       }, sym);
@@ -550,11 +621,19 @@ var ProSearch = function ProSearch(_ref2) {
       // 4.5.2：空 / EQ 也要显示红底 "=" ；其它按 OPTION_SYMBOL 显示
       var _sym = _opt && OPTION_SYMBOL[_opt] || '=';
       return /*#__PURE__*/React.createElement("span", {
-        style: (0, _extends8["default"])({}, badgeStyle, {
+        style: (0, _extends0["default"])({}, badgeStyle, {
           background: '#ff4d4f'
         })
       }, _sym);
     }
+    // 无多值条件时：low 和 high 都有值 → 显示绿底"~"（介于）
+    if (fv.low && fv.high) {
+      return /*#__PURE__*/React.createElement("span", {
+        style: (0, _extends0["default"])({}, badgeStyle, {
+          background: '#52c41a'
+        })
+      }, OPTION_SYMBOL['BT']);
+    }
     return null;
   };
   var headerSize = {
@@ -565,10 +644,10 @@ var ProSearch = function ProSearch(_ref2) {
     return f.id === activeFieldId;
   });
   var incCount = includeRows.filter(function (r) {
-    return r.low || r.option;
+    return r.low || r.high;
   }).length;
   var excCount = excludeRows.filter(function (r) {
-    return r.low || r.option;
+    return r.low || r.high;
   }).length;
   return /*#__PURE__*/React.createElement("div", {
     style: {
@@ -579,7 +658,7 @@ var ProSearch = function ProSearch(_ref2) {
       padding: '0 4px 8px 4px'
     }
   }, showHeader && /*#__PURE__*/React.createElement("div", {
-    style: (0, _extends8["default"])({
+    style: (0, _extends0["default"])({
       display: 'flex',
       padding: '4px 8px',
       gap: 6,

package/lowcode_es/meta.js

@@ -102,7 +102,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = '@openli1115/lowcode-edit-pro-table';
   }
   if (version === void 0) {
-    version = '1.0.107';
+    version = '1.0.109';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/meta.js

@@ -107,7 +107,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = '@openli1115/lowcode-edit-pro-table';
   }
   if (version === void 0) {
-    version = '1.0.107';
+    version = '1.0.109';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openli1115/lowcode-edit-pro-table",
-  "version": "1.0.107",
+  "version": "1.0.109",
   "description": "@openli1115/lowcode-edit-pro-table",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -101,10 +101,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.107/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.109/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.107/build/index.html"
+  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.109/build/index.html"
 }