@ibiz-template/vue3-components 0.7.41-alpha.25 → 0.7.41-alpha.26

package/es/control/tree-grid/tree-grid.mjs

@@ -1,7 +1,7 @@
 import { isVNode, resolveComponent, createVNode, nextTick, watch, createTextVNode, renderSlot, mergeProps, defineComponent } from 'vue';
 import { useControlController, useControlPopoverzIndex, useNamespace, hasEmptyPanelRenderer, IBizCustomRender } from '@ibiz-template/vue3-util';
 import { recursiveIterate } from '@ibiz-template/core';
-import { TreeGridController } from '@ibiz-template/runtime';
+import { ScriptFactory, TreeGridController } from '@ibiz-template/runtime';
 import { useRowEditPopover } from '../grid/row-edit-popover/use-row-edit-popover.mjs';
 import '../grid/grid/index.mjs';
 import { renderChildColumn } from '../grid/grid/grid.mjs';
@@ -11,6 +11,18 @@ import { useITableEvent, useAppGridPagination, useAppGridBase, useGridHeaderStyl
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
+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] = ScriptFactory.execSingleLine(item.attrValue, {
+        ...params
+      });
+    }
+  });
+  return attrs;
+}
 const TreeGridControl = /* @__PURE__ */ defineComponent({
   name: "IBizTreeGridControl",
   props: {
@@ -307,7 +319,9 @@ const TreeGridControl = /* @__PURE__ */ defineComponent({
               hasChildren: "hasChildren"
             },
             "data": this.c.state.showTreeGrid ? state.treeGirdData : this.tableData
-          }, this.$attrs), {
+          }, this.$attrs, renderAttrs(this.c.model, {
+            ...this.c.getEventArgs()
+          })), {
             empty: this.renderNoData,
             default: () => {
               return [!state.singleSelect && createVNode(resolveComponent("el-table-column"), {

package/es/control/tree-grid-ex/tree-grid-ex.mjs

@@ -1,6 +1,6 @@
 import { isVNode, createVNode, resolveComponent, computed, ref, watchEffect, renderSlot, mergeProps, h, defineComponent } from 'vue';
 import { useControlController, useControlPopoverzIndex, useNamespace, hasEmptyPanelRenderer, IBizCustomRender } from '@ibiz-template/vue3-util';
-import { TreeGridExController } from '@ibiz-template/runtime';
+import { ScriptFactory, TreeGridExController } from '@ibiz-template/runtime';
 import { RuntimeError } from '@ibiz-template/core';
 import { createUUID } from 'qx-util';
 import { useRowEditPopover } from './use-row-edit-popover.mjs';
@@ -10,6 +10,18 @@ import './tree-grid-ex.css';
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
+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] = ScriptFactory.execSingleLine(item.attrValue, {
+        ...params
+      });
+    }
+  });
+  return attrs;
+}
 const TreeGridExControl = /* @__PURE__ */ defineComponent({
   name: "IBizTreeGridExControl",
   props: {
@@ -84,7 +96,8 @@ const TreeGridExControl = /* @__PURE__ */ defineComponent({
         const temp = {
           id: node._id,
           _uuid: node._uuid,
-          hasChildren: !node._leaf
+          hasChildren: !node._leaf,
+          _deData: node._deData
         };
         if (!noChild && !node._leaf && node._children !== void 0) {
           temp.children = toElNodes(node._children);
@@ -249,10 +262,16 @@ const TreeGridExControl = /* @__PURE__ */ defineComponent({
           const rowState = this.c.getRowState(row.id);
           if (rowState) {
             const comp = resolveComponent(this.c.providers[columnName].component);
+            const nodeData = rowState.data;
+            const nodeModel = this.c.getNodeModel(nodeData._nodeId);
             return h(comp, {
               controller: columnC,
               row: rowState,
-              key: rowState.data._uuid + columnName
+              key: rowState.data._uuid + columnName,
+              attrs: renderAttrs(nodeModel, {
+                ...this.c.getEventArgs(),
+                data: rowState.data
+              })
             });
           }
           return null;
@@ -266,7 +285,7 @@ const TreeGridExControl = /* @__PURE__ */ defineComponent({
         "controller": this.c,
         "class": [this.ns.b()]
       }, {
-        default: () => [this.c.state.isLoaded && createVNode(resolveComponent("el-table"), {
+        default: () => [this.c.state.isLoaded && createVNode(resolveComponent("el-table"), mergeProps({
           "ref": "tableRef",
           "key": this.tableRefreshKey,
           "class": this.ns.e("table"),
@@ -282,7 +301,9 @@ const TreeGridExControl = /* @__PURE__ */ defineComponent({
           "onExpandChange": this.onExpandChange,
           "row-class-name": this.handleRowClassName,
           "load": this.loadData
-        }, {
+        }, renderAttrs(this.c.model, {
+          ...this.c.getEventArgs()
+        })), {
           empty: this.renderNoData,
           default: () => {
             return [this.renderColumns.map((model, index) => {

package/es/panel-component/app-switch/app-switch.controller.mjs

@@ -192,6 +192,9 @@ class AppSwitchController extends PanelItemController {
       return result;
     }
     const defaultAppModel = ibiz.hub.getAppSourceModel(defaultApp.appId);
+    if (!defaultAppModel || !defaultAppModel.cache) {
+      return result;
+    }
     const allAppIndexViews = (_b = (_a = defaultAppModel.cache) == null ? void 0 : _a.getPSAppViews) == null ? void 0 : _b.filter(
       (appView) => {
         return appView.viewType === "APPINDEXVIEW";

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

@@ -13,6 +13,18 @@ var gridControl_util = require('../grid/grid/grid-control.util.cjs');
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
 }
+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
+      });
+    }
+  });
+  return attrs;
+}
 const TreeGridControl = /* @__PURE__ */ vue.defineComponent({
   name: "IBizTreeGridControl",
   props: {
@@ -309,7 +321,9 @@ const TreeGridControl = /* @__PURE__ */ vue.defineComponent({
               hasChildren: "hasChildren"
             },
             "data": this.c.state.showTreeGrid ? state.treeGirdData : this.tableData
-          }, this.$attrs), {
+          }, this.$attrs, renderAttrs(this.c.model, {
+            ...this.c.getEventArgs()
+          })), {
             empty: this.renderNoData,
             default: () => {
               return [!state.singleSelect && vue.createVNode(vue.resolveComponent("el-table-column"), {

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

@@ -12,6 +12,18 @@ require('./tree-grid-ex.css');
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
 }
+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
+      });
+    }
+  });
+  return attrs;
+}
 const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
   name: "IBizTreeGridExControl",
   props: {
@@ -86,7 +98,8 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
         const temp = {
           id: node._id,
           _uuid: node._uuid,
-          hasChildren: !node._leaf
+          hasChildren: !node._leaf,
+          _deData: node._deData
         };
         if (!noChild && !node._leaf && node._children !== void 0) {
           temp.children = toElNodes(node._children);
@@ -251,10 +264,16 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
           const rowState = this.c.getRowState(row.id);
           if (rowState) {
             const comp = vue.resolveComponent(this.c.providers[columnName].component);
+            const nodeData = rowState.data;
+            const nodeModel = this.c.getNodeModel(nodeData._nodeId);
             return vue.h(comp, {
               controller: columnC,
               row: rowState,
-              key: rowState.data._uuid + columnName
+              key: rowState.data._uuid + columnName,
+              attrs: renderAttrs(nodeModel, {
+                ...this.c.getEventArgs(),
+                data: rowState.data
+              })
             });
           }
           return null;
@@ -268,7 +287,7 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
         "controller": this.c,
         "class": [this.ns.b()]
       }, {
-        default: () => [this.c.state.isLoaded && vue.createVNode(vue.resolveComponent("el-table"), {
+        default: () => [this.c.state.isLoaded && vue.createVNode(vue.resolveComponent("el-table"), vue.mergeProps({
           "ref": "tableRef",
           "key": this.tableRefreshKey,
           "class": this.ns.e("table"),
@@ -284,7 +303,9 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
           "onExpandChange": this.onExpandChange,
           "row-class-name": this.handleRowClassName,
           "load": this.loadData
-        }, {
+        }, renderAttrs(this.c.model, {
+          ...this.c.getEventArgs()
+        })), {
           empty: this.renderNoData,
           default: () => {
             return [this.renderColumns.map((model, index) => {

package/lib/panel-component/app-switch/app-switch.controller.cjs

@@ -194,6 +194,9 @@ class AppSwitchController extends runtime.PanelItemController {
       return result;
     }
     const defaultAppModel = ibiz.hub.getAppSourceModel(defaultApp.appId);
+    if (!defaultAppModel || !defaultAppModel.cache) {
+      return result;
+    }
     const allAppIndexViews = (_b = (_a = defaultAppModel.cache) == null ? void 0 : _a.getPSAppViews) == null ? void 0 : _b.filter(
       (appView) => {
         return appView.viewType === "APPINDEXVIEW";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.25",
+  "version": "0.7.41-alpha.26",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -36,10 +36,10 @@
     "@ibiz-template-plugin/data-view": "0.0.5",
     "@ibiz-template/core": "0.7.41-alpha.23",
     "@ibiz-template/devtool": "0.0.11",
-    "@ibiz-template/model-helper": "0.7.41-alpha.24",
-    "@ibiz-template/runtime": "0.7.41-alpha.24",
+    "@ibiz-template/model-helper": "0.7.41-alpha.25",
+    "@ibiz-template/runtime": "0.7.41-alpha.25",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.24",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.25",
     "@ibiz-template/web-theme": "3.8.0",
     "@ibiz/model-core": "^0.1.81",
     "@imengyu/vue3-context-menu": "^1.3.5",