@ibiz-template/vue3-components 0.7.34 → 0.7.37-alpha.5

package/lib/common/pql-editor/pql-editor.cjs

@@ -100,8 +100,30 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
         }
       }
     };
+    const getEntitySuggestionItems = async (field) => {
+      if (!field || !field.appDataEntityId) {
+        return;
+      }
+      const service = await ibiz.hub.getAppDEService(props.context.srfappid, field.appDataEntityId, props.context);
+      const data = await service.fetchDefault(props.context, props.params);
+      if (data && Array.isArray(data.data)) {
+        const items = data.data;
+        if (items.length) {
+          return items.map((item) => {
+            return {
+              type: "pql-field-value",
+              label: item.srfmajortext,
+              value: item.srfkey
+            };
+          });
+        }
+        return [{
+          _msg: ibiz.i18n.t("control.common.currentNoData")
+        }];
+      }
+    };
     const getSuggestionItems = async () => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       if (!editor$1) {
         return [];
       }
@@ -109,6 +131,9 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       const {
         selection
       } = editor$1;
+      if (!selection) {
+        return [];
+      }
       if (selection && ((_b = (_a = selection.focus) == null ? void 0 : _a.path) == null ? void 0 : _b[0]) !== 0) {
         return [];
       }
@@ -129,6 +154,44 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
           return [];
         }
       }
+      const nodeItems = index.generateNodeItems(currenNode, getPreviousNode);
+      const nodeItem = nodeItems[nodeItems.length - 1];
+      if (nodeItem && nodeItem.type === "condition") {
+        if (((_e = nodeItem.operator) == null ? void 0 : _e.value) && index.InOPs.includes(nodeItem.operator.value)) {
+          if (nodeItem.value) {
+            if (currenNode === nodeItem.value[nodeItem.value.length - 1] && currenNode.text) {
+              const text = currenNode.text.slice(0, selection.focus.offset).trim();
+              if (text === "," || text === "[") {
+                const field = props.fields.find((item) => {
+                  var _a2;
+                  return item.appDEFieldId === ((_a2 = nodeItem.key) == null ? void 0 : _a2.value);
+                });
+                if (field && field.appCodeListId) {
+                  const items = await getCodeListItems(field.appCodeListId);
+                  return items.map((item) => {
+                    return {
+                      type: "pql-field-value",
+                      label: item.text,
+                      value: item.value
+                    };
+                  });
+                }
+                const entitySuggestionItems = await getEntitySuggestionItems(field);
+                if (entitySuggestionItems) {
+                  return entitySuggestionItems;
+                }
+              }
+              if (text === "]" || text === "[]") {
+                return connectionList;
+              }
+              if (nodeItem.value.length === 1 && text) {
+                return connectionList;
+              }
+            }
+          }
+          return [];
+        }
+      }
       if (currenNode && currenNode.type === "pql-field") {
         const field = props.fields.find((item) => item.appDEFieldId === currenNode.value);
         if (field && field.valueOPs) {
@@ -167,24 +230,9 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
                 };
               });
             }
-            if (field && field.appDataEntityId) {
-              const service = await ibiz.hub.getAppDEService(props.context.srfappid, field.appDataEntityId, props.context);
-              const data = await service.fetchDefault(props.context, props.params);
-              if (data && Array.isArray(data.data)) {
-                const items = data.data;
-                if (items.length) {
-                  return items.map((item) => {
-                    return {
-                      type: "pql-field-value",
-                      label: item.srfmajortext,
-                      value: item.srfkey
-                    };
-                  });
-                }
-                return [{
-                  _msg: "\u6682\u65E0\u6570\u636E"
-                }];
-              }
+            const entitySuggestionItems = await getEntitySuggestionItems(field);
+            if (entitySuggestionItems) {
+              return entitySuggestionItems;
             }
           }
         }
