@openli1115/lowcode-edit-pro-table 1.0.100 → 1.0.103

package/es/components/ProSearch/index.js

@@ -378,6 +378,33 @@ var ProSearch = function ProSearch(_ref2) {
         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));
       }
       if (rows.length) data[si] = rows;
+
+      // 将查询条件写入 window.screenStructures，供 executeLogicEngine 调用 generateStructureForm 时读取
+      var win = window;
+      if (!win.screenStructures) win.screenStructures = {};
+      if (!win.customTypeMap) win.customTypeMap = {};
+      var screenRows = [];
+      if (fv.conditions.length) {
+        fv.conditions.forEach(function (c) {
+          if (c.low || c.high || c.option) {
+            screenRows.push({
+              sign: c.sign,
+              option: c.option || 'EQ',
+              low: c.low || '',
+              high: c.high || ''
+            });
+          }
+        });
+      } else if (fv.low || fv.high) {
+        screenRows.push({
+          sign: 'I',
+          option: fv.high ? 'BT' : 'EQ',
+          low: fv.low || '',
+          high: fv.high || ''
+        });
+      }
+      win.screenStructures[si] = screenRows;
+      win.customTypeMap[si] = '4';
     });
     onSearch && onSearch(data);
   };
@@ -511,16 +538,20 @@ var ProSearch = function ProSearch(_ref2) {
     style: _extends({
       display: 'flex',
       padding: '4px 8px',
-      borderBottom: '1px solid #e8e8e8'
+      gap: 6,
+      borderBottom: '1px solid #e8e8e8',
+      background: '#fafafa'
     }, headerSize)
   }, showDescription && /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 2,
-      textAlign: descriptionAlign
+      textAlign: descriptionAlign,
+      paddingRight: 4
     }
   }, "\u5B57\u6BB5\u63CF\u8FF0"), /*#__PURE__*/React.createElement("div", {
     style: {
-      flex: 3
+      flex: 3,
+      textAlign: 'center'
     }
   }, "\u8D77\u59CB\u503C"), showHighValue && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -529,7 +560,8 @@ var ProSearch = function ProSearch(_ref2) {
     }
   }, "\u5230"), showHighValue && /*#__PURE__*/React.createElement("div", {
     style: {
-      flex: 3
+      flex: 3,
+      textAlign: 'center'
     }
   }, "\u5230\u503C"), multiValue && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -539,7 +571,7 @@ var ProSearch = function ProSearch(_ref2) {
   }, "\u591A\u503C"), showTechName && /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 3,
-      textAlign: techNameAlign
+      textAlign: 'center'
     }
   }, "\u6280\u672F\u540D\u79F0")), fields.length === 0 && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -634,13 +666,7 @@ var ProSearch = function ProSearch(_ref2) {
     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;
-      }
+      return document.body;
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {

package/lib/components/ProSearch/index.js

@@ -384,6 +384,33 @@ var ProSearch = function ProSearch(_ref2) {
         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));
       }
       if (rows.length) data[si] = rows;
+
+      // 将查询条件写入 window.screenStructures，供 executeLogicEngine 调用 generateStructureForm 时读取
+      var win = window;
+      if (!win.screenStructures) win.screenStructures = {};
+      if (!win.customTypeMap) win.customTypeMap = {};
+      var screenRows = [];
+      if (fv.conditions.length) {
+        fv.conditions.forEach(function (c) {
+          if (c.low || c.high || c.option) {
+            screenRows.push({
+              sign: c.sign,
+              option: c.option || 'EQ',
+              low: c.low || '',
+              high: c.high || ''
+            });
+          }
+        });
+      } else if (fv.low || fv.high) {
+        screenRows.push({
+          sign: 'I',
+          option: fv.high ? 'BT' : 'EQ',
+          low: fv.low || '',
+          high: fv.high || ''
+        });
+      }
+      win.screenStructures[si] = screenRows;
+      win.customTypeMap[si] = '4';
     });
     onSearch && onSearch(data);
   };
@@ -517,16 +544,20 @@ var ProSearch = function ProSearch(_ref2) {
     style: (0, _extends6["default"])({
       display: 'flex',
       padding: '4px 8px',
-      borderBottom: '1px solid #e8e8e8'
+      gap: 6,
+      borderBottom: '1px solid #e8e8e8',
+      background: '#fafafa'
     }, headerSize)
   }, showDescription && /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 2,
-      textAlign: descriptionAlign
+      textAlign: descriptionAlign,
+      paddingRight: 4
     }
   }, "\u5B57\u6BB5\u63CF\u8FF0"), /*#__PURE__*/React.createElement("div", {
     style: {
-      flex: 3
+      flex: 3,
+      textAlign: 'center'
     }
   }, "\u8D77\u59CB\u503C"), showHighValue && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -535,7 +566,8 @@ var ProSearch = function ProSearch(_ref2) {
     }
   }, "\u5230"), showHighValue && /*#__PURE__*/React.createElement("div", {
     style: {
-      flex: 3
+      flex: 3,
+      textAlign: 'center'
     }
   }, "\u5230\u503C"), multiValue && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -545,7 +577,7 @@ var ProSearch = function ProSearch(_ref2) {
   }, "\u591A\u503C"), showTechName && /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 3,
