@openli1115/lowcode-edit-pro-table 1.0.87 → 1.0.88

package/es/components/ProSearch/index.d.ts

@@ -5,6 +5,14 @@ export interface ProSearchField {
     techName: string;
     fieldType?: 'text' | 'date' | 'time';
     screenInner?: string;
+    /** 3.2 修改配置页中定义的默认查询条件 */
+    defaultConditions?: Array<{
+        id?: string;
+        sign: 'I' | 'E';
+        option: '' | 'EQ' | 'NE' | 'BT' | 'LT' | 'LE' | 'GT' | 'GE' | 'CO' | 'NC';
+        low: string;
+        high: string;
+    }>;
 }
 export interface ProSearchProps {
     fields?: ProSearchField[];
@@ -16,8 +24,8 @@ export interface ProSearchProps {
     showHighValue?: boolean;
     multiValue?: boolean;
     showTechName?: boolean;
-    descriptionAlign?: 'left' | 'center' | 'right';
-    techNameAlign?: 'left' | 'center' | 'right';
+    descriptionAlign?: 'left' | 'center' | 'right' | 'justify';
+    techNameAlign?: 'left' | 'center' | 'right' | 'justify';
     onSearch?: (data: Record<string, any[]>) => void;
 }
 declare const ProSearch: React.FC<ProSearchProps>;

package/es/components/ProSearch/index.js

@@ -1,10 +1,12 @@
-import _Modal from "antd/es/modal";
 import _TimePicker from "antd/es/time-picker";
 import _DatePicker from "antd/es/date-picker";
+import _Modal from "antd/es/modal";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _Button from "antd/es/button";
 import _Input from "antd/es/input";
 import _Select from "antd/es/select";
 import _extends from "@babel/runtime/helpers/extends";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import * as React from 'react';
 import { useState, useEffect } from 'react';
 import { SearchOutlined } from '@ant-design/icons';
@@ -181,16 +183,30 @@ var ProSearch = function ProSearch(_ref2) {
     excludeRows = _useState6[0],
     setExcludeRows = _useState6[1];
 
-  // Sync field values when fields change
+  // Sync field values when fields change - 使用默认查询条件初始化
   useEffect(function () {
     setFieldValues(function (prev) {
       var result = {};
       fields.forEach(function (f) {
-        result[f.id] = prev[f.id] || {
-          low: '',
-          high: '',
-          conditions: []
-        };
+        if (prev[f.id]) {
+          result[f.id] = prev[f.id];
+        } else {
+          // 3.2 应用设计时配置的默认查询条件
+          var defaults = (f.defaultConditions || []).map(function (c) {
+            return {
+              id: c.id || genId(),
+              sign: c.sign,
+              option: c.option,
+              low: c.low || '',
+              high: c.high || ''
+            };
+          });
+          result[f.id] = {
+            low: '',
+            high: '',
+            conditions: defaults
+          };
+        }
       });
       return result;
     });
@@ -244,9 +260,97 @@ var ProSearch = function ProSearch(_ref2) {
     });
     setModalVisible(false);
   };
+
+  // 4.1 "所有条目"：清空当前 Tab 的所有条件行（保留一个空行）
   var clearModal = function clearModal() {
     if (modalTab === 'include') setIncludeRows([newCondRow('I')]);else setExcludeRows([newCondRow('E')]);
   };
+
+  /**
+   * 4.1 "粘贴"：将剪贴板中复制的列内容粘贴到当前 Tab
+   * - 按换行（\r\n / \n / \r）或制表符（\t）拆分为多个值
+   * - 每个非空值生成一行：{ sign: 当前Tab符号, option: 'EQ', low: val, high: '' }
+   * - 追加到当前 Tab 的现有行之后（若只有一空行则先移除）
+   */
+  var pasteFromClipboard = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var text, values, sign, newRows, _t;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            text = '';
+            _context.prev = 1;
+            if (!(navigator.clipboard && navigator.clipboard.readText)) {
+              _context.next = 3;
+              break;
+            }
+            _context.next = 2;
+            return navigator.clipboard.readText();
+          case 2:
+            text = _context.sent;
+          case 3:
+            _context.next = 5;
+            break;
+          case 4:
+            _context.prev = 4;
+            _t = _context["catch"](1);
+          case 5:
+            if (text) {
+              _context.next = 6;
+              break;
+            }
+            _Modal.warning({
+              title: '粘贴失败',
+              content: '剪贴板为空或无法读取，请确认已复制列内容且浏览器授权剪贴板访问权限。'
+            });
+            return _context.abrupt("return");
+          case 6:
+            values = text.split(/[\r\n\t]+/).map(function (v) {
+              return v.trim();
+            }).filter(function (v) {
+              return v.length > 0;
+            });
+            if (values.length) {
+              _context.next = 7;
+              break;
+            }
+            return _context.abrupt("return");
+          case 7:
+            sign = modalTab === 'include' ? 'I' : 'E';
+            newRows = values.map(function (v) {
+              return {
+                id: genId(),
+                sign: sign,
+                option: 'EQ',
+                low: v,
+                high: ''
+              };
+            });
+            if (modalTab === 'include') {
+              setIncludeRows(function (prev) {
+                var base = prev.filter(function (r) {
+                  return r.low || r.high || r.option;
+                });
+                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 base.length ? [].concat(base, newRows) : newRows;
+              });
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 4]]);
+    }));
+    return function pasteFromClipboard() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   var handleSearch = function handleSearch() {
     var data = {};
     fields.forEach(function (f) {
@@ -486,17 +590,7 @@ var ProSearch = function ProSearch(_ref2) {
         fontSize: 12
       }
     }, field.techName));
