@ibiz-template/vue3-components 0.6.13 → 0.6.14

package/es/common/data-import/data-import.mjs

@@ -65,7 +65,7 @@ const DataImport = /* @__PURE__ */ defineComponent({
         result = await importData(selectedFile, props.appDataEntity, props.dataImport, props.context);
         ibiz.mc.command.send({
           srfdecodename: props.appDataEntity.codeName
-        }, "OBJECTCREATED");
+        }, "OBJECTCREATED", "DATAIMPORT");
         const {
           success,
           total,

package/es/control/form/form/form.mjs

@@ -1,5 +1,5 @@
 import { isVNode, renderSlot, createVNode, resolveComponent, h, defineComponent } from 'vue';
-import { ScriptFactory, findChildFormDetails } from '@ibiz-template/runtime';
+import { ScriptFactory, findChildFormDetails, ControlType } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './form.css';
 
@@ -113,7 +113,8 @@ const FormControl = /* @__PURE__ */ defineComponent({
           });
         };
       } else {
-        const key = controlPanel ? model.name : "default";
+        const formSlotKey = model.controlType === ControlType.SEARCHFORM ? "searchform" : "form";
+        const key = controlPanel ? formSlotKey : "default";
         slots[key] = () => {
           return createVNode(resolveComponent("iBizFormPage"), {
             "modelData": this.c.model,

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

@@ -1,4 +1,4 @@
-import { ControlVO, GridRowState } from '@ibiz-template/runtime';
+import { Srfuf, ControlVO, GridRowState } from '@ibiz-template/runtime';
 import { ref, watch, nextTick, computed, watchEffect, onUnmounted } from 'vue';
 
 "use strict";
@@ -7,6 +7,9 @@ function useITableEvent(c) {
   let forbidChange = false;
   let isGridUISort = false;
   async function onRowClick(data, _column, _event) {
+    if (data.srfuf === Srfuf.CREATE) {
+      return;
+    }
     if (ibiz.config.grid.editShowMode === "row" && c.model.enableRowEdit) {
       const row = c.findRowState(data);
       if (row && row.showRowEdit !== true) {
@@ -17,6 +20,9 @@ function useITableEvent(c) {
     }
   }
   function onDbRowClick(data) {
+    if (data.srfuf === Srfuf.CREATE) {
+      return;
+    }
     c.onDbRowClick(data);
   }
   function onSelectionChange(selection) {

package/es/control/grid/grid-column/grid-field-edit-column/cell-edit.mjs

@@ -32,7 +32,7 @@ function useCellEdit(props, componentRef) {
     return cellEditable.value && !editable.value;
   });
   const stopPropagation = computed(() => {
-    return cellEditable.value;
+    return cellEditable.value || editorShowEdit.value;
   });
   let funcs;
   const onMaskClick = () => {

package/es/editor/date-picker/ibiz-date-picker/ibiz-date-picker.mjs

@@ -77,9 +77,8 @@ const IBizDatePicker = /* @__PURE__ */ defineComponent({
     };
     if (props.autoFocus) {
       watch(editorRef, (newVal) => {
-        if (newVal) {
-          const input = newVal.$el.getElementsByTagName("input")[0];
-          input.click();
+        if (newVal && newVal.focus) {
+          newVal.focus();
         }
       });
     }

package/es/editor/date-range/date-range-editor.controller.d.ts

@@ -8,6 +8,15 @@ import { IDateRange } from '@ibiz/model-core';
  * @extends {EditorController}
  */
 export declare class DateRangeEditorController extends EditorController<IDateRange> {
+    /**
+     * 日期选择弹框内选中的时间值
+     *
+     * @author ljx
+     * @date 2024-03-28 16:11:21
+     * @public
+     * @returns {*}  {string}
+     */
+    dateRange: IData;
     /**
      * 根据编辑器类型获取格式化
      *

package/es/editor/date-range/date-range-editor.controller.mjs

@@ -1,7 +1,25 @@
 import { EditorController } from '@ibiz-template/runtime';
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class DateRangeEditorController extends EditorController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 日期选择弹框内选中的时间值
+     *
+     * @author ljx
+     * @date 2024-03-28 16:11:21
+     * @public
+     * @returns {*}  {string}
+     */
+    __publicField(this, "dateRange", []);
+  }
   /**
    * 根据编辑器类型获取格式化
    *

package/es/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.d.ts

@@ -43,6 +43,7 @@ export declare const IBizDateRangePicker: import("vue").DefineComponent<{
     setEditable: (flag: boolean) => void;
     showFormDefaultContent: import("vue").ComputedRef<boolean>;
     handleKeyUp: (e: KeyboardEvent) => void;
+    onCalendarChange: (val: IData) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (_value: unknown, _name?: string | undefined) => boolean;
     blur: (_event?: IData | undefined) => boolean;

package/es/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.mjs

@@ -1,5 +1,6 @@
 import { ref, computed, resolveComponent, mergeProps, createVNode, defineComponent } from 'vue';
 import { getDateRangeProps, getEditorEmits, useNamespace } from '@ibiz-template/vue3-util';
+import { clone } from 'ramda';
 import './ibiz-date-range-picker.css';
 
 "use strict";
@@ -109,6 +110,9 @@ const IBizDateRangePicker = /* @__PURE__ */ defineComponent({
       emit("blur", e);
       setEditable(false);
     };
+    const onCalendarChange = (val) => {
+      c.dateRange = clone(val);
+    };
     const valueText = computed(() => {
       if (curValue.value.length > 0) {
         return "".concat(curValue.value[0], " ").concat(rangeSeparator, " ").concat(curValue.value[1]);
@@ -139,7 +143,8 @@ const IBizDateRangePicker = /* @__PURE__ */ defineComponent({
       isEditable,
       setEditable,
       showFormDefaultContent,
-      handleKeyUp
+      handleKeyUp,
+      onCalendarChange
     };
   },
   render() {
@@ -159,7 +164,8 @@ const IBizDateRangePicker = /* @__PURE__ */ defineComponent({
       "end-placeholder": this.endPlaceHolder,
       "unlink-panels": this.unlinkPanels,
       "onFocus": this.onFocus,
-      "onBlur": this.onBlur
+      "onBlur": this.onBlur,
+      "onCalendarChange": this.onCalendarChange
     }, this.$attrs), null);
     const readonlyContent = createVNode("div", {
       "class": (this.ns.b(), this.ns.m("readonly"))

package/es/panel-component/index.mjs

@@ -1,4 +1,4 @@
-import { IBizPanelContainer, IBizPanelCtrlPos, IBizScrollContainer, IBizNavPos, IBizSingleDataContainer, IBizMultiDataContainer, IBizPanelField, IBizPanelRawItem, IBizGridContainer, IBizPanelTabPage, IBizPanelContainerGroup, IBizPanelContainerImage, IBizPanelItemRender } from '@ibiz-template/vue3-util';
+import { IBizPanelContainer, IBizPanelCtrlPos, IBizScrollContainer, IBizNavPos, IBizSingleDataContainer, IBizMultiDataContainer, IBizPanelField, IBizPanelRawItem, IBizGridContainer, IBizPanelTabPage, IBizPanelContainerGroup, IBizPanelContainerImage, IBizPanelItemRender, IBizTeleportPlaceholder, IBizPanelContainerTabs } from '@ibiz-template/vue3-util';
 import { IBizAuthUserinfo } from './auth-userinfo/index.mjs';
 import { IBizNavPosIndex } from './nav-pos-index/index.mjs';
 import { IBizNavTabs } from './nav-tabs/index.mjs';
@@ -59,6 +59,8 @@ const IBizPanelComponents = {
     v.use(IBizPanelItemRender);
     v.use(IBizViewMessage);
     v.use(IBizPanelStaticCarousel);
+    v.use(IBizTeleportPlaceholder);
+    v.use(IBizPanelContainerTabs);
   }
 };
 

package/es/panel-component/user-message/async-action/async-action-preview/async-action-preview.mjs

@@ -12,10 +12,13 @@ function fileDownload(file) {
     baseURL: ""
     // 已经有baseURL了，这里无需再写
   }).then((response) => {
-    const filename = qs.parse(response.headers["content-disposition"], {
+    let filename = qs.parse(response.headers["content-disposition"], {
       delimiter: ";"
     }).filename;
     if (filename) {
+      if (filename.startsWith('"') && filename.endsWith('"')) {
+        filename = filename.substring(1, filename.length - 1);
+      }
       file.name += ".".concat(filename.split(".")[1]);
     }
     if (response.status !== 200) {
@@ -85,7 +88,7 @@ const AsyncActionPreview = /* @__PURE__ */ defineComponent({
         info.errorDetails = [];
       }
       if (actionResult.errorfile) {
-        info.errorFileUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.downloadFileUrl, "/").concat(actionResult.errorfile.folder, "/").concat(actionResult.errorfile.fileid);
+        info.errorFileUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.downloadFileUrl, "/").concat(actionResult.errorfile.folder, "/").concat(actionResult.errorfile.fileid).replace("/{cat}", "");
       }
     }
     const onDownLoad = () => {

package/es/view-engine/edit-view.engine.mjs

@@ -263,7 +263,11 @@ class EditViewEngine extends ViewEngineBase {
       },
       data instanceof ControlVO ? data.getOrigin() : data
     );
-    ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
+    ibiz.mc.command.send(
+      { srfdecodename: "SysTodo" },
+      "OBJECTUPDATED",
+      "WITHDRAW"
+    );
   }
   /**
    * 初始化标记打开数据相关逻辑

package/es/view-engine/tab-search-view.engine.d.ts

@@ -42,6 +42,7 @@ export declare class TabSearchViewEngine extends TabExpViewEngine {
      * @readonly
      */
     get tabExpPanel(): ITabExpPanelController;
+    protected preprocessTabExpModelLayout(): void;
     onCreated(): Promise<void>;
     onMounted(): Promise<void>;
     call(key: string, args: any): Promise<IData | null | undefined>;

package/es/view-engine/tab-search-view.engine.mjs

@@ -30,6 +30,8 @@ class TabSearchViewEngine extends TabExpViewEngine {
   get tabExpPanel() {
     return this.view.getController("tabexppanel");
   }
+  preprocessTabExpModelLayout() {
+  }
   async onCreated() {
     await super.onCreated();
     const { childNames } = this.view;

package/lib/common/data-import/data-import.cjs

@@ -67,7 +67,7 @@ const DataImport = /* @__PURE__ */ vue.defineComponent({
         result = await runtime.importData(selectedFile, props.appDataEntity, props.dataImport, props.context);
         ibiz.mc.command.send({
           srfdecodename: props.appDataEntity.codeName
-        }, "OBJECTCREATED");
+        }, "OBJECTCREATED", "DATAIMPORT");
         const {
           success,
           total,

package/lib/control/form/form/form.cjs

@@ -115,7 +115,8 @@ const FormControl = /* @__PURE__ */ vue.defineComponent({
           });
         };
       } else {
-        const key = controlPanel ? model.name : "default";
+        const formSlotKey = model.controlType === runtime.ControlType.SEARCHFORM ? "searchform" : "form";
+        const key = controlPanel ? formSlotKey : "default";
         slots[key] = () => {
           return vue.createVNode(vue.resolveComponent("iBizFormPage"), {
             "modelData": this.c.model,

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

@@ -9,6 +9,9 @@ function useITableEvent(c) {
   let forbidChange = false;
   let isGridUISort = false;
   async function onRowClick(data, _column, _event) {
+    if (data.srfuf === runtime.Srfuf.CREATE) {
+      return;
+    }
     if (ibiz.config.grid.editShowMode === "row" && c.model.enableRowEdit) {
       const row = c.findRowState(data);
       if (row && row.showRowEdit !== true) {
@@ -19,6 +22,9 @@ function useITableEvent(c) {
     }
   }
   function onDbRowClick(data) {
+    if (data.srfuf === runtime.Srfuf.CREATE) {
+      return;
+    }
     c.onDbRowClick(data);
   }
   function onSelectionChange(selection) {

package/lib/control/grid/grid-column/grid-field-edit-column/cell-edit.cjs

@@ -34,7 +34,7 @@ function useCellEdit(props, componentRef) {
     return cellEditable.value && !editable.value;
   });
   const stopPropagation = vue.computed(() => {
-    return cellEditable.value;
+    return cellEditable.value || editorShowEdit.value;
   });
   let funcs;
   const onMaskClick = () => {

package/lib/editor/date-picker/ibiz-date-picker/ibiz-date-picker.cjs

@@ -79,9 +79,8 @@ const IBizDatePicker = /* @__PURE__ */ vue.defineComponent({
     };
     if (props.autoFocus) {
       vue.watch(editorRef, (newVal) => {
-        if (newVal) {
-          const input = newVal.$el.getElementsByTagName("input")[0];
-          input.click();
+        if (newVal && newVal.focus) {
+          newVal.focus();
         }
       });
     }

package/lib/editor/date-range/date-range-editor.controller.cjs

@@ -3,7 +3,25 @@
 var runtime = require('@ibiz-template/runtime');
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class DateRangeEditorController extends runtime.EditorController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 日期选择弹框内选中的时间值
+     *
+     * @author ljx
+     * @date 2024-03-28 16:11:21
+     * @public
+     * @returns {*}  {string}
+     */
+    __publicField(this, "dateRange", []);
+  }
   /**
    * 根据编辑器类型获取格式化
    *

package/lib/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.cjs

@@ -2,6 +2,7 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
+var ramda = require('ramda');
 require('./ibiz-date-range-picker.css');
 
 "use strict";
@@ -111,6 +112,9 @@ const IBizDateRangePicker = /* @__PURE__ */ vue.defineComponent({
       emit("blur", e);
       setEditable(false);
     };
+    const onCalendarChange = (val) => {
+      c.dateRange = ramda.clone(val);
+    };
     const valueText = vue.computed(() => {
       if (curValue.value.length > 0) {
         return "".concat(curValue.value[0], " ").concat(rangeSeparator, " ").concat(curValue.value[1]);
@@ -141,7 +145,8 @@ const IBizDateRangePicker = /* @__PURE__ */ vue.defineComponent({
       isEditable,
       setEditable,
       showFormDefaultContent,
-      handleKeyUp
+      handleKeyUp,
+      onCalendarChange
     };
   },
   render() {
@@ -161,7 +166,8 @@ const IBizDateRangePicker = /* @__PURE__ */ vue.defineComponent({
       "end-placeholder": this.endPlaceHolder,
       "unlink-panels": this.unlinkPanels,
       "onFocus": this.onFocus,
-      "onBlur": this.onBlur
+      "onBlur": this.onBlur,
+      "onCalendarChange": this.onCalendarChange
     }, this.$attrs), null);
     const readonlyContent = vue.createVNode("div", {
       "class": (this.ns.b(), this.ns.m("readonly"))

package/lib/panel-component/index.cjs

@@ -63,6 +63,8 @@ const IBizPanelComponents = {
     v.use(vue3Util.IBizPanelItemRender);
     v.use(index$h.IBizViewMessage);
     v.use(index$i.IBizPanelStaticCarousel);
+    v.use(vue3Util.IBizTeleportPlaceholder);
+    v.use(vue3Util.IBizPanelContainerTabs);
   }
 };
 

package/lib/panel-component/user-message/async-action/async-action-preview/async-action-preview.cjs

@@ -14,10 +14,13 @@ function fileDownload(file) {
     baseURL: ""
     // 已经有baseURL了，这里无需再写
   }).then((response) => {
-    const filename = qs.parse(response.headers["content-disposition"], {
+    let filename = qs.parse(response.headers["content-disposition"], {
       delimiter: ";"
     }).filename;
     if (filename) {
+      if (filename.startsWith('"') && filename.endsWith('"')) {
+        filename = filename.substring(1, filename.length - 1);
+      }
       file.name += ".".concat(filename.split(".")[1]);
     }
     if (response.status !== 200) {
@@ -87,7 +90,7 @@ const AsyncActionPreview = /* @__PURE__ */ vue.defineComponent({
         info.errorDetails = [];
       }
       if (actionResult.errorfile) {
-        info.errorFileUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.downloadFileUrl, "/").concat(actionResult.errorfile.folder, "/").concat(actionResult.errorfile.fileid);
+        info.errorFileUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.downloadFileUrl, "/").concat(actionResult.errorfile.folder, "/").concat(actionResult.errorfile.fileid).replace("/{cat}", "");
       }
     }
     const onDownLoad = () => {

package/lib/view-engine/edit-view.engine.cjs

@@ -265,7 +265,11 @@ class EditViewEngine extends runtime.ViewEngineBase {
       },
       data instanceof runtime.ControlVO ? data.getOrigin() : data
     );
-    ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
+    ibiz.mc.command.send(
+      { srfdecodename: "SysTodo" },
+      "OBJECTUPDATED",
+      "WITHDRAW"
+    );
   }
   /**
    * 初始化标记打开数据相关逻辑

package/lib/view-engine/tab-search-view.engine.cjs

@@ -32,6 +32,8 @@ class TabSearchViewEngine extends tabExpView_engine.TabExpViewEngine {
   get tabExpPanel() {
     return this.view.getController("tabexppanel");
   }
+  preprocessTabExpModelLayout() {
+  }
   async onCreated() {
     await super.onCreated();
     const { childNames } = this.view;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -30,14 +30,14 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.1",
     "@ibiz-template-plugin/gantt": "0.1.3-alpha.46",
-    "@ibiz-template/core": "0.6.13",
+    "@ibiz-template/core": "0.6.15",
     "@ibiz-template/devtool": "0.0.1-dev.6",
-    "@ibiz-template/model-helper": "0.6.14",
-    "@ibiz-template/runtime": "0.6.14",
+    "@ibiz-template/model-helper": "0.6.15",
+    "@ibiz-template/runtime": "0.6.15",
     "@ibiz-template/theme": "^0.6.0",
-    "@ibiz-template/vue3-util": "0.6.14",
-    "@ibiz-template/web-theme": "^1.1.13",
-    "@ibiz/model-core": "^0.1.18",
+    "@ibiz-template/vue3-util": "0.6.15",
+    "@ibiz-template/web-theme": "^1.1.14",
+    "@ibiz/model-core": "^0.1.19",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -100,7 +100,7 @@
     "@ibiz-template/runtime": "^0.6.0",
     "@ibiz-template/theme": "^0.6.0",
     "@ibiz-template/vue3-util": "^0.6.0",
-    "@ibiz/model-core": "^0.1.17",
+    "@ibiz/model-core": "^0.1.19",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",