npm - @ibiz-template/vue3-components - Versions diffs - 0.7.41-alpha.4 → 0.7.41-alpha.41 - Mend

@ibiz-template/vue3-components 0.7.41-alpha.4 → 0.7.41-alpha.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1783) hide show

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

@@ -209,7 +209,7 @@ function useITableEvent(c) {
   }
   async function onRowClickDynamic(data, _column, event) {
     if (data.srfuf === runtime.Srfuf.CREATE) {
-      if (c.editShowMode === "row") {
+      if (c.editShowMode === "row" && !data.isGroupRow) {
         const row = c.findRowState(data);
         if (row)
           await c.switchRowEdit(row);
@@ -231,6 +231,11 @@ function useITableEvent(c) {
   }
   let forbidClick = false;
   async function onRowClick(data, _column, event) {
+    var _a;
+    if (data.isGroupRow) {
+      (_a = tableRef.value) == null ? void 0 : _a.store.loadOrToggle(data);
+      return;
+    }
     if (!event.shiftKey) {
       const index = c.findRowStateIndex(data);
       const isSelected = c.state.selectedData.includes(data);
@@ -266,40 +271,45 @@ function useITableEvent(c) {
     }, 200);
   }
   function onDbRowClick(data) {
-    if (data.srfuf === runtime.Srfuf.CREATE) {
+    if (data.srfuf === runtime.Srfuf.CREATE || data.isGroupRow)
       return;
-    }
     c.onDbRowClick(data);
   }
   function onSelectionChange(selection) {
     if (!forbidChange && !c.state.isLoading)
       c.setSelection(selection);
   }
+  const elSelection = vue.computed(() => {
+    const items = [];
+    const keys = c.state.selectedData.map((selected) => selected.srfkey);
+    if (tableRef.value)
+      core.recursiveIterate(
+        { children: tableRef.value.store.states.data.value },
+        (item) => {
+          if (keys.includes(item.srfkey))
+            items.push(item);
+        }
+      );
+    return items;
+  });
   vue.watch(
     [
       () => tableRef.value,
       () => c.state.isLoaded,
       () => c.state.selectedData
     ],
-    ([table, isLoaded, newVal]) => {
+    ([table, isLoaded, _newVal]) => {
       if (!isLoaded || !table)
         return;
-      if (c.state.singleSelect) {
-        if (newVal[0]) {
-          tableRef.value.setCurrentRow(newVal[0], true);
+      forbidChange = true;
+      setTimeout(() => {
+        if (c.state.singleSelect) {
+          table.setCurrentRow(elSelection.value[0]);
         } else {
-          tableRef.value.setCurrentRow();
+          table.store.states.selection.value = elSelection.value;
         }
-      } else {
-        forbidChange = true;
-        tableRef.value.clearSelection();
-        setTimeout(() => {
-          newVal.forEach(
-            (item) => tableRef.value.toggleRowSelection(item, true)
-          );
-          forbidChange = false;
-        });
-      }
+        forbidChange = false;
+      });
     }
   );
   function onSortChange(opts) {
@@ -344,9 +354,8 @@ function useITableEvent(c) {
     let activeClassName = "";
     if (c.state.selectedData.length > 0) {
       c.state.selectedData.forEach((data) => {
-        if (data === row) {
+        if (data === row || data.srfkey === row.srfkey)
           activeClassName = "current-row";
-        }
       });
     }
     const rowState = c.findRowState(row);
@@ -444,22 +453,17 @@ function useAppGridPagination(c) {
 }
 function useAppGridBase(c, props, tableRef) {
   const initSimpleData = () => {
-    if (!props.data) {
+    if (!props.data)
       return;
-    }
-    c.state.items = props.data;
+    const items = props.data.map((item) => new runtime.ControlVO(item));
+    c.state.items = items;
     if (c.runMode === "DESIGN") {
-      c.state.simpleData = props.data;
+      c.state.simpleData = items;
       c.state.total = props.data.length;
       c.state.curPage = 1;
       c.state.items = lodashEs.chunk(c.state.simpleData, c.state.size)[c.state.curPage - 1] || [];
     }
-    c.state.rows = c.state.items.map((item) => {
-      const row = new runtime.GridRowState(new runtime.ControlVO(item), c);
-      return row;
-    });
-    c.calcAggResult(c.state.items);
-    c.calcTotalData();
+    c.afterLoad({ isInitialLoad: true }, c.state.items);
   };
   const defaultSort = vue.computed(() => {
     var _a;
@@ -480,9 +484,8 @@ function useAppGridBase(c, props, tableRef) {
   vue.watch(
     () => props.data,
     () => {
-      if (props.isSimple) {
+      if (props.isSimple)
         initSimpleData();
-      }
     },
     {
       deep: true
@@ -491,21 +494,30 @@ function useAppGridBase(c, props, tableRef) {
   const tableData = vue.computed(() => {
     const state = c.state;
     if (c.state.enableGroup) {
+      const grouprowmode = c.controlParams.grouprowmode;
       const result = [];
       state.groups.forEach((item) => {
-        if (!item.children.length) {
+        if (!item.children.length)
           return;
+        if (grouprowmode === "NEWROW") {
+          result.push({
+            ...item,
+            srfkey: item.key,
+            tempsrfkey: item.key,
+            isGroupRow: true
+          });
+        } else {
+          const children = [...item.children];
+          const first = children.shift();
+          result.push({
+            tempsrfkey: (first == null ? void 0 : first.tempsrfkey) || item.caption,
+            srfkey: (first == null ? void 0 : first.srfkey) || item.caption,
+            isGroupData: true,
+            caption: item.caption,
+            first,
+            children
+          });
         }
-        const children = [...item.children];
-        const first = children.shift();
-        result.push({
-          tempsrfkey: (first == null ? void 0 : first.tempsrfkey) || item.caption,
-          srfkey: (first == null ? void 0 : first.srfkey) || item.caption,
-          isGroupData: true,
-          caption: item.caption,
-          first,
-          children
-        });
       });
       return result;
     }
@@ -662,6 +674,16 @@ function useAppGridBase(c, props, tableRef) {
         colspan
       };
     }
+    if (row.isGroupRow) {
+      const total = c.state.singleSelect ? renderColumns.value.length : renderColumns.value.length + 1;
+      const index = c.state.singleSelect ? 0 : 1;
+      if (columnIndex === index)
+        return { rowspan: 1, colspan: total };
+      return {
+        rowspan: 0,
+        colspan: 0
+      };
+    }
   };
   const headerDragend = (newWidth, oldWidth, column) => {
     const { property } = column;

package/lib/control/grid/grid/grid.cjs CHANGED Viewed

@@ -56,7 +56,7 @@ function renderFieldColumn(c, row) {
     controlRenders = []
   } = c.model;
   const panel = (_a = controlRenders.find((renderItem) => renderItem.renderType === "LAYOUTPANEL")) == null ? void 0 : _a.layoutPanel;
-  const columnType = (_b = c.model.userParam) == null ? void 0 : _b.columnType;
+  const columnType = (_b = c.model.userParam) == null ? void 0 : _b.columntype;
   if (panel) {
     content = vue.createVNode(vue.resolveComponent("iBizControlShell"), {
       "data": row.data,
@@ -98,7 +98,7 @@ function renderFieldColumn(c, row) {
       if (!grid.percentkeys.includes(fieldName)) {
         return "";
       }
-      const percentValue = Number(fieldValue.value);
+      const percentValue = Number(fieldValue);
       if (!Number.isNaN(percentValue)) {
         const {
           totalResult = {}
@@ -138,25 +138,31 @@ function renderFieldColumn(c, row) {
   }, [actionToolbar])] : content]);
 }
 function renderColumn(c, model, renderColumns, index) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const {
     codeName: columnName,
     width
   } = model;
   const columnC = c.columns[columnName];
   const columnState = c.state.columnStates.find((item) => item.key === columnName);
+  let type = "default";
+  const expandiconcolumn = (_a = c.controlParams.expandiconcolumn) == null ? void 0 : _a.toLowerCase();
+  const expandColumnSatate = c.state.columnStates.find((item) => expandiconcolumn && item.key.toLowerCase() === expandiconcolumn);
+  if (expandColumnSatate && !expandColumnSatate.hidden)
+    type = (columnName == null ? void 0 : columnName.toLowerCase()) === expandiconcolumn ? "default" : "";
   const widthFlexGrow = columnC.isAdaptiveColumn || !c.hasAdaptiveColumn && index === renderColumns.length - 1;
   const widthName = widthFlexGrow ? "min-width" : "width";
   const tempWidth = (columnState == null ? void 0 : columnState.columnWidth) || width;
   return vue.createVNode(vue.resolveComponent("el-table-column"), vue.mergeProps({
-    "className": "".concat((_a = model.columnType) == null ? void 0 : _a.toLowerCase(), " ").concat((_b = model.columnType) == null ? void 0 : _b.toLowerCase(), "-").concat(columnName),
+    "type": type,
+    "prop": columnName,
     "label": model.caption,
-    "prop": columnName
+    "fixed": columnState.fixed
   }, {
     [widthName]: tempWidth
   }, {
-    "fixed": columnState.fixed,
     "sortable": model.enableSort ? c.model.sortMode === "LOCAL" || "custom" : false,
+    "align": ((_b = model.align) == null ? void 0 : _b.toLowerCase()) || "center",
     "sortMethod": (a, b) => {
       const fieldName = model.id.toLowerCase();
       if (a[fieldName] < b[fieldName] || !a[fieldName])
@@ -165,7 +171,7 @@ function renderColumn(c, model, renderColumns, index) {
         return 1;
       return 0;
     },
-    "align": ((_c = model.align) == null ? void 0 : _c.toLowerCase()) || "center"
+    "className": "".concat((_c = model.columnType) == null ? void 0 : _c.toLowerCase(), " ").concat((_d = model.columnType) == null ? void 0 : _d.toLowerCase(), "-").concat(columnName)
   }), {
     header: ({
       column
@@ -179,9 +185,14 @@ function renderColumn(c, model, renderColumns, index) {
       row
     }) => {
       let elRow = row;
-      if (row.isGroupData) {
+      if (elRow.isGroupRow)
+        return vue.createVNode("div", {
+          "class": "ibiz-grid-field-column"
+        }, [vue.createVNode("span", {
+          "class": "ibiz-grid-field-column__text"
+        }, [row.caption])]);
+      if (row.isGroupData)
         elRow = row.first;
-      }
       const rowState = c.findRowState(elRow);
       if (rowState) {
         if (model.columnType === "DEFGRIDCOLUMN" || model.columnType === "DEFTREEGRIDCOLUMN") {
@@ -317,10 +328,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
   }) {
     const c = vue3Util.useControlController((...args) => new runtime.GridController(...args));
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
-    const {
-      zIndex
-    } = vue3Util.useUIStore();
-    c.state.zIndex = zIndex.increment();
+    vue3Util.useControlPopoverzIndex(c);
     const {
       sysCss
     } = c.model;
@@ -407,7 +415,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         return;
       }
       return vue.createVNode("div", {
-        "class": [ns.b("batch-toolbar"), ns.is("show", c.state.selectedData.length > 0)]
+        "class": [ns.b("batch-toolbar"), ns.is("show", c.showBatchToolbar)]
       }, [vue.createVNode("div", {
         "class": ns.b("batch-toolbar-content")
       }, [vue.createVNode("div", {
@@ -456,7 +464,8 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
             "fill-rule": "nonzero"
           }, [vue.createVNode("path", {
             "d": "M1 2a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zM1 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2z",
-            "id": "drag-icon-air"
+            "id": "drag-icon-air",
+            "fill": "currentColor"
           }, null)])])]);
         }
       });
@@ -491,7 +500,6 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         });
     };
     vue.onUnmounted(() => {
-      zIndex.decrement();
       if (cleanup !== core.NOOP)
         cleanup();
       if (cleanClick !== core.NOOP)
@@ -562,42 +570,45 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       "controller": this.c
     }, {
       default: () => [vue.createVNode(vue.resolveComponent("iBizControlBase"), {
-        "class": [this.ns.b(), this.ns.is("dynamic-grid", this.c.state.isAutoGrid), 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.state.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)],
+        "class": [this.ns.b(), this.ns.is("dynamic-grid", this.c.state.isAutoGrid), 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.state.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), this.ns.is("group-row-mode", this.c.controlParams.grouprowmode === "NEWROW")],
         "controller": this.c,
         "style": this.headerCssVars
       }, {
         default: () => [vue.createVNode(vue.resolveComponent("el-table"), vue.mergeProps({
+          "border": true,
           "ref": "tableRef",
+          "data": this.tableData,
+          "row-key": "tempsrfkey",
+          "tooltip-effect": "light",
           "class": this.ns.e("table"),
+          "scrollbar-always-on": true,
+          "onRowClick": this.onRowClick,
+          "span-method": this.spanMethod,
           "default-sort": this.defaultSort,
-          "border": true,
-          "show-header": !this.c.state.hideHeader,
           "show-summary": this.c.enableAgg,
+          "onSortChange": this.onSortChange,
+          "onRowDblclick": this.onDbRowClick,
           "summary-method": this.summaryMethod,
-          "highlight-current-row": state.singleSelect,
-          "row-class-name": this.handleRowClassName,
-          "header-cell-class-name": this.handleHeaderCellClassName,
-          "row-key": "tempsrfkey",
-          "data": this.tableData,
+          "onHeaderDragend": this.headerDragend,
           "default-expand-all": defaultExpandAll,
-          "span-method": this.spanMethod,
-          "onRowClick": this.onRowClick,
-          "onRowDblclick": this.onDbRowClick,
+          "show-header": !this.c.state.hideHeader,
+          "row-class-name": this.handleRowClassName,
+          "highlight-current-row": state.singleSelect,
+          "expandRowKeys": this.c.state.expandRowKeys,
           "onSelectionChange": this.onSelectionChange,
-          "onSortChange": this.onSortChange,
-          "onHeaderDragend": this.headerDragend,
-          "tooltip-effect": "light",
-          "scrollbar-always-on": true
+          "header-cell-class-name": this.handleHeaderCellClassName,
+          "onExpandChange": (row, expanded) => this.c.expandChange(row, expanded)
         }, this.$attrs, renderAttrs(this.c.model, {
           ...this.c.getEventArgs()
         })), {
           empty: this.renderNoData,
           default: () => {
             return [this.c.enableRowEditOrder && this.renderDragIconColumn(), !state.singleSelect && vue.createVNode(vue.resolveComponent("el-table-column"), {
-              "class-name": this.ns.e("selection"),
-              "type": "selection",
               "width": "55",
-              "align": "center"
+              "align": "center",
+              "type": "selection",
+              "reserve-selection": true,
+              "class-name": this.ns.e("selection")
             }, null), this.renderRowDetail(), this.renderColumns.map((model, index) => {
               return this.renderTableColumn(model, index);
             })];

package/lib/control/grid/grid/grid.css CHANGED Viewed

	@@ -1 +1 @@
1	- .ibiz-control-grid{--ibiz-control-grid-text-color:var(--ibiz-color-text-0);--ibiz-control-grid-bg-color:transparent;--ibiz-control-grid-padding:var(--ibiz-spacing-none);--ibiz-control-grid-cell-padding:var(--ibiz-spacing-tight);--ibiz-control-grid-selection-padding:var(--ibiz-spacing-base-loose);--ibiz-control-grid-row-edit-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-row-bg-color:var(--ibiz-color-bg-1);--ibiz-control-grid-row-bg-color-2:var(--ibiz-color-bg-0);--ibiz-control-grid-row-hover-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-row-select-color:var(--ibiz-color-primary-light-default);--ibiz-control-grid-row-expand-icon-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-tight);--ibiz-control-grid-now-header-height:auto;--ibiz-control-grid-scrollbar-width:4px;--ibiz-control-grid-scrollbar-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-scrollbar-bg-hover-opacity:0.5;--ibiz-control-grid-scrollbar-bg-hover-color:var(--ibiz-color-fill-2);--ibiz-control-grid-header-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-header-cell-padding:calc(var(--ibiz-spacing-base-tight) / 2) var(--ibiz-spacing-base-tight);--ibiz-control-grid-header-height:auto;--ibiz-control-grid-header-min-height:54px;--ibiz-control-grid-header-bg-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-header-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-header-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-grid-content-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-content-row-height:48px;--ibiz-control-grid-page-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-page-height:50px;--ibiz-control-grid-page-padding:var(--ibiz-spacing-none) var(--ibiz-spacing-base-tight);--ibiz-control-grid-footer-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-footer-bg-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-footer-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-footer-font-weight:var(--ibiz-font-weight-bold);position:relative;width:100%;height:100%;padding:var(--ibiz-control-grid-padding);background-color:var(--ibiz-control-grid-bg-color)}.ibiz-control-grid .el-table{--el-table-header-bg-color:var(--ibiz-control-grid-header-bg-color);--el-table-current-row-bg-color:var(--ibiz-control-grid-row-select-color);--el-table-border-color:transparent}.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--left.is-first-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--left.is-last-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--right.is-first-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--right.is-last-column::before{bottom:0}.ibiz-control-grid.is-empty .el-scrollbar .el-scrollbar__view{height:100%}.ibiz-control-grid.is-empty .el-table__empty-text{display:inline-block;height:100%}.ibiz-control-grid .el-table--border .el-table__cell{border-right:none}.ibiz-control-grid .el-table-fixed-column--left,.ibiz-control-grid .el-table-fixed-column--right{--el-bg-color:transparent}.ibiz-control-grid .el-table thead.is-group th.el-table__cell{background:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid.is-enable-page .ibiz-control-grid__table{height:calc(100% - var(--ibiz-control-grid-page-height))}.ibiz-control-grid.is-enable-group .el-table__indent{display:none}.ibiz-control-grid.is-dynamic-grid .el-table__empty-block{height:calc(100% - 48px)!important;min-height:248px}.ibiz-control-grid__add{width:calc(100% - var(--ibiz-spacing-extra-tight));margin:var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight);color:var(--ibiz-color-primary);background-color:transparent;border:1px dashed var(--ibiz-color-border)}.ibiz-control-grid__add ion-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-control-grid__add:focus{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-control-grid__add:hover{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-control-grid__table{width:100%;height:100%}.ibiz-control-grid__table .caret-wrapper{justify-content:center}.ibiz-control-grid__table .caret-wrapper>+{margin-top:var(--ibiz-spacing-super-tight)}.ibiz-control-grid__table .sort-caret{--el-text-color-placeholder:--ibiz-control-grid-header-text-color;position:initial;opacity:.6}.ibiz-control-grid__table.el-table .el-table__cell{padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr td{background:var(--ibiz-control-grid-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:nth-child(2n) td{background-color:var(--ibiz-control-grid-row-bg-color-2)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:hover td{background-color:var(--ibiz-control-grid-row-hover-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.current-row td{background-color:var(--el-table-current-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td.uagridcolumn{background-color:var(--ibiz-control-grid-row-hover-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td:not(.uagridcolumn){background-color:var(--ibiz-control-grid-row-edit-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-date-editor,.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-input__wrapper,.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-textarea__inner{--el-input-bg-color:var(--ibiz-color-white)}.ibiz-control-grid__table .el-table__header-wrapper .cell{height:var(--ibiz-control-grid-header-height);min-height:var(--ibiz-control-grid-header-min-height);padding:var(--ibiz-control-grid-header-cell-padding);font-size:var(--ibiz-control-grid-header-font-size);font-weight:var(--ibiz-control-grid-header-font-weight);color:var(--ibiz-control-grid-header-text-color);word-break:break-word;white-space:pre-wrap}.ibiz-control-grid__table .el-table__header-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__header-wrapper .el-table__cell .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__header-wrapper .el-table-fixed-column--left .cell,.ibiz-control-grid__table .el-table__header-wrapper .el-table-fixed-column--right .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__body-wrapper{color:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-0:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-1:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-2:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-3:var(--ibiz-control-grid-content-text-color);border-bottom:.1px solid var(--ibiz-color-border)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row{height:var(--ibiz-control-grid-content-row-height);cursor:pointer}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:0;padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row .el-table__expand-icon{margin:var(--ibiz-control-grid-row-expand-icon-margin)}@-moz-document url-prefix(){.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:100%}}.ibiz-control-grid__table .el-table__body-wrapper .cell{display:flex;align-items:center;height:100%;padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table .el-table__body-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__cell.is-center{--ibiz-grid-column-text-align:center;--ibiz-grid-column-justify-content:center}.ibiz-control-grid__table .el-table__cell.is-left{--ibiz-grid-column-text-align:left;--ibiz-grid-column-justify-content:flex-start}.ibiz-control-grid__table .el-table__cell.is-right{--ibiz-grid-column-text-align:right;--ibiz-grid-column-justify-content:flex-end}.ibiz-control-grid__table .el-scrollbar__wrap{position:relative}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell{font-size:var(--ibiz-control-grid-footer-font-size);font-weight:var(--ibiz-control-grid-footer-font-weight);color:var(--ibiz-control-grid-footer-text-color);background-color:var(--ibiz-control-grid-footer-bg-color)}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell:first-child>div{display:inline;vertical-align:4px}.ibiz-control-grid__table .enable-order{position:relative;padding-left:var(--ibiz-spacing-base-tight);transition:transform .25s cubic-bezier(0,0,.2,1)}.ibiz-control-grid__table .enable-order .ibiz-control-grid__drag-icon{padding:var(--ibiz-spacing-none)!important}.ibiz-control-grid__table .enable-order .ibiz-control-grid__drag-icon .cell{display:none}.ibiz-control-grid__table .enable-order:hover .ibiz-control-grid__drag-icon .cell{display:flex}.ibiz-control-grid__table .el-scrollbar__bar.is-horizontal{height:var(--ibiz-control-grid-scrollbar-width)}.ibiz-control-grid__table .el-scrollbar__bar.is-vertical{width:var(--ibiz-control-grid-scrollbar-width)}.ibiz-control-grid__table .el-scrollbar__thumb{background-color:var(--ibiz-control-grid-scrollbar-bg-color)}.ibiz-control-grid__table .el-scrollbar__thumb:hover{background-color:var(--ibiz-control-grid-scrollbar-bg-hover-color);opacity:var(--ibiz-control-grid-scrollbar-bg-hover-opacity)}.ibiz-control-grid__load-more-button{padding:var(--ibiz-control-grid-header-cell-padding);text-align:center}.ibiz-control-grid .el-table td.el-table__cell,.ibiz-control-grid .el-table th.el-table__cell.is-leaf{border-bottom:none}.ibiz-control-grid .ibiz-pagination{--ibiz-pagination-height:var(--ibiz-control-grid-page-height);--ibiz-pagination-text-color:var(--ibiz-control-grid-text-color);--ibiz-pagination-padding:var(--ibiz-control-grid-page-padding)}.ibiz-control-grid.is-single-select .el-table__header-wrapper .el-table__header thead>tr th:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-single-select .el-table__body-wrapper .el-table__body tbody>tr td:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-enable-customized .el-table__header-wrapper .el-table__header thead>tr th:last-child{padding-right:var(--ibiz-spacing-base-loose)}.ibiz-control-grid.is-enable-customized .ibiz-control-grid-setting-box{display:flex;align-items:center;justify-content:flex-start;position:absolute;top:0;right:0;z-index:1;height:var(--ibiz-control-grid-now-header-height);padding-right:var(--ibiz-spacing-extra-tight);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-quick-toolbar{justify-content:center}.ibiz-control-grid-batch-toolbar{position:absolute;top:0;left:54px;z-index:99;display:none;width:calc(100% - 54px);height:var(--ibiz-control-grid-now-header-height);font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-batch-toolbar.is-show{display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-separator{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-content{height:100%;display:flex;align-items:center;justify-content:flex-start}
1	+ .ibiz-control-grid{--ibiz-control-grid-text-color:var(--ibiz-color-text-0);--ibiz-control-grid-bg-color:transparent;--ibiz-control-grid-padding:var(--ibiz-spacing-none);--ibiz-control-grid-cell-padding:var(--ibiz-spacing-tight);--ibiz-control-grid-selection-padding:var(--ibiz-spacing-base-loose);--ibiz-control-grid-row-edit-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-row-bg-color:var(--ibiz-color-bg-1);--ibiz-control-grid-row-bg-color-2:var(--ibiz-color-bg-0);--ibiz-control-grid-row-hover-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-row-select-color:var(--ibiz-color-primary-light-default);--ibiz-control-grid-row-expand-icon-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-tight);--ibiz-control-grid-now-header-height:auto;--ibiz-control-grid-scrollbar-width:4px;--ibiz-control-grid-scrollbar-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-scrollbar-bg-hover-opacity:0.5;--ibiz-control-grid-scrollbar-bg-hover-color:var(--ibiz-color-fill-2);--ibiz-control-grid-header-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-header-cell-padding:calc(var(--ibiz-spacing-base-tight) / 2) var(--ibiz-spacing-base-tight);--ibiz-control-grid-header-height:auto;--ibiz-control-grid-header-min-height:54px;--ibiz-control-grid-header-bg-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-header-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-header-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-grid-content-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-content-row-height:48px;--ibiz-control-grid-page-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-page-height:50px;--ibiz-control-grid-page-padding:var(--ibiz-spacing-none) var(--ibiz-spacing-base-tight);--ibiz-control-grid-footer-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-footer-bg-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-footer-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-footer-font-weight:var(--ibiz-font-weight-bold);position:relative}.ibiz-control-grid .el-table{--el-table-header-bg-color:var(--ibiz-control-grid-header-bg-color);--el-table-current-row-bg-color:var(--ibiz-control-grid-row-select-color);--el-table-border-color:transparent}.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--left.is-first-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--left.is-last-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--right.is-first-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--right.is-last-column::before{bottom:0}.ibiz-control-grid.is-empty .el-scrollbar .el-scrollbar__view{height:100%}.ibiz-control-grid.is-empty .el-table__empty-text{display:inline-block;height:100%}.ibiz-control-grid .el-table--border .el-table__cell{border-right:none}.ibiz-control-grid .el-table-fixed-column--left,.ibiz-control-grid .el-table-fixed-column--right{--el-bg-color:transparent}.ibiz-control-grid .el-table thead.is-group th.el-table__cell{background:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid{width:100%;height:100%;padding:var(--ibiz-control-grid-padding);background-color:var(--ibiz-control-grid-bg-color)}.ibiz-control-grid.is-enable-page .ibiz-control-grid__table{height:calc(100% - var(--ibiz-control-grid-page-height))}.ibiz-control-grid.is-enable-group .el-table__indent{display:none}.ibiz-control-grid.is-dynamic-grid .el-table__empty-block{height:calc(100% - 48px)!important;min-height:248px}.ibiz-control-grid.is-group-row-mode .el-table .el-table__body-wrapper .el-table__row .el-table__expand-icon{margin:0 0 0 20px}.ibiz-control-grid__add{width:calc(100% - var(--ibiz-spacing-extra-tight));margin:var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight);color:var(--ibiz-color-primary);background-color:transparent;border:1px dashed var(--ibiz-color-border)}.ibiz-control-grid__add ion-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-control-grid__add:focus{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-control-grid__add:hover{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-control-grid__table{width:100%;height:100%}.ibiz-control-grid__table .caret-wrapper{justify-content:center}.ibiz-control-grid__table .caret-wrapper>+{margin-top:var(--ibiz-spacing-super-tight)}.ibiz-control-grid__table .sort-caret{--el-text-color-placeholder:--ibiz-control-grid-header-text-color;position:initial;opacity:.6}.ibiz-control-grid__table.el-table .el-table__cell{padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr td{background:var(--ibiz-control-grid-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:nth-child(2n) td{background-color:var(--ibiz-control-grid-row-bg-color-2)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:hover td{background-color:var(--ibiz-control-grid-row-hover-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.current-row td{background-color:var(--el-table-current-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td.uagridcolumn{background-color:var(--ibiz-control-grid-row-hover-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td:not(.uagridcolumn){background-color:var(--ibiz-control-grid-row-edit-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-date-editor,.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-input__wrapper,.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-textarea__inner{--el-input-bg-color:var(--ibiz-color-bg-1)}.ibiz-control-grid__table .el-table__header-wrapper .cell{height:var(--ibiz-control-grid-header-height);min-height:var(--ibiz-control-grid-header-min-height);padding:var(--ibiz-control-grid-header-cell-padding);font-size:var(--ibiz-control-grid-header-font-size);font-weight:var(--ibiz-control-grid-header-font-weight);color:var(--ibiz-control-grid-header-text-color);word-break:break-word;white-space:pre-wrap}.ibiz-control-grid__table .el-table__header-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__header-wrapper .el-table__cell .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__header-wrapper .el-table-fixed-column--left .cell,.ibiz-control-grid__table .el-table__header-wrapper .el-table-fixed-column--right .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__body-wrapper{color:var(--ibiz-control-grid-content-text-color);border-bottom:.1px solid var(--ibiz-color-border)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row{height:var(--ibiz-control-grid-content-row-height);cursor:pointer}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:0;padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row .el-table__expand-icon{margin:var(--ibiz-control-grid-row-expand-icon-margin)}@-moz-document url-prefix(){.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:100%}}.ibiz-control-grid__table .el-table__body-wrapper .cell{display:flex;align-items:center;height:100%;padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table .el-table__body-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__cell.is-center{--ibiz-grid-column-text-align:center;--ibiz-grid-column-justify-content:center}.ibiz-control-grid__table .el-table__cell.is-left{--ibiz-grid-column-text-align:left;--ibiz-grid-column-justify-content:flex-start}.ibiz-control-grid__table .el-table__cell.is-right{--ibiz-grid-column-text-align:right;--ibiz-grid-column-justify-content:flex-end}.ibiz-control-grid__table .el-scrollbar__wrap{position:relative}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell{font-size:var(--ibiz-control-grid-footer-font-size);font-weight:var(--ibiz-control-grid-footer-font-weight);color:var(--ibiz-control-grid-footer-text-color);background-color:var(--ibiz-control-grid-footer-bg-color)}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell:first-child>div{display:inline;vertical-align:4px}.ibiz-control-grid__table .enable-order{position:relative;padding-left:var(--ibiz-spacing-base-tight);transition:transform .25s cubic-bezier(0,0,.2,1)}.ibiz-control-grid__table .enable-order .ibiz-control-grid__drag-icon{padding:var(--ibiz-spacing-none)!important}.ibiz-control-grid__table .enable-order .ibiz-control-grid__drag-icon .cell{display:none}.ibiz-control-grid__table .enable-order:hover .ibiz-control-grid__drag-icon .cell{display:flex}.ibiz-control-grid__table .el-scrollbar__bar.is-horizontal{height:var(--ibiz-control-grid-scrollbar-width)}.ibiz-control-grid__table .el-scrollbar__bar.is-vertical{width:var(--ibiz-control-grid-scrollbar-width)}.ibiz-control-grid__table .el-scrollbar__thumb{background-color:var(--ibiz-control-grid-scrollbar-bg-color)}.ibiz-control-grid__table .el-scrollbar__thumb:hover{background-color:var(--ibiz-control-grid-scrollbar-bg-hover-color);opacity:var(--ibiz-control-grid-scrollbar-bg-hover-opacity)}.ibiz-control-grid__load-more-button{padding:var(--ibiz-control-grid-header-cell-padding);text-align:center}.ibiz-control-grid .el-table td.el-table__cell,.ibiz-control-grid .el-table th.el-table__cell.is-leaf{border-bottom:none}.ibiz-control-grid .ibiz-pagination{--ibiz-pagination-height:var(--ibiz-control-grid-page-height);--ibiz-pagination-text-color:var(--ibiz-control-grid-text-color);--ibiz-pagination-padding:var(--ibiz-control-grid-page-padding)}.ibiz-control-grid.is-single-select .el-table__header-wrapper .el-table__header thead>tr th:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-single-select .el-table__body-wrapper .el-table__body tbody>tr td:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-enable-customized .el-table__header-wrapper .el-table__header thead>tr:first-child th:last-child{padding-right:var(--ibiz-spacing-base-loose)}.ibiz-control-grid.is-enable-customized .ibiz-control-grid-setting-box{display:flex;align-items:center;justify-content:flex-start;position:absolute;top:0;right:0;z-index:10;height:var(--ibiz-control-grid-now-header-height);padding-right:var(--ibiz-spacing-extra-tight);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-quick-toolbar{justify-content:center}.ibiz-control-grid-batch-toolbar{position:absolute;top:0;left:54px;z-index:99;display:none;width:calc(100% - 54px);height:var(--ibiz-control-grid-now-header-height);font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-batch-toolbar.is-show{display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-separator{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-content{height:100%;display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-text{flex:none}

package/lib/control/grid/grid/index.cjs CHANGED Viewed

@@ -6,6 +6,7 @@ var runtime = require('@ibiz-template/runtime');
 var vue3Util = require('@ibiz-template/vue3-util');
 require('../grid-column/index.cjs');
 var rowEditPopover = require('../row-edit-popover/row-edit-popover.cjs');
+var index$6 = require('../virtualized-table/index.cjs');
 var grid = require('./grid.cjs');
 var grid_provider = require('./grid.provider.cjs');
 var gridControl_util = require('./grid-control.util.cjs');
@@ -26,6 +27,7 @@ const IBizGridControl = vue3Util.withInstall(grid.GridControl, (v) => {
   v.use(index$3.IBizGridFieldEditColumn);
   v.use(index$4.IBizGridGroupColumn);
   v.use(index$5.IBizDynamicGridFieldEditColumn);
+  v.use(index$6.IBizVirtualizedTableControl);
   runtime.registerControlProvider(runtime.ControlType.GRID, () => new grid_provider.GridProvider());
 });

package/lib/control/grid/grid-column/grid-field-column/attachment-column/attachment-column.cjs CHANGED Viewed

@@ -25,9 +25,10 @@ const AttachmentColumn = /* @__PURE__ */ vue.defineComponent({
   setup(props) {
     const ns = vue3Util.useNamespace("attachment-column");
     const {
-      downloadUrl,
+      getDownloadUrl,
       files,
-      onDownload
+      onDownload,
+      getDownloadTicketParams
     } = fileUtil.useFilesParse(props, props.controller);
     const loading = vue.ref(true);
     const onLoad = () => {
@@ -54,7 +55,16 @@ const AttachmentColumn = /* @__PURE__ */ vue.defineComponent({
       await overlay.onWillDismiss();
     };
     const handlePDFPreview = async (file) => {
-      const url = file.url || downloadUrl.value.replace("%fileId%", file.id);
+      const downloadUrl = getDownloadUrl(props.data, file);
+      let url = file.url || downloadUrl.replace("%fileId%", file.id);
+      if (ibiz.config.common.enableDownloadTicket) {
+        const downloadTicket = await ibiz.util.file.getDownloadTicket(props.controller.context, props.controller.params, props.data, {
+          fileId: file.id
+        }, getDownloadTicketParams());
+        if (downloadTicket && downloadTicket.ticket) {
+          url = downloadUrl.replace("%fileId%", downloadTicket.ticket);
+        }
+      }
       const response = await ibiz.net.request(url, {
         method: "get",
         responseType: "blob",

package/lib/control/grid/grid-column/grid-field-column/attachment-column/file-util.cjs CHANGED Viewed

@@ -24,8 +24,24 @@ const getFileType = (extension) => {
 function useFilesParse(props, c) {
   const files = vue.ref([]);
   const uploadUrl = vue.ref("");
-  const downloadUrl = vue.ref("");
   const svgBlob = /* @__PURE__ */ new Map();
+  const getDownloadTicketParams = () => {
+    const downloadTicketParams = {};
+    if (!c.model.userParam) {
+      return downloadTicketParams;
+    }
+    if (c.model.userParam.appentitytag) {
+      Object.assign(downloadTicketParams, {
+        appEntityTag: c.model.userParam.appentitytag
+      });
+    }
+    if (c.model.userParam.datafieldtag) {
+      Object.assign(downloadTicketParams, {
+        dataFieldTag: c.model.userParam.datafieldtag
+      });
+    }
+    return downloadTicketParams;
+  };
   const fetchSVGAsBase64 = async (url) => {
     try {
       const response = await fetch(url);
@@ -63,9 +79,30 @@ function useFilesParse(props, c) {
       });
     }
   };
+  const getDownloadUrl = (data, file) => {
+    const editorParams = {};
+    if (file && file.folder) {
+      editorParams.osscat = file.folder;
+    }
+    const urls = ibiz.util.file.calcFileUpDownUrl(
+      c.context,
+      c.params,
+      data,
+      editorParams
+    );
+    return urls.downloadUrl;
+  };
   const onDownload = (file) => {
-    const url = file.url || downloadUrl.value.replace("%fileId%", file.id);
-    ibiz.util.file.fileDownload(url, file.name);
+    const downloadUrl = getDownloadUrl(props.data, file);
+    const url = file.url || downloadUrl.replace("%fileId%", file.id);
+    ibiz.util.file.fileDownload(url, file.name, {
+      context: c.context,
+      params: c.params,
+      data: props.data,
+      file: { fileId: file.id, ...file },
+      extraParams: {},
+      downloadTicketParams: getDownloadTicketParams()
+    });
   };
   vue.watch(
     () => props.value,
@@ -85,7 +122,6 @@ function useFilesParse(props, c) {
           {}
         );
         uploadUrl.value = urls.uploadUrl;
-        downloadUrl.value = urls.downloadUrl;
       }
     },
     { immediate: true, deep: true }
@@ -93,28 +129,33 @@ function useFilesParse(props, c) {
   vue.watch(
     files,
     (newVal) => {
-      if ((newVal == null ? void 0 : newVal.length) && downloadUrl.value) {
+      if (newVal == null ? void 0 : newVal.length) {
         newVal.forEach((file) => {
+          const downloadUrl = getDownloadUrl(props.data, file);
           Object.assign(file, {
-            url: file.url || downloadUrl.value.replace("%fileId%", file.id)
-          });
-          if (file.name.split(".").pop() === "svg") {
-            calcSvgPreview(file);
-          }
-        });
-      }
-    },
-    { immediate: true }
-  );
-  vue.watch(
-    downloadUrl,
-    (newVal) => {
-      if (newVal && files.value.length) {
-        files.value.forEach((file) => {
-          Object.assign(file, {
-            url: downloadUrl.value.replace("%fileId%", file.id)
+            url: file.url || downloadUrl.replace("%fileId%", file.id)
           });
-          if (file.name.split(".").pop() === "svg") {
+          if (ibiz.config.common.enableDownloadTicket) {
+            ibiz.util.file.getDownloadTicket(
+              c.context,
+              c.params,
+              props.data,
+              {
+                fileId: file.id
+              },
+              getDownloadTicketParams()
+            ).then((downloadTicket) => {
+              if (downloadTicket && downloadTicket.ticket) {
+                file.url = downloadUrl.replace(
+                  "%fileId%",
+                  downloadTicket.ticket
+                );
+                if (file.name.split(".").pop() === "svg") {
+                  calcSvgPreview(file);
+                }
+              }
+            });
+          } else if (file.name.split(".").pop() === "svg") {
             calcSvgPreview(file);
           }
         });
@@ -126,7 +167,8 @@ function useFilesParse(props, c) {
     files,
     uploadUrl,
     onDownload,
-    downloadUrl
+    getDownloadUrl,
+    getDownloadTicketParams
   };
 }

package/lib/control/grid/grid-column/grid-field-column/grid-field-column.cjs CHANGED Viewed

@@ -26,7 +26,7 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
     var _a;
     const ns = vue3Util.useNamespace("grid-field-column");
     const zIndex = props.controller.grid.state.zIndex;
-    const columnType = (_a = props.controller.model.userParam) == null ? void 0 : _a.columnType;
+    const columnType = (_a = props.controller.model.userParam) == null ? void 0 : _a.columntype;
     const onCellClick = (event) => {
       if (props.controller.hasAction) {
         event.stopPropagation();
@@ -39,12 +39,9 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
         props.controller.openLinkView(props.row, event);
       }
     };
-    const CustomHtml = vue.ref("");
-    vue.watch(() => props.row, async () => {
-      CustomHtml.value = await props.controller.getCustomHtml(props.row);
-    }, {
-      deep: true,
-      immediate: true
+    const CustomHtml = vue3Util.computedAsync(async () => {
+      const html = await props.controller.getCustomHtml(props.row);
+      return html;
     });
     const fieldValue = vue.computed(() => props.row.data[props.controller.fieldName]);
     const formatValue = vue.computed(() => props.controller.formatValue(fieldValue.value));

package/lib/control/grid/grid-column/grid-field-column/grid-field-column.css CHANGED Viewed

	@@ -1 +1 @@
1	- .ibiz-grid-field-column{--ibiz-grid-field-column-cell-padding:var(--ibiz-control-grid-cell-padding);--ibiz-grid-field-column-clickable-text-color:var(--ibiz-color-link);--ibiz-grid-field-column-clickable-hover-text-color:var(--ibiz-color-link-hover);--ibiz-grid-field-column-color:var(--ibiz-color-text-2);display:inline-flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);width:100%;height:100%;padding:var(--ibiz-grid-field-column-cell-padding)}.ibiz-grid-field-column__text{font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);color:var(--ibiz-grid-field-column-color)}.ibiz-grid-field-column--clickable~~{cursor:pointer}.ibiz-grid-field-column--clickable~~ .ibiz-grid-field-column__text{color:var(--ibiz-grid-field-column-clickable-text-color)}.ibiz-grid-field-column--clickable .ibiz-grid-field-column__text:hover{color:var(--ibiz-grid-field-column-clickable-hover-text-color)}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column-text-container{min-width:0}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column-toolbar-container{flex-shrink:0}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column__script{max-height:calc(var(--ibiz-control-grid-content-row-height) - 2 * var(--ibiz-grid-field-column-cell-padding));line-height:calc(var(--ibiz-control-grid-content-row-height) - 2 * var(--ibiz-grid-field-column-cell-padding))}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column__script *{margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-grid-field-column--ellipsis span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-grid-field-column--wrap{word-break:break-word;white-space:pre-wrap}.ibiz-grid-field-column.is-has-action{justify-content:space-between}.ibiz-grid-field-column-text-container{display:inline-flex;flex-grow:1;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);height:100%}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__item:not(.ibiz-action-toolbar__item--level-250){display:none}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__separator{display:none}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__item.is-group{display:inline-flex;opacity:0}.el-table .el-table__body-wrapper tr:hover .ibiz-action-toolbar__item{display:inline-flex;opacity:1}.el-table .el-table__body-wrapper tr:hover .ibiz-action-toolbar__separator{display:inline-flex;opacity:1}.el-table .el-table__body-wrapper tr .ibiz-action-toolbar__item.is-expand{display:inline-flex;opacity:1}
1	+ .ibiz-grid-field-column{--ibiz-grid-field-column-cell-padding:var(--ibiz-control-grid-cell-padding);--ibiz-grid-field-column-clickable-text-color:var(--ibiz-color-link);--ibiz-grid-field-column-clickable-hover-text-color:var(--ibiz-color-link-hover);--ibiz-grid-field-column-color:var(--ibiz-color-text-0);display:inline-flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);width:100%;height:100%;padding:var(--ibiz-grid-field-column-cell-padding)}.ibiz-grid-field-column__text{font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);color:var(--ibiz-grid-field-column-color)}.ibiz-grid-field-column--clickable .ibiz-grid-field-column__text{color:var(--ibiz-grid-field-column-clickable-text-color)}.ibiz-grid-field-column--clickable .ibiz-grid-field-column__text:hover{color:var(--ibiz-grid-field-column-clickable-hover-text-color)}.ibiz-grid-field-column--clickable{cursor:pointer}.ibiz-grid-field-column--ellipsis{overflow:hidden}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column-text-container{min-width:0}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column-toolbar-container{flex-shrink:0}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column__script{max-height:calc(var(--ibiz-control-grid-content-row-height) - 2 * var(--ibiz-grid-field-column-cell-padding));line-height:calc(var(--ibiz-control-grid-content-row-height) - 2 * var(--ibiz-grid-field-column-cell-padding))}.ibiz-grid-field-column--ellipsis .ibiz-grid-field-column__script *{margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-grid-field-column--ellipsis span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-grid-field-column--wrap{word-break:break-word;white-space:pre-wrap}.ibiz-grid-field-column.is-has-action{justify-content:space-between}.ibiz-grid-field-column-text-container{display:inline-flex;flex-grow:1;align-items:center;justify-content:var(--ibiz-grid-column-justify-content);height:100%}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__item:not(.ibiz-action-toolbar__item--level-250){display:none}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__separator{display:none}.ibiz-grid-field-column-toolbar-container .ibiz-action-toolbar__item.is-group{display:inline-flex;opacity:0}.el-table .el-table__body-wrapper tr:hover .ibiz-action-toolbar__item{display:inline-flex;opacity:1}.el-table .el-table__body-wrapper tr:hover .ibiz-action-toolbar__separator{display:inline-flex;opacity:1}.el-table .el-table__body-wrapper tr .ibiz-action-toolbar__item.is-expand{display:inline-flex;opacity:1}