-  }), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex',
-      justifyContent: 'center',
-      paddingTop: 8
-    }
-  }, /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
-    size: "small",
-    onClick: handleSearch
-  }, "\u67E5\u8BE2")), /*#__PURE__*/React.createElement(_Modal, {
+  }), /*#__PURE__*/React.createElement(_Modal, {
     title: "\u591A\u503C\u8BBE\u7F6E" + (activeField ? ' - ' + activeField.fieldDesc : ''),
     open: modalVisible,
     onCancel: function onCancel() {
@@ -504,7 +598,17 @@ var ProSearch = function ProSearch(_ref2) {
     },
     footer: null,
     width: 580,
-    destroyOnClose: true
+    destroyOnClose: true,
+    zIndex: 9999999,
+    getContainer: function getContainer() {
+      // 脱出画布 iframe，挂到主文档 body，避免被设计器蒙层盖住
+      try {
+        var topDoc = window.top && window.top.document || document;
+        return topDoc.body;
+      } catch (e) {
+        return document.body;
+      }
+    }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
@@ -546,19 +650,21 @@ var ProSearch = function ProSearch(_ref2) {
   }), /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
-      justifyContent: 'flex-end',
+      justifyContent: 'center',
       gap: 8,
       marginTop: 16
     }
   }, /*#__PURE__*/React.createElement(_Button, {
     onClick: clearModal
-  }, "\u6E05\u7A7A"), /*#__PURE__*/React.createElement(_Button, {
+  }, "\u6240\u6709\u6761\u76EE"), /*#__PURE__*/React.createElement(_Button, {
+    onClick: pasteFromClipboard
+  }, "\u7C98\u8D34"), /*#__PURE__*/React.createElement(_Button, {
+    type: "primary",
+    onClick: confirmModal
+  }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement(_Button, {
     onClick: function onClick() {
       return setModalVisible(false);
     }
-  }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
-    onClick: confirmModal
-  }, "\u786E\u5B9A"))));
+  }, "\u53D6\u6D88"))));
 };
 export default ProSearch;

package/es/style.js

@@ -1,8 +1,8 @@
 import '@alifd/next/es/button/style';
 import 'antd/es/message/style';