-      textAlign: techNameAlign
+      textAlign: 'center'
     }
   }, "\u6280\u672F\u540D\u79F0")), fields.length === 0 && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -640,13 +672,7 @@ var ProSearch = function ProSearch(_ref2) {
     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;
-      }
+      return document.body;
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {

package/lowcode/pro-search/meta.ts

@@ -1,5 +1,7 @@
 import { IPublicTypeComponentMetadata, IPublicTypeSnippet } from '@alilc/lowcode-types';
 
+const SEARCH_ICON = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxjaXJjbGUgY3g9IjExIiBjeT0iMTEiIHI9IjgiLz48bGluZSB4MT0iMjEiIHkxPSIyMSIgeDI9IjE2LjY1IiB5Mj0iMTYuNjUiLz48L3N2Zz4=';
+
 const ProSearchMeta: IPublicTypeComponentMetadata = {
   componentName: 'ProSearch',
   title: '查询条件',
@@ -166,7 +168,7 @@ const ProSearchMeta: IPublicTypeComponentMetadata = {
 const snippets: IPublicTypeSnippet[] = [
   {
     title: '查询条件',
-    screenshot: '',
+    screenshot: SEARCH_ICON,
     schema: {
       componentName: 'ProSearch',
       props: {
@@ -182,5 +184,6 @@ const snippets: IPublicTypeSnippet[] = [
 
 export default {
   ...ProSearchMeta,
+  icon: SEARCH_ICON,
   snippets,
 };

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

package/lowcode_es/pro-search/meta.d.ts

@@ -1,10 +1,10 @@
 import { IPublicTypeSnippet } from '@alilc/lowcode-types';
 declare const _default: {
+    icon: string;
     snippets: IPublicTypeSnippet[];
     componentName: string;
     uri?: string;
     title?: import("@alilc/lowcode-types").IPublicTypeTitleContent;
-    icon?: import("@alilc/lowcode-types").IPublicTypeIconType;
     tags?: string[];
     description?: string;
     docUrl?: string;

package/lowcode_es/pro-search/meta.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+var SEARCH_ICON = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxjaXJjbGUgY3g9IjExIiBjeT0iMTEiIHI9IjgiLz48bGluZSB4MT0iMjEiIHkxPSIyMSIgeDI9IjE2LjY1IiB5Mj0iMTYuNjUiLz48L3N2Zz4=';
 var ProSearchMeta = {
   componentName: 'ProSearch',
   title: '查询条件',
@@ -215,7 +216,7 @@ var ProSearchMeta = {
 };
 var snippets = [{
   title: '查询条件',
-  screenshot: '',
+  screenshot: SEARCH_ICON,
   schema: {
     componentName: 'ProSearch',
     props: {
@@ -228,5 +229,6 @@ var snippets = [{
   }
 }];
 export default _extends({}, ProSearchMeta, {
+  icon: SEARCH_ICON,
   snippets: snippets
 });

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

package/lowcode_lib/pro-search/meta.d.ts

@@ -1,10 +1,10 @@
 import { IPublicTypeSnippet } from '@alilc/lowcode-types';
 declare const _default: {
+    icon: string;
     snippets: IPublicTypeSnippet[];
     componentName: string;
     uri?: string;
     title?: import("@alilc/lowcode-types").IPublicTypeTitleContent;
-    icon?: import("@alilc/lowcode-types").IPublicTypeIconType;
     tags?: string[];
     description?: string;
     docUrl?: string;

package/lowcode_lib/pro-search/meta.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var SEARCH_ICON = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxjaXJjbGUgY3g9IjExIiBjeT0iMTEiIHI9IjgiLz48bGluZSB4MT0iMjEiIHkxPSIyMSIgeDI9IjE2LjY1IiB5Mj0iMTYuNjUiLz48L3N2Zz4=';
 var ProSearchMeta = {
   componentName: 'ProSearch',
   title: '查询条件',
@@ -220,7 +221,7 @@ var ProSearchMeta = {
 };
 var snippets = [{
   title: '查询条件',
-  screenshot: '',
+  screenshot: SEARCH_ICON,
   schema: {
     componentName: 'ProSearch',
     props: {
@@ -233,5 +234,6 @@ var snippets = [{
   }
 }];
 var _default = exports["default"] = (0, _extends2["default"])({}, ProSearchMeta, {
+  icon: SEARCH_ICON,
   snippets: snippets
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openli1115/lowcode-edit-pro-table",
-  "version": "1.0.100",
+  "version": "1.0.103",
   "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.100/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.103/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.100/build/index.html"
+  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.103/build/index.html"
 }