@ibiz-template/vue3-components 0.6.13 → 0.6.15

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/grid.cjs

@@ -56,7 +56,7 @@ function renderColumn(c, model, renderColumns, index) {
           controller: columnC,
           row: rowState,
           key: elRow.tempsrfkey + columnName,
-          ...renderAttrs(model, {
+          attrs: renderAttrs(model, {
             ...c.getEventArgs(),
             data: rowState.data
           })

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/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.cjs

@@ -23,6 +23,10 @@ const GridFieldEditColumn = /* @__PURE__ */ vue.defineComponent({
     row: {
       type: runtime.GridRowState,
       required: true
+    },
+    attrs: {
+      type: Object,
+      required: false
     }
   },
   setup(props) {
@@ -95,7 +99,7 @@ const GridFieldEditColumn = /* @__PURE__ */ vue.defineComponent({
         onInfoTextChange: this.onInfoTextChange,
         title: this.tooltip,
         ...this.editorProps,
-        ...this.$attrs
+        ...this.attrs
       })]
     });
   }

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/editor/text-box/ibiz-input-number/ibiz-input-number.css

@@ -1 +1 @@
-.ibiz-input-number{display:flex;align-items:center;height:100%}.ibiz-input-number .el-input .el-input__inner{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);border-color:var(--ibiz-form-item-border-color)}.ibiz-input-number .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-input-number .el-input.is-disabled .el-input__wrapper{background-color:var(--ibiz-form-item-disabled-bg-color)}.ibiz-input-number .ibiz-input-number-input{flex-grow:1;width:auto;height:var(--ibiz-editor-default-line-height)}.ibiz-input-number--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color);word-break:break-word;white-space:pre-wrap}.ibiz-input-number .ibiz-input-number__unit{flex:0 0 auto;margin-left:10px;font-size:var(--ibiz-form-item-font-size);font-style:normal}.ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input{display:block}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__decrease,.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__increase{top:2px}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-input{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-input{display:block}
+.ibiz-input-number{display:flex;align-items:center;height:100%}.ibiz-input-number .el-input .el-input__inner{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);text-align:left;border-color:var(--ibiz-form-item-border-color)}.ibiz-input-number .el-input-number.is-without-controls .el-input__wrapper{padding-right:11px;padding-left:11px}.ibiz-input-number .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-input-number .el-input.is-disabled .el-input__wrapper{background-color:var(--ibiz-form-item-disabled-bg-color)}.ibiz-input-number .ibiz-input-number-input{flex-grow:1;width:auto;height:var(--ibiz-editor-default-line-height)}.ibiz-input-number--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color);word-break:break-word;white-space:pre-wrap}.ibiz-input-number .ibiz-input-number__unit{flex:0 0 auto;margin-left:10px;font-size:var(--ibiz-form-item-font-size);font-style:normal}.ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input{display:block}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__decrease,.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__increase{top:2px}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-input{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-input{display:block}

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

@@ -93,6 +93,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
     };
     this.form.evt.on("onLoadSuccess", (event) => {
       formDataStateChange(event);
+      this.view.state.srfactiveviewdata = event.data[0];
       evt.emit("onDataChange", { ...event, actionType: "LOAD" });
     });
     this.form.evt.on("onLoadDraftSuccess", (event) => {
@@ -127,7 +128,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
     return this.form.save();
   }
   async refresh() {
-    await this.load();
+    this.form.doNextActive(() => this.load(), { key: "load" });
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
@@ -265,7 +266,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/opt-view.engine.cjs

@@ -66,6 +66,7 @@ class OptViewEngine extends runtime.ViewEngineBase {
       }
     };
     this.form.evt.on("onLoadSuccess", (event) => {
+      this.view.state.srfactiveviewdata = event.data[0];
       formDataStateChange(event);
     });
     this.form.evt.on("onLoadDraftSuccess", (event) => {

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

@@ -126,7 +126,7 @@ class ReportViewEngine extends runtime.ViewEngineBase {
    * @memberof ReportViewEngine
    */
   async refresh() {
-    await this.load();
+    this.reportpanel.doNextActive(() => this.load(), { key: "load" });
   }
   /**
    * 获取搜索相关的查询参数

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.15",
   "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.16",
     "@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.16",
+    "@ibiz-template/runtime": "0.6.16",
     "@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.16",
+    "@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",