@ibiz-template/vue3-components 0.7.31-alpha.0 → 0.7.34

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

@@ -34,6 +34,9 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       type: Object,
       required: true
     },
+    params: {
+      type: Object
+    },
     renderItem: {
       type: Function
     }
@@ -98,19 +101,31 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const getSuggestionItems = async () => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f, _g;
       if (!editor$1) {
         return [];
       }
       const currenNode = getCurrentNode();
-      const nodes = ((_a = editor$1.children[0]) == null ? void 0 : _a.children) || [];
-      const children = nodes.filter((node) => node.type || node.text);
-      if (!currenNode && children.length) {
+      const {
+        selection
+      } = editor$1;
+      if (selection && ((_b = (_a = selection.focus) == null ? void 0 : _a.path) == null ? void 0 : _b[0]) !== 0) {
         return [];
       }
+      if (!currenNode) {
+        if (selection && ((_c = selection.focus) == null ? void 0 : _c.offset) === 0) {
+          const node = editor.SlateEditor.node(editor$1, selection)[0];
+          if (node) {
+            const el = editor$1.toDOMNode(node);
+            if (index.isMove(el)) {
+              return [];
+            }
+          }
+        }
+      }
       if (editor$1.selection) {
         const node = editor.SlateEditor.node(editor$1, editor$1.selection);
-        if (node && ((_b = node[0]) == null ? void 0 : _b.type)) {
+        if (node && ((_d = node[0]) == null ? void 0 : _d.type)) {
           return [];
         }
       }
@@ -133,6 +148,9 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       if (currenNode && currenNode.type === "pql-field-operator") {
         const mode = index.FilterModes.find((_mode) => _mode.valueOP === currenNode.value);
         if (mode) {
+          if (index.InputOPs.includes(mode.valueOP)) {
+            return [];
+          }
           if (index.ExcludeOPs.includes(mode.valueOP)) {
             return connectionList;
           }
@@ -149,6 +167,25 @@ 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"
+                }];
+              }
+            }
           }
         }
         return [];