-import 'antd/es/modal/style';
 import 'antd/es/time-picker/style';
 import 'antd/es/date-picker/style';
+import 'antd/es/modal/style';
 import 'antd/es/button/style';
 import 'antd/es/input/style';
 import 'antd/es/select/style';

package/lib/components/ProSearch/index.d.ts

@@ -5,6 +5,14 @@ export interface ProSearchField {
     techName: string;
     fieldType?: 'text' | 'date' | 'time';
     screenInner?: string;
+    /** 3.2 修改配置页中定义的默认查询条件 */
+    defaultConditions?: Array<{
+        id?: string;
+        sign: 'I' | 'E';
+        option: '' | 'EQ' | 'NE' | 'BT' | 'LT' | 'LE' | 'GT' | 'GE' | 'CO' | 'NC';
+        low: string;
+        high: string;
+    }>;
 }
 export interface ProSearchProps {
     fields?: ProSearchField[];
@@ -16,8 +24,8 @@ export interface ProSearchProps {
     showHighValue?: boolean;
     multiValue?: boolean;
     showTechName?: boolean;
-    descriptionAlign?: 'left' | 'center' | 'right';
-    techNameAlign?: 'left' | 'center' | 'right';
+    descriptionAlign?: 'left' | 'center' | 'right' | 'justify';
+    techNameAlign?: 'left' | 'center' | 'right' | 'justify';
     onSearch?: (data: Record<string, any[]>) => void;
 }
 declare const ProSearch: React.FC<ProSearchProps>;

package/lib/components/ProSearch/index.js

@@ -3,9 +3,11 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports["default"] = void 0;
-var _modal = _interopRequireDefault(require("antd/lib/modal"));
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _timePicker = _interopRequireDefault(require("antd/lib/time-picker"));
 var _datePicker = _interopRequireDefault(require("antd/lib/date-picker"));
+var _modal = _interopRequireDefault(require("antd/lib/modal"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _button = _interopRequireDefault(require("antd/lib/button"));
 var _input = _interopRequireDefault(require("antd/lib/input"));
 var _select = _interopRequireDefault(require("antd/lib/select"));
@@ -14,7 +16,7 @@ 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 _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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: ''
@@ -187,16 +189,30 @@ var ProSearch = function ProSearch(_ref2) {
     excludeRows = _useState6[0],
     setExcludeRows = _useState6[1];
 
-  // Sync field values when fields change
+  // Sync field values when fields change - 使用默认查询条件初始化
   (0, _react.useEffect)(function () {
     setFieldValues(function (prev) {
       var result = {};
       fields.forEach(function (f) {
-        result[f.id] = prev[f.id] || {
-          low: '',
-          high: '',
-          conditions: []
-        };
+        if (prev[f.id]) {
+          result[f.id] = prev[f.id];
+        } else {
+          // 3.2 应用设计时配置的默认查询条件
+          var defaults = (f.defaultConditions || []).map(function (c) {
+            return {
+              id: c.id || genId(),
+              sign: c.sign,
+              option: c.option,
+              low: c.low || '',
+              high: c.high || ''
+            };
+          });
+          result[f.id] = {
+            low: '',
+            high: '',
+            conditions: defaults
+          };
+        }
       });
       return result;
     });
@@ -250,9 +266,97 @@ var ProSearch = function ProSearch(_ref2) {
     });
     setModalVisible(false);
   };
+
+  // 4.1 "所有条目"：清空当前 Tab 的所有条件行（保留一个空行）
   var clearModal = function clearModal() {
     if (modalTab === 'include') setIncludeRows([newCondRow('I')]);else setExcludeRows([newCondRow('E')]);
   };
+
+  /**
+   * 4.1 "粘贴"：将剪贴板中复制的列内容粘贴到当前 Tab
+   * - 按换行（\r\n / \n / \r）或制表符（\t）拆分为多个值
+   * - 每个非空值生成一行：{ sign: 当前Tab符号, option: 'EQ', low: val, high: '' }
+   * - 追加到当前 Tab 的现有行之后（若只有一空行则先移除）
+   */
+  var pasteFromClipboard = /*#__PURE__*/function () {
+    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var text, values, sign, newRows, _t;
+      return _regenerator["default"].wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            text = '';
+            _context.prev = 1;
+            if (!(navigator.clipboard && navigator.clipboard.readText)) {
+              _context.next = 3;
+              break;
+            }
+            _context.next = 2;
+            return navigator.clipboard.readText();
+          case 2:
+            text = _context.sent;
+          case 3:
+            _context.next = 5;
+            break;
+          case 4:
+            _context.prev = 4;
+            _t = _context["catch"](1);
+          case 5:
+            if (text) {
+              _context.next = 6;
+              break;
+            }
+            _modal["default"].warning({
+              title: '粘贴失败',
+              content: '剪贴板为空或无法读取，请确认已复制列内容且浏览器授权剪贴板访问权限。'
+            });
+            return _context.abrupt("return");
+          case 6:
+            values = text.split(/[\r\n\t]+/).map(function (v) {
+              return v.trim();
+            }).filter(function (v) {
+              return v.length > 0;
+            });
+            if (values.length) {
+              _context.next = 7;
+              break;
+            }
+            return _context.abrupt("return");
+          case 7:
+            sign = modalTab === 'include' ? 'I' : 'E';
+            newRows = values.map(function (v) {
+              return {
+                id: genId(),
+                sign: sign,
+                option: 'EQ',
+                low: v,
+                high: ''
+              };
+            });
+            if (modalTab === 'include') {
+              setIncludeRows(function (prev) {
+                var base = prev.filter(function (r) {
+                  return r.low || r.high || r.option;
+                });
+                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 base.length ? [].concat(base, newRows) : newRows;
+              });
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 4]]);
+    }));
+    return function pasteFromClipboard() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   var handleSearch = function handleSearch() {
     var data = {};
     fields.forEach(function (f) {
@@ -492,17 +596,7 @@ var ProSearch = function ProSearch(_ref2) {
         fontSize: 12
       }
     }, field.techName));