@@ -202,13 +250,13 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       if (currenNode && !currenNode.type) {
         const previousNode = getPreviousNode(currenNode);
         if (previousNode && previousNode.type === "pql-field-operator") {
-          if (((_e = editor$1.selection) == null ? void 0 : _e.focus.offset) !== 0) {
+          if (((_f = editor$1.selection) == null ? void 0 : _f.focus.offset) !== 0) {
             return connectionList;
           }
           return [];
         }
         if (previousNode && previousNode.type === "pql-field") {
-          if (((_f = editor$1.selection) == null ? void 0 : _f.focus.offset) !== 0) {
+          if (((_g = editor$1.selection) == null ? void 0 : _g.focus.offset) !== 0) {
             return connectionList;
           }
           const field = props.fields.find((item) => item.appDEFieldId === previousNode.value);
@@ -223,7 +271,7 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
           }
         }
         if (previousNode && previousNode.type === "pql-field-connection") {
-          if (((_g = editor$1.selection) == null ? void 0 : _g.focus.offset) !== 0) {
+          if (((_h = editor$1.selection) == null ? void 0 : _h.focus.offset) !== 0) {
             return connectionList;
           }
           return props.fields.map((item) => {
@@ -266,6 +314,10 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       };
       editor$1.insertNode(node);
       editor$1.move(1);
+      if (item.type === "pql-field-operator" && index.InOPs.includes(item.value)) {
+        editor$1.insertText("[]");
+        editor$1.moveReverse(1);
+      }
     };
     const showSuggestion = async () => {
       if (!editor$1) {
@@ -310,7 +362,7 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
     const errorMsg = vue.ref();
     const errorMsgEl = vue.ref();
     const verifyNode = () => {
-      var _a;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
       if (!editor$1) {
         return;
       }
@@ -319,137 +371,139 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       if (!children.length) {
         return;
       }
-      let last = {
-        type: "pql-field-connection"
-      };
-      for (let i = 0; i < children.length; i++) {
-        const child = children[i];
-        if (last.type === "pql-field-connection") {
-          if (child.type === "pql-field") {
-            last = child;
-          } else if (child.type === "pql-field-operator") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u5DE6\u503C\u3002",
-              child
-            };
-          } else if (child.type === "pql-field-value" || child.text) {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u5DE6\u503C\u3002",
-              child
-            };
-          } else if (child.type === "pql-field-connection") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8FDE\u63A5\u7B26\u7F3A\u5931\u8868\u8FBE\u5F0F",
-              child
-            };
-          }
-        } else if (last.type === "pql-field") {
-          if (child.type === "pql-field") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u64CD\u4F5C\u7B26\u3002",
-              child: children[i - 1] || child
-            };
-          }
-          if (child.type === "pql-field-operator") {
-            last = child;
-          } else if (child.type === "pql-field-value" || child.text) {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u64CD\u4F5C\u7B26\u3002",
-              child
-            };
-          } else if (child.type === "pql-field-connection") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u64CD\u4F5C\u7B26\u3002",
-              child: children[i - 1] || child
-            };
-          }
-        } else if (last.type === "pql-field-operator") {
-          if (last.value && index.ExcludeOPs.includes(last.value)) {
-            if (child.type === "pql-field") {
-              return {
-                msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u8FDE\u63A5\u7B26\u3002",
-                child
-              };
-            }
-            if (child.type === "pql-field-operator") {
-              return {
-                msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u8FDE\u63A5\u7B26\u3002",
-                child
-              };
-            }
-            if (child.type === "pql-field-value" || child.text) {
-              return {
-                msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u8FDE\u63A5\u7B26\u3002",
-                child
-              };
-            }
-            if (child.type === "pql-field-connection") {
-              last = child;
-            }
-          } else if (child.type === "pql-field") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u53F3\u503C\u3002",
-              child: children[i - 1] || child
-            };
-          } else if (child.type === "pql-field-operator") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u53F3\u503C\u3002",
-              child: children[i - 1] || child
-            };
-          } else if (child.type === "pql-field-value" || child.text) {
-            last = child;
-          } else if (child.type === "pql-field-connection") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u53F3\u503C\u3002",
-              child: children[i - 1] || child
-            };
-          }
-        } else if (last.type === "pql-field-value" || last.text) {
-          if (child.type === "pql-field") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u8FDE\u63A5\u7B26\u3002",
-              child
-            };
-          }
-          if (child.type === "pql-field-operator") {
-            return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u8FDE\u63A5\u7B26\u3002",
-              child
-            };
-          }
-          if (child.type === "pql-field-value" || child.text) {
+      const items = index.generateNodeItems(children[children.length - 1], getPreviousNode);
+      if (!items.length) {
+        return;
+      }
+      for (let i = 0; i < items.length; i++) {
+        const item = items[i];
+        if (item.type === "connection") {
+          if (((_b = items[i - 1]) == null ? void 0 : _b.type) === "connection" || i === 0 || i === items.length - 1) {
             return {
-              msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u8FDE\u63A5\u7B26\u3002",
-              child
+              msg: ibiz.i18n.t("component.pqlEditor.noExpression"),
+              child: (_c = item.value) == null ? void 0 : _c[0]
             };
           }
-          if (child.type === "pql-field-connection") {
-            last = child;
+          continue;
+        }
+        if (item.type === "condition" && ((_d = items[i - 1]) == null ? void 0 : _d.type) === "condition") {
+          let child;
+          if (item.key) {
+            child = item.key;
+          } else if (item.operator) {
+            child = item.operator;
+          } else if (item.value) {
+            child = (_e = item.value) == null ? void 0 : _e[0];
           }
+          return {
+            msg: ibiz.i18n.t("component.pqlEditor.noConnection"),
+            child
+          };
         }
-      }
-      if (last.type !== "pql-field-value" || !last.text) {
-        if (last.type === "pql-field") {
+        if (!item.key) {
+          let child;
+          if (item.operator) {
+            child = item.operator;
+          } else if (item.value) {
+            child = (_f = item.value) == null ? void 0 : _f[0];
+          }
           return {
-            msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u64CD\u4F5C\u7B26\u3002",
-            child: children[children.length - 1]
+            msg: ibiz.i18n.t("component.pqlEditor.noKey"),
+            child
           };
         }
-        if (last.type === "pql-field-operator") {
-          if (last.value && index.ExcludeOPs.includes(last.value)) {
-            return;
+        if (!item.operator) {
+          let child = item.key;
+          if (item.value) {
+            child = item.value[0];
+          } else if (items[i + 1]) {
+            if (items[i + 1].type === "connection") {
+              child = (_g = items[i + 1].value) == null ? void 0 : _g[0];
+            } else if (items[i + 1].key) {
+              child = items[i + 1].key;
+            } else if (items[i + 1].operator) {
+              child = items[i + 1].operator;
+            } else if (items[i + 1].value) {
+              child = (_h = items[i + 1].value) == null ? void 0 : _h[0];
+            }
           }
           return {
-            msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8868\u8FBE\u5F0F\u7F3A\u5931\u53F3\u503C\u3002",
-            child: children[children.length - 1]
+            msg: ibiz.i18n.t("component.pqlEditor.noOperator"),
+            child
           };
         }
-        if (last.type === "pql-field-connection") {
+        if (item.operator.value && !index.ExcludeOPs.includes(item.operator.value) && !item.value) {
+          let child = item.operator;
+          if (items[i + 1]) {
+            if (items[i + 1].type === "connection") {
+              child = (_i = items[i + 1].value) == null ? void 0 : _i[0];
+            } else if (items[i + 1].key) {
+              child = items[i + 1].key;
+            } else if (items[i + 1].operator) {
+              child = items[i + 1].operator;
+            } else if (items[i + 1].value) {
+              child = (_j = items[i + 1].value) == null ? void 0 : _j[0];
+            }
+          }
           return {
-            msg: "\u9519\u8BEF\u7684\u8868\u8FBE\u5F0F\u3002\u8FDE\u63A5\u7B26\u7F3A\u5931\u8868\u8FBE\u5F0F\u3002",
-            child: children[children.length - 1]
+            msg: ibiz.i18n.t("component.pqlEditor.noValue"),
+            child
           };
         }
+        if (item.operator.value && index.InOPs.includes(item.operator.value)) {
+          const value = item.value;
+          if (Array.isArray(value)) {
+            if (value.length > 1 && ((_k = value[0].text) == null ? void 0 : _k.trim()) !== "[") {
+              return {
+                msg: ibiz.i18n.t("component.pqlEditor.errorCombination"),
+                child: value[0]
+              };
+            }
+            let type = "value";
+            for (let j = 1; j < value.length; j++) {
+              if (j === value.length - 1) {
+                if (((_l = value[value.length - 1].text) == null ? void 0 : _l.trim()) !== "]") {
+                  let child = value[value.length - 1];
+                  if (child.type === "pql-field-value") {
+                    if (items[i + 1]) {
+                      if (items[i + 1].type === "connection") {
+                        child = (_m = items[i + 1].value) == null ? void 0 : _m[0];
+                      } else if (items[i + 1].key) {
+                        child = items[i + 1].key;
+                      } else if (items[i + 1].operator) {
+                        child = items[i + 1].operator;
+                      } else if (items[i + 1].value) {
+                        child = (_n = items[i + 1].value) == null ? void 0 : _n[0];
+                      }
+                    }
+                  }
+                  return {
+                    msg: ibiz.i18n.t("component.pqlEditor.errorCombination"),
+                    child
+                  };
+                }
+                continue;
+              }
+              if (type === "value") {
+                if (value[j].type !== "pql-field-value") {
+                  return {
+                    msg: ibiz.i18n.t("component.pqlEditor.errorDelimiter"),
+                    child: value[j]
+                  };
+                }
+                type = "text";
+              } else if (type === "text") {
+                if (value[j].type || ((_o = value[j].text) == null ? void 0 : _o.trim()) !== ",") {
+                  return {
+                    msg: ibiz.i18n.t("component.pqlEditor.noDelimiter"),
+                    child: value[j]
+                  };
+                }
+                type = "value";
+              }
+            }
+          }
+        }
       }
     };
     const verify = () => {
@@ -472,7 +526,7 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       }
       const pqlItems = index.parseCustomCond(props.value);
       if (pqlItems) {
-        const nodes = await index.pqlItemsToPqlNodes(pqlItems, props.fields, getCodeListItems);
+        const nodes = await index.pqlItemsToPqlNodes(pqlItems);
         if (nodes && nodes.length) {
           const html = index.pqlNodesToHtml(nodes);
           currentValue.value = props.value;
@@ -496,7 +550,7 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       }
       const pqlItems = index.parseCustomCond(props.value);
       if (pqlItems) {
-        const nodes = await index.pqlItemsToPqlNodes(pqlItems, props.fields, getCodeListItems);
+        const nodes = await index.pqlItemsToPqlNodes(pqlItems);
         if (nodes && nodes.length) {
           const html = index.pqlNodesToHtml(nodes);
           currentValue.value = props.value;
@@ -538,7 +592,7 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
         }
         if (!msg) {
           try {
-            const items = index.generateItems(children);
+            const items = index.generateNodeItems(children[children.length - 1], getPreviousNode);
             const customCond = index.generateCustomCond(items, props.fields);
             currentValue.value = customCond;
             emit("change", customCond);
@@ -584,6 +638,11 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       editor$1.setHtml(htmlText.value);
       cleanupKeydown = core.listenJSEvent(editorRef.value, "keydown", (event) => {
         setTimeout(() => {
+          if ((event.key === "ArrowUp" || event.key === "ArrowDown") && editor$1) {
+            setTimeout(() => {
+              showSuggestion();
+            }, 10);
+          }
           if ((event.key === "ArrowLeft" || event.key === "ArrowRight") && editor$1) {
             const {
               selection

package/lib/common/pql-editor/pql-editor.module.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
 var editor = require('@wangeditor/editor');
-require('../../node_modules/.pnpm/snabbdom@3.6.2/node_modules/snabbdom/build/index.cjs');
+require('../../node_modules/.pnpm/snabbdom@3.5.1/node_modules/snabbdom/build/index.cjs');
 var index = require('./utils/index.cjs');
-var h = require('../../node_modules/.pnpm/snabbdom@3.6.2/node_modules/snabbdom/build/h.cjs');
+var h = require('../../node_modules/.pnpm/snabbdom@3.5.1/node_modules/snabbdom/build/h.cjs');
 
 "use strict";
 const pqlType = [