@@ -165,13 +202,13 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
       if (currenNode && !currenNode.type) {
         const previousNode = getPreviousNode(currenNode);
         if (previousNode && previousNode.type === "pql-field-operator") {
-          if (((_c = editor$1.selection) == null ? void 0 : _c.focus.offset) !== 0) {
+          if (((_e = editor$1.selection) == null ? void 0 : _e.focus.offset) !== 0) {
             return connectionList;
           }
           return [];
         }
         if (previousNode && previousNode.type === "pql-field") {
-          if (((_d = editor$1.selection) == null ? void 0 : _d.focus.offset) !== 0) {
+          if (((_f = editor$1.selection) == null ? void 0 : _f.focus.offset) !== 0) {
             return connectionList;
           }
           const field = props.fields.find((item) => item.appDEFieldId === previousNode.value);
@@ -186,7 +223,7 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
           }
         }
         if (previousNode && previousNode.type === "pql-field-connection") {
-          if (((_e = editor$1.selection) == null ? void 0 : _e.focus.offset) !== 0) {
+          if (((_g = editor$1.selection) == null ? void 0 : _g.focus.offset) !== 0) {
             return connectionList;
           }
           return props.fields.map((item) => {
@@ -248,6 +285,9 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
         return;
       }
       const items = await getSuggestionItems();
+      if (overlayPopover || !editor$1.isFocused()) {
+        return;
+      }
       if (!items || !items.length) {
         return;
       }
@@ -567,7 +607,7 @@ const IBizPqlEditor = /* @__PURE__ */ vue.defineComponent({
             }, 10);
           }
         }, 10);
-        if (event.key === "Escape") {
+        if (event.key === "Escape" || event.key === "Enter") {
           event.stopPropagation();
           overlayPopover == null ? void 0 : overlayPopover.dismiss();
         }

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.5.1/node_modules/snabbdom/build/index.cjs');
+require('../../node_modules/.pnpm/snabbdom@3.6.2/node_modules/snabbdom/build/index.cjs');
 var index = require('./utils/index.cjs');
-var h = require('../../node_modules/.pnpm/snabbdom@3.5.1/node_modules/snabbdom/build/h.cjs');
+var h = require('../../node_modules/.pnpm/snabbdom@3.6.2/node_modules/snabbdom/build/h.cjs');
 
 "use strict";
 const pqlType = [

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

@@ -11,16 +11,15 @@ const FilterModes = [
   { valueOP: runtime.ValueOP.GT_AND_EQ, label: "\u5927\u4E8E\u7B49\u4E8E", sqlOP: ">=" },
   { valueOP: runtime.ValueOP.LT, label: "\u5C0F\u4E8E", sqlOP: "<" },
   { valueOP: runtime.ValueOP.LT_AND_EQ, label: "\u5C0F\u4E8E\u7B49\u4E8E", sqlOP: "<=" },
-  { valueOP: runtime.ValueOP.IS_NULL, label: "\u4E3A\u7A7A", sqlOP: "Nil" },
-  { valueOP: runtime.ValueOP.IS_NOT_NULL, label: "\u975E\u7A7A", sqlOP: "NotNil" },
-  { valueOP: runtime.ValueOP.IN, label: "\u5C5E\u4E8E", sqlOP: "In" },
-  { valueOP: runtime.ValueOP.NOT_IN, label: "\u4E0D\u5C5E\u4E8E", sqlOP: "NotIn" },
-  { valueOP: runtime.ValueOP.LIKE, label: "\u6587\u672C\u5305\u542B", sqlOP: "%" },
-  { valueOP: runtime.ValueOP.LIFT_LIKE, label: "\u6587\u672C\u5DE6\u5305\u542B", sqlOP: "%#" },
-  { valueOP: runtime.ValueOP.RIGHT_LIKE, label: "\u6587\u672C\u53F3\u5305\u542B", sqlOP: "#%" },
-  { valueOP: runtime.ValueOP.EXISTS, label: "\u5B58\u5728", sqlOP: "EXISTS" },
-  { valueOP: runtime.ValueOP.NOT_EXISTS, label: "\u4E0D\u5B58\u5728", sqlOP: "NOTEXISTS" }
+  { valueOP: runtime.ValueOP.IS_NULL, label: "\u4E3A\u7A7A", sqlOP: "IS NULL" },
+  { valueOP: runtime.ValueOP.IS_NOT_NULL, label: "\u975E\u7A7A", sqlOP: "IS NOT NULL" },
+  { valueOP: runtime.ValueOP.IN, label: "\u5C5E\u4E8E", sqlOP: "IN" },
+  { valueOP: runtime.ValueOP.NOT_IN, label: "\u4E0D\u5C5E\u4E8E", sqlOP: "NOT IN" },
+  { valueOP: runtime.ValueOP.LIKE, label: "\u6587\u672C\u5305\u542B", sqlOP: "LIKE" }
+  // { valueOP: ValueOP.EXISTS, label: '存在', sqlOP: 'EXISTS' },
+  // { valueOP: ValueOP.NOT_EXISTS, label: '不存在', sqlOP: 'NOT EXISTS' },
 ];
+const InputOPs = [runtime.ValueOP.IN, runtime.ValueOP.NOT_IN, runtime.ValueOP.LIKE];
 const ExcludeOPs = [
   runtime.ValueOP.IS_NULL,
   runtime.ValueOP.IS_NOT_NULL,
@@ -88,6 +87,7 @@ const generateItems = (children) => {
               value: operator.value
             },
             value: {
+              type: value.type,
               label: value.type === "pql-field-value" ? value.label : value.text,
               value: value.type === "pql-field-value" ? value.value : value.text
             }
@@ -111,14 +111,17 @@ const generateCustomCond = (items, fields) => {
     if (item.type === "condition") {
       const { key, operator, value } = item;
       const symbol = (_a = filterModeMap.get(operator == null ? void 0 : operator.value)) == null ? void 0 : _a.sqlOP;
-      cond += "$".concat(JSON.stringify({
-        name: (key == null ? void 0 : key.value) || "",
-        caption: (key == null ? void 0 : key.label) || ""
-      }), "  ").concat(symbol, "  $").concat(JSON.stringify({
+      const valueText = ((value == null ? void 0 : value.value) || "").replace(/\s+/g, " ");
+      const valueObj = "$".concat(JSON.stringify({
         value: (value == null ? void 0 : value.value) || "",
         caption: (value == null ? void 0 : value.label) || "",
         field: "".concat(((_b = map.get((key == null ? void 0 : key.value) || "")) == null ? void 0 : _b.appDataEntityFullTag) || "", ".").concat((key == null ? void 0 : key.value) || "")
       }));
+      const valueStr = value ? "  ".concat((value == null ? void 0 : value.type) ? valueObj : valueText) : "";
+      cond += "$".concat(JSON.stringify({
+        name: (key == null ? void 0 : key.value) || "",
+        caption: (key == null ? void 0 : key.label) || ""
+      }), "  ").concat(symbol).concat(valueStr);
     }
     if (item.type === "connection") {
       cond += "  ".concat((_c = item.value) == null ? void 0 : _c.value, "  ");
@@ -127,7 +130,7 @@ const generateCustomCond = (items, fields) => {
   return cond;
 };
 const parseCustomCond = (cond) => {
-  var _a;
+  var _a, _b;
   try {
     const items = cond.split("  ");
     const pqlItems = [];
@@ -151,26 +154,44 @@ const parseCustomCond = (cond) => {
       }
       const key = items[i !== 0 ? ++i : i];
       const operator = items[++i];
-      const value = items[++i];
-      if (key && /^\$/.test(key) && operator && value && /^\$/.test(value)) {
+      if (key && /^\$/.test(key) && operator) {
         const keyObj = JSON.parse(key.slice(1));
-        const valueObj = JSON.parse(value.slice(1));
-        pqlItems.push({
-          type: "condition",
-          key: {
-            label: keyObj.caption,
-            value: keyObj.name
-          },
-          operator: {
-            label: ((_a = filterModeMap.get(symbolMap.get(operator))) == null ? void 0 : _a.label) || "",
-            value: symbolMap.get(operator)
-          },
-          value: {
-            label: valueObj.caption,
-            value: valueObj.value
+        if (ExcludeOPs.includes(symbolMap.get(operator))) {
+          pqlItems.push({
+            type: "condition",
+            key: {
+              label: keyObj.caption,
+              value: keyObj.name
+            },
+            operator: {
+              label: ((_a = filterModeMap.get(symbolMap.get(operator))) == null ? void 0 : _a.label) || "",
+              value: symbolMap.get(operator)
+            }
+          });
+          continue;
+        } else {
+          const value = items[++i];
+          if (value) {
+            const valueObj = /^\$/.test(value) ? JSON.parse(value.slice(1)) : { caption: value, value };
+            pqlItems.push({
+              type: "condition",
+              key: {
+                label: keyObj.caption,
+                value: keyObj.name
+              },
+              operator: {
+                label: ((_b = filterModeMap.get(symbolMap.get(operator))) == null ? void 0 : _b.label) || "",
+                value: symbolMap.get(operator)
+              },
+              value: {
+                type: /^\$/.test(value) ? "pql-field-value" : void 0,
+                label: valueObj.caption,
+                value: valueObj.value
+              }
+            });
+            continue;
           }
-        });
-        continue;
+        }
       }
       throw new core.RuntimeError("pql\u81EA\u5B9A\u4E49\u6761\u4EF6\u89E3\u6790\u9519\u8BEF");
     }
@@ -213,7 +234,11 @@ const pqlItemsToPqlNodes = async (items, fields, getCodeListItems) => {
         value: operator == null ? void 0 : operator.value
       });
       const field = fields.find((child) => child.appDEFieldId === (key == null ? void 0 : key.value));
-      if (field && field.appCodeListId) {
+      if (!(value == null ? void 0 : value.type)) {
+        nodes.push({
+          text: value == null ? void 0 : value.value
+        });
+      } else if (field && field.appCodeListId) {
         const codeItems = codeListMap.get(field.appDEFieldId);
         const codeItem = codeItems == null ? void 0 : codeItems.find((child) => child.value === (value == null ? void 0 : value.value));
         if (codeItem) {
@@ -227,6 +252,18 @@ const pqlItemsToPqlNodes = async (items, fields, getCodeListItems) => {
             text: value == null ? void 0 : value.value
           });
         }
+      } else if (field && field.appDataEntityId) {
+        if ((value == null ? void 0 : value.label) !== (value == null ? void 0 : value.value)) {
+          nodes.push({
+            type: "pql-field-value",
+            label: value == null ? void 0 : value.label,
+            value: value == null ? void 0 : value.value
+          });
+        } else {
+          nodes.push({
+            text: value == null ? void 0 : value.value
+          });
+        }
       } else {
         nodes.push({
           text: value == null ? void 0 : value.value
@@ -271,6 +308,7 @@ function isMove(el) {
 
 exports.ExcludeOPs = ExcludeOPs;
 exports.FilterModes = FilterModes;
+exports.InputOPs = InputOPs;
 exports.generateCustomCond = generateCustomCond;
 exports.generateItems = generateItems;
 exports.isMove = isMove;

package/lib/control/dashboard/dashboard.cjs

@@ -4,12 +4,15 @@ var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 require('./dashboard.css');
 var runtime = require('@ibiz-template/runtime');
+var lodashEs = require('lodash-es');
 
 "use strict";
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
 }
+const refreshTagObj = {};
 function renderPortletByType(model, c, opts) {
+  var _a;
   const provider = c.providers[model.id];
   const controller = c.portlets[model.id];
   const commonProps = {
@@ -27,14 +30,14 @@ function renderPortletByType(model, c, opts) {
       key: model.id
     }, {
       default: () => {
-        var _a;
-        return (_a = container.controls) == null ? void 0 : _a.map((child) => renderPortletByType(child, c, opts));
+        var _a2;
+        return (_a2 = container.controls) == null ? void 0 : _a2.map((child) => renderPortletByType(child, c, opts));
       }
     });
   }
   return vue.h(providerComp, {
     ...commonProps,
-    key: model.id
+    key: ((_a = refreshTagObj[model.id]) == null ? void 0 : _a.refreshtag) ? refreshTagObj[model.id].refreshtag : model.id
   });
 }
 const DashboardControl = /* @__PURE__ */ vue.defineComponent({
@@ -66,6 +69,25 @@ const DashboardControl = /* @__PURE__ */ vue.defineComponent({
         portlet.state = vue.reactive(portlet.state);
       });
     });
+    c.evt.on("onItemModelReset", async (args) => {
+      const {
+        name
+      } = args;
+      const targetIndex = customModelDatas.value.findIndex((item) => {
+        return item.id === name;
+      });
+      if (targetIndex !== -1) {
+        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const model = await c.loadDynaPortletById("".concat(app.model.codeName, ".").concat(name));
+        if (model) {
+          refreshTagObj[model.id] = {
+            refreshtag: lodashEs.uniqueId()
+          };
+          customModelDatas.value.splice(targetIndex, 1, model);
+          vue$1.$forceUpdate();
+        }
+      }
+    });
     const handleCustomModelChange = (args) => {
       customModelDatas.value = args.model;
       vue$1.$forceUpdate();

package/lib/control/drtab/drtab-control.util.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var vue = require('vue');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.30_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.32_axios@1.7.2_lodash-es@4.17.21_qs@6.12.3_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 
 "use strict";
 function useAppDRTab(c, controlRef, counterData) {

package/lib/control/form/form-detail/form-rawitem/form-rawitem.cjs

@@ -64,11 +64,18 @@ const FormRawItem = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
+    var _a;
     if (!this.controller.state.visible) {
       return null;
     }
     return vue.createVNode(vue.resolveComponent("iBizRawItem"), {
-      "class": [this.ns.b(), ...this.controller.containerClass, this.ns.is("show-default", this.showFormDefaultContent)],
+      "class": [
+        this.ns.b(),
+        ...this.controller.containerClass,
+        this.ns.is("show-default", this.showFormDefaultContent),
+        // 表单直接内容文本类型与直接内容类型应具备与标签相同样式
+        this.ns.is("form-text", ["TEXT", "RAW"].includes(((_a = this.modelData.rawItem) == null ? void 0 : _a.contentType) || ""))
+      ],
       "rawItem": this.modelData,
       "content": this.content,
       "onClick": (event) => this.controller.onClick(event)

package/lib/control/form/form-detail/form-rawitem/form-rawitem.css

@@ -1 +1 @@
-.ibiz-form-raw-item{width:100%;height:100%}.ibiz-form-raw-item.is-show-default{padding:var(--ibiz-spacing-none) 11px}
+.ibiz-form-raw-item{--ibiz-form-rawitem-line-height:var(--ibiz-height-control-default);--ibiz-form-rawitem-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight);--ibiz-form-rawitem-font-size:var(--ibiz-font-size-regular);width:100%;height:100%}.ibiz-form-raw-item.is-form-text{padding:var(--ibiz-form-rawitem-padding);font-size:var(--ibiz-form-rawitem-font-size);line-height:var(--ibiz-form-rawitem-line-height)}.ibiz-form-raw-item.is-show-default{padding:var(--ibiz-spacing-none) 11px}

package/lib/control/grid/grid/grid.cjs

@@ -331,6 +331,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       return;
     }
     const state = this.c.state;
+    const defaultExpandAll = this.c.controlParams.defaultexpandall === "true";
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "class": [this.ns.is("show-header", !this.c.state.hideHeader), this.ns.is("enable-page", this.c.state.enablePagingBar), this.ns.is("enable-group", this.c.model.enableGroup), this.ns.is("single-select", state.singleSelect), this.ns.is("empty", state.items.length === 0), this.ns.is("enable-customized", this.c.model.enableCustomized)],
       "controller": this.c,
@@ -349,6 +350,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         "header-cell-class-name": this.handleHeaderCellClassName,
         "row-key": "tempsrfkey",
         "data": this.tableData,
+        "default-expand-all": defaultExpandAll,
         "span-method": this.spanMethod,
         "onRowClick": this.onRowClick,
         "onRowDblclick": this.onDbRowClick,

package/lib/control/search-bar/filter-tree/filter-tree.cjs

@@ -91,6 +91,13 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     },
     context: {
       type: Object
+    },
+    params: {
+      type: Object
+    },
+    schemaEntityMap: {
+      type: Object,
+      default: () => /* @__PURE__ */ new Map()
     }
   },
   emits: ["confirm", "cancel", "change", "customCondChange"],
@@ -157,7 +164,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     });
     const schemaFields = vue.ref([]);
     allFields.forEach(async (field) => {
-      var _a, _b, _c;
+      var _a, _b;
       const filterController = props.filterControllers.find((item) => item.key === field.name);
       if (!filterController) {
         return;
@@ -166,9 +173,9 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         appDEFieldId: field.fieldName,
         caption: field.label,
         valueOPs: field.valueOPs,
-        appDataEntity: (_a = filterController.appDataEntity) == null ? void 0 : _a.id,
-        appDataEntityFullTag: (_b = filterController.appDataEntity) == null ? void 0 : _b.defullTag,
-        appCodeListId: (_c = filterController.model.editor) == null ? void 0 : _c.appCodeListId
+        appDataEntityId: props.schemaEntityMap.get(field.fieldName),
+        appDataEntityFullTag: (_a = filterController.appDataEntity) == null ? void 0 : _a.defullTag,
+        appCodeListId: (_b = filterController.model.editor) == null ? void 0 : _b.appCodeListId
       });
     });
     const pqlEditor = vue.ref();
@@ -396,6 +403,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         "value": currentCustomCond.value,
         "fields": schemaFields.value,
         "context": props.context,
+        "params": props.params,
         "onChange": handleCustomCondChange
       }, null)]), mode.value !== "pql" && vue.createVNode("div", {
         "class": ns.be("group", "list")

package/lib/control/search-bar/search-bar.cjs

@@ -73,6 +73,8 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
           "filterMode": c.state.filterMode,
           "customCond": c.state.customCond,
           "context": c.context,
+          "params": c.params,
+          "schemaEntityMap": c.schemaEntityMap,
           "onCustomCondChange": (customCond) => {
             c.state.customCond = customCond;
           },