-  }), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex',
-      justifyContent: 'center',
-      paddingTop: 8
-    }
-  }, /*#__PURE__*/React.createElement(_button["default"], {
-    type: "primary",
-    size: "small",
-    onClick: handleSearch
-  }, "\u67E5\u8BE2")), /*#__PURE__*/React.createElement(_modal["default"], {
+  }), /*#__PURE__*/React.createElement(_modal["default"], {
     title: "\u591A\u503C\u8BBE\u7F6E" + (activeField ? ' - ' + activeField.fieldDesc : ''),
     open: modalVisible,
     onCancel: function onCancel() {
@@ -510,7 +604,17 @@ var ProSearch = function ProSearch(_ref2) {
     },
     footer: null,
     width: 580,
-    destroyOnClose: true
+    destroyOnClose: true,
+    zIndex: 9999999,
+    getContainer: function getContainer() {
+      // 脱出画布 iframe，挂到主文档 body，避免被设计器蒙层盖住
+      try {
+        var topDoc = window.top && window.top.document || document;
+        return topDoc.body;
+      } catch (e) {
+        return document.body;
+      }
+    }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
@@ -552,19 +656,21 @@ var ProSearch = function ProSearch(_ref2) {
   }), /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
-      justifyContent: 'flex-end',
+      justifyContent: 'center',
       gap: 8,
       marginTop: 16
     }
   }, /*#__PURE__*/React.createElement(_button["default"], {
     onClick: clearModal
-  }, "\u6E05\u7A7A"), /*#__PURE__*/React.createElement(_button["default"], {
+  }, "\u6240\u6709\u6761\u76EE"), /*#__PURE__*/React.createElement(_button["default"], {
+    onClick: pasteFromClipboard
+  }, "\u7C98\u8D34"), /*#__PURE__*/React.createElement(_button["default"], {
+    type: "primary",
+    onClick: confirmModal
+  }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement(_button["default"], {
     onClick: function onClick() {
       return setModalVisible(false);
     }
-  }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(_button["default"], {
-    type: "primary",
-    onClick: confirmModal
-  }, "\u786E\u5B9A"))));
+  }, "\u53D6\u6D88"))));
 };
 var _default = exports["default"] = ProSearch;

