@ibiz-template/vue3-components 0.7.41-alpha.1 → 0.7.41-alpha.3

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

@@ -73,6 +73,14 @@ function useITableEvent(c) {
       }
     }, 300);
   }
+  const allGridColumns = [];
+  core.recursiveIterate(
+    c.model,
+    (column) => {
+      allGridColumns.push(column);
+    },
+    { childrenFields: ["degridColumns"] }
+  );
   c.evt.on("onToggleRowExpansion", (event) => {
     const { row, expand } = event;
     if (tableRef.value) {
@@ -359,8 +367,7 @@ function useITableEvent(c) {
     _rowIndex,
     _columnIndex
   }) {
-    var _a;
-    const columnModel = (_a = c.model.degridColumns) == null ? void 0 : _a.find((gridColumn) => {
+    const columnModel = allGridColumns.find((gridColumn) => {
       return gridColumn.codeName === column.property;
     });
     if (columnModel && columnModel.headerSysCss && columnModel.headerSysCss.cssName) {
@@ -435,7 +442,7 @@ function useAppGridPagination(c) {
   }
   return { onPageChange, onPageSizeChange, onPageRefresh };
 }
-function useAppGridBase(c, props) {
+function useAppGridBase(c, props, tableRef) {
   const initSimpleData = () => {
     if (!props.data) {
       return;
@@ -590,6 +597,26 @@ function useAppGridBase(c, props) {
     rowIndex,
     columnIndex
   }) => {
+    var _a;
+    const spanMethodAttribute = (_a = c.model.controlAttributes) == null ? void 0 : _a.find((item) => {
+      return item.attrName === "span-method" && item.attrValue;
+    });
+    if (spanMethodAttribute) {
+      return runtime.ScriptFactory.execScriptFn(
+        {
+          ...c.getEventArgs(),
+          metadata: {
+            row,
+            column,
+            rowIndex,
+            columnIndex,
+            items: tableRef.value.store.states.data.value
+          }
+        },
+        spanMethodAttribute.attrValue,
+        { isAsync: false }
+      );
+    }
     const { property } = column;
     const { rowspankeys = [], colspankeys = [] } = c.controlParams;
     if (rowspankeys.length > 0 && rowspankeys.includes(property)) {

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

@@ -20,10 +20,12 @@ function renderAttrs(model, params) {
   var _a;
   const attrs = {};
   (_a = model.controlAttributes) == null ? void 0 : _a.forEach((item) => {
-    if (item.attrName && item.attrValue) {
-      attrs[item.attrName] = runtime.ScriptFactory.execSingleLine(item.attrValue, {
-        ...params
-      });
+    if (item.attrName !== "span-method") {
+      if (item.attrName && item.attrValue) {
+        attrs[item.attrName] = runtime.ScriptFactory.execSingleLine(item.attrValue, {
+          ...params
+        });
+      }
     }
   });
   return attrs;
@@ -392,7 +394,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       summaryMethod,
       spanMethod,
       headerDragend
-    } = gridControl_util.useAppGridBase(c, props);
+    } = gridControl_util.useAppGridBase(c, props, tableRef);
     const {
       renderPopover
     } = useRowEditPopover.useRowEditPopover(tableRef, c);

package/lib/control/tree/el-tree-util.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var core = require('@ibiz-template/core');
+var runtime = require('@ibiz-template/runtime');
 var qxUtil = require('qx-util');
 var lodashEs = require('lodash-es');
 var vue = require('vue');
@@ -143,9 +144,39 @@ function findChildItems(c, modelData, curItem) {
   });
   return children;
 }
+function getNodeControlPanel(control) {
+  if (control.controlRenders) {
+    const controlRenders = control.controlRenders.filter(
+      (item) => (item.id || "").split("_")[0] !== "newnoderender"
+    );
+    return runtime.getControlPanel({ controlRenders });
+  }
+}
+function getNewNodeControlPanel(control) {
+  if (control.controlRenders) {
+    const controlRender = control.controlRenders.find(
+      (item) => (item.id || "").split("_")[0] === "newnoderender"
+    );
+    if (!controlRender)
+      return;
+    if (controlRender.renderType === "LAYOUTPANEL_MODEL" && controlRender.layoutPanelModel) {
+      const layoutPanelModel = runtime.ScriptFactory.execScriptFn(
+        {},
+        controlRender.layoutPanelModel,
+        { isAsync: false }
+      );
+      return layoutPanelModel;
+    }
+    if (controlRender.renderType === "LAYOUTPANEL" && controlRender.layoutPanel) {
+      return controlRender.layoutPanel;
+    }
+  }
+}
 
 exports.findChildItems = findChildItems;
 exports.findNodeData = findNodeData;
 exports.formatNodeDropType = formatNodeDropType;
+exports.getNewNodeControlPanel = getNewNodeControlPanel;
+exports.getNodeControlPanel = getNodeControlPanel;
 exports.useAppTreeBase = useAppTreeBase;
 exports.useElTreeUtil = useElTreeUtil;

package/lib/control/tree/tree.cjs

@@ -135,21 +135,38 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     const treeNodeTextInputRef = vue.ref(null);
     const editingNodeKey = vue.ref(null);
     const editingNodeText = vue.ref(null);
+    const newNodePanelRef = vue.ref();
     const newTreeNodeText = vue.ref(null);
     const newNodeModel = vue.ref(null);
     const newDefaultValue = vue.ref(null);
     const newNodeKey = vue.ref("".concat(qxUtil.createUUID(), "-").concat(qxUtil.createUUID()));
     const newNodeData = vue.ref(null);
-    c.evt.on("onNewTreeNode", (args) => {
+    const newNodeDeData = vue.ref(null);
+    const newNodeControlPanel = vue.ref(null);
+    c.evt.on("onNewTreeNode", async (args) => {
+      var _a;
       const {
         nodeModel,
         defaultValue,
         parentNodeData
       } = args;
-      newNodeModel.value = nodeModel;
+      const {
+        appId,
+        appDataEntityId
+      } = nodeModel;
+      const entityModel = await ibiz.hub.getAppDataEntity(appDataEntityId, appId);
+      const layoutPanel = elTreeUtil.getNewNodeControlPanel(nodeModel);
+      if (layoutPanel) {
+        newNodeDeData.value = new runtime.AppDataEntity(entityModel, {});
+        newNodeControlPanel.value = layoutPanel || null;
+      }
       newDefaultValue.value = defaultValue;
       editingNodeKey.value = null;
       editingNodeText.value = null;
+      if (newNodeData.value) {
+        (_a = treeRef.value) == null ? void 0 : _a.remove(newNodeData.value);
+        newNodeData.value = null;
+      }
       if (parentNodeData && treeRef.value) {
         const _newNodeData = {};
         Object.assign(_newNodeData, {
@@ -160,6 +177,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         treeRef.value.append(_newNodeData, parentNodeData);
         newNodeData.value = _newNodeData;
       }
+      newNodeModel.value = nodeModel;
     });
     vue.watch(() => treeNodeTextInputRef.value, (newVal) => {
       if (newVal) {
@@ -191,7 +209,28 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         }
       }
       if (newNodeModel.value) {
-        if (newTreeNodeText.value) {
+        const hasNonNullValue = newNodeDeData.value && Object.values(newNodeDeData.value).some((_val) => !!_val);
+        if (newNodeControlPanel.value && hasNonNullValue) {
+          const {
+            textAppDEFieldId,
+            id
+          } = newNodeModel.value;
+          const nodeData = {
+            _nodeId: id,
+            _text: [newNodeDeData.value[textAppDEFieldId]],
+            _deData: {}
+          };
+          Object.assign(nodeData._deData, newNodeDeData.value);
+          if (newDefaultValue.value) {
+            Object.keys(newDefaultValue.value).forEach((_key) => {
+              if (!nodeData._deData[_key])
+                Object.assign(nodeData._deData, {
+                  [_key]: newDefaultValue.value[_key]
+                });
+            });
+          }
+          await c.createDeNodeData([nodeData]);
+        } else if (newTreeNodeText.value) {
           const {
             textAppDEFieldId,
             id
@@ -215,6 +254,9 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         newNodeModel.value = null;
         newTreeNodeText.value = null;
         newDefaultValue.value = null;
+        newNodeDeData.value = null;
+        newNodeControlPanel.value = null;
+        newNodePanelRef.value = null;
         if (newNodeData.value)
           (_a = treeRef.value) == null ? void 0 : _a.remove(newNodeData.value);
         newNodeData.value = null;
@@ -230,6 +272,9 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         newNodeModel.value = null;
         newTreeNodeText.value = null;
         newDefaultValue.value = null;
+        newNodeDeData.value = null;
+        newNodeControlPanel.value = null;
+        newNodePanelRef.value = null;
         if (newNodeData.value)
           (_a = treeRef.value) == null ? void 0 : _a.remove(newNodeData.value);
         newNodeData.value = null;
@@ -244,6 +289,20 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         onNodeTextEditEsc();
       }
     };
+    const onPanelItemEvent = (_args) => {
+      if (!_args)
+        return;
+      const {
+        panelItemEventName
+      } = _args;
+      if (panelItemEventName === runtime.PanelItemEventName.ENTER) {
+        onNodeTextEditBlur();
+      }
+    };
+    const onPanelItemKeydown = (e) => {
+      if (e.code === "Escape" || e.keyCode === 27)
+        onNodeTextEditEsc();
+    };
     const {
       updateUI,
       triggerNodeExpand
@@ -596,12 +655,20 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         editCurrentNodeText();
       }
     };
+    const handleMouseup = () => {
+      var _a;
+      const isFoucs = (_a = newNodePanelRef.value) == null ? void 0 : _a.$el.querySelector(".is-focus");
+      if (newNodeControlPanel.value && !isFoucs)
+        onNodeTextEditBlur();
+    };
     vue.onMounted(() => {
       var _a;
+      document.addEventListener("mouseup", handleMouseup.bind(this));
       (_a = treeviewRef.value) == null ? void 0 : _a.$el.addEventListener("keydown", keydownHandle);
     });
     vue.onUnmounted(() => {
       var _a;
+      document.removeEventListener("mouseup", handleMouseup.bind(this));
       (_a = treeviewRef.value) == null ? void 0 : _a.$el.removeEventListener("keydown", keydownHandle);
     });
     const renderCounter = (nodeModel) => {
@@ -620,19 +687,32 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const renderNewNode = () => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       if (!newNodeModel.value) {
         return null;
       }
+      if (newNodeControlPanel.value) {
+        return vue.createVNode(vue.resolveComponent("iBizControlShell"), {
+          "class": [ns.b("new-node"), (_a = newNodeModel.value.sysCss) == null ? void 0 : _a.cssName],
+          "ref": newNodePanelRef,
+          "data": newNodeDeData.value,
+          "modelData": newNodeControlPanel.value,
+          "context": c.context,
+          "params": c.params,
+          "onMouseup": (_e) => _e.stopPropagation(),
+          "onPanelItemEvent": onPanelItemEvent,
+          "onKeydown": onPanelItemKeydown
+        }, null);
+      }
       return vue.createVNode("div", {
-        "class": [ns.b("new-node"), (_a = newNodeModel.value.sysCss) == null ? void 0 : _a.cssName],
+        "class": [ns.b("new-node"), (_b = newNodeModel.value.sysCss) == null ? void 0 : _b.cssName],
         "onClick": (_e) => {
           _e.preventDefault();
           _e.stopPropagation();
         }
-      }, [((_b = newNodeModel.value) == null ? void 0 : _b.sysImage) ? vue.createVNode(iBizIcon, {
+      }, [((_c = newNodeModel.value) == null ? void 0 : _c.sysImage) ? vue.createVNode(iBizIcon, {
         "class": ns.be("node", "icon"),
-        "icon": (_c = newNodeModel.value) == null ? void 0 : _c.sysImage
+        "icon": (_d = newNodeModel.value) == null ? void 0 : _d.sysImage
       }, null) : null, vue.createVNode(vue.resolveComponent("el-input"), {
         "modelValue": newTreeNodeText.value,
         "onUpdate:modelValue": ($event) => newTreeNodeText.value = $event,
@@ -759,7 +839,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
                 }
               }, null)]);
             }
-            const layoutPanel = runtime.getControlPanel(nodeModel);
+            const layoutPanel = elTreeUtil.getNodeControlPanel(nodeModel);
             let content;
             if (layoutPanel) {
               content = vue.createVNode(vue.resolveComponent("iBizControlShell"), {

package/lib/control/tree-grid/tree-grid.cjs

@@ -112,7 +112,7 @@ const TreeGridControl = /* @__PURE__ */ vue.defineComponent({
       defaultSort,
       summaryMethod,
       headerDragend
-    } = gridControl_util.useAppGridBase(c, props);
+    } = gridControl_util.useAppGridBase(c, props, tableRef);
     const {
       renderPopover
     } = useRowEditPopover.useRowEditPopover(tableRef, c);

package/lib/util/fullscreen/fullscreen-util.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 var ElementPlus = require('element-plus');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.1_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.41-alpha.2_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 fullscreenToolbar = require('../../common/fullscreen-toolbar/fullscreen-toolbar.cjs');
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.1",
+  "version": "0.7.41-alpha.3",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -34,14 +34,14 @@
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.198",
     "@ibiz-template-plugin/bi-report": "0.0.26",
     "@ibiz-template-plugin/data-view": "0.0.4",
-    "@ibiz-template/core": "0.7.41-alpha.1",
+    "@ibiz-template/core": "0.7.41-alpha.2",
     "@ibiz-template/devtool": "0.0.11",
-    "@ibiz-template/model-helper": "0.7.41-alpha.1",
-    "@ibiz-template/runtime": "0.7.41-alpha.1",
+    "@ibiz-template/model-helper": "0.7.41-alpha.3",
+    "@ibiz-template/runtime": "0.7.41-alpha.3",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.1",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.3",
     "@ibiz-template/web-theme": "3.4.0",
-    "@ibiz/model-core": "^0.1.75",
+    "@ibiz/model-core": "^0.1.76",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -106,7 +106,7 @@
     "@ibiz-template/runtime": "^0.7.0",
     "@ibiz-template/theme": "^0.7.0",
     "@ibiz-template/vue3-util": "^0.7.0",
-    "@ibiz/model-core": "^0.1.75",
+    "@ibiz/model-core": "^0.1.76",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",