package/lib/style.js

@@ -1,8 +1,8 @@
 require('@alifd/next/lib/button/style');
 require('antd/lib/message/style');
-require('antd/lib/modal/style');
 require('antd/lib/time-picker/style');
 require('antd/lib/date-picker/style');
+require('antd/lib/modal/style');
 require('antd/lib/button/style');
 require('antd/lib/input/style');
 require('antd/lib/select/style');

package/lowcode/pro-search/meta.ts

@@ -91,14 +91,15 @@ const ProSearchMeta: IPublicTypeComponentMetadata = {
           {
             name: 'descriptionAlign',
             title: { label: '字段描述对齐', tip: 'descriptionAlign | 字段描述对齐方式' },
-            propType: { type: 'oneOf', value: ['left', 'center', 'right'] },
+            propType: { type: 'oneOf', value: ['left', 'center', 'right', 'justify'] },
             setter: {
               componentName: 'RadioGroupSetter',
               props: {
                 options: [
-                  { title: '左', value: 'left' },
-                  { title: '居中', value: 'center' },
-                  { title: '右', value: 'right' },
+                  { title: '左对齐', value: 'left' },
+                  { title: '居中对齐', value: 'center' },
+                  { title: '右对齐', value: 'right' },
+                  { title: '两端对齐', value: 'justify' },
                 ],
               },
             },
@@ -128,14 +129,15 @@ const ProSearchMeta: IPublicTypeComponentMetadata = {
           {
             name: 'techNameAlign',
             title: { label: '技术名称对齐', tip: 'techNameAlign | 技术名称列对齐方式' },
-            propType: { type: 'oneOf', value: ['left', 'center', 'right'] },
+            propType: { type: 'oneOf', value: ['left', 'center', 'right', 'justify'] },
             setter: {
               componentName: 'RadioGroupSetter',
               props: {
                 options: [
-                  { title: '左', value: 'left' },
-                  { title: '居中', value: 'center' },
-                  { title: '右', value: 'right' },
+                  { title: '左对齐', value: 'left' },
+                  { title: '居中对齐', value: 'center' },
+                  { title: '右对齐', value: 'right' },
+                  { title: '两端对齐', value: 'justify' },
                 ],
               },
             },

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.87';
+    version = '1.0.88';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_es/pro-search/meta.js

@@ -120,20 +120,23 @@ var ProSearchMeta = {
         },
         propType: {
           type: 'oneOf',
-          value: ['left', 'center', 'right']
+          value: ['left', 'center', 'right', 'justify']
         },
         setter: {
           componentName: 'RadioGroupSetter',
           props: {
             options: [{
-              title: '左',
+              title: '左对齐',
               value: 'left'
             }, {
-              title: '居中',
+              title: '居中对齐',
               value: 'center'
             }, {
-              title: '右',
+              title: '右对齐',
               value: 'right'
+            }, {
+              title: '两端对齐',
+              value: 'justify'
             }]
           }
         },
@@ -173,20 +176,23 @@ var ProSearchMeta = {
         },
         propType: {
           type: 'oneOf',
-          value: ['left', 'center', 'right']
+          value: ['left', 'center', 'right', 'justify']
         },
         setter: {
           componentName: 'RadioGroupSetter',
           props: {
             options: [{
-              title: '左',
+              title: '左对齐',
               value: 'left'
             }, {
-              title: '居中',
+              title: '居中对齐',
               value: 'center'
             }, {
-              title: '右',
+              title: '右对齐',
               value: 'right'
+            }, {
+              title: '两端对齐',
+              value: 'justify'
             }]
           }
         },

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.87';
+    version = '1.0.88';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {