@ibiz-template/vue3-components 0.6.9 → 0.6.10

package/lib/editor/text-box/input/input.cjs

@@ -270,7 +270,7 @@ const IBizInput = /* @__PURE__ */ vue.defineComponent({
           "name": "unlock-alt"
         }, null);
       }
-      content = vue.createVNode(vue.resolveComponent("el-input"), {
+      content = vue.createVNode(vue.resolveComponent("el-input"), vue.mergeProps({
         "ref": "editorRef",
         "clearable": true,
         "modelValue": this.currentVal,
@@ -291,7 +291,7 @@ const IBizInput = /* @__PURE__ */ vue.defineComponent({
         "disabled": this.disabled,
         "show-password": this.type === "password",
         "autocomplete": this.shouldAutoComplete
-      }, _isSlot(slots) ? slots : {
+      }, this.$attrs), _isSlot(slots) ? slots : {
         default: () => [slots]
       });
     }

package/lib/editor/upload/ibiz-file-upload/ibiz-file-upload.cjs

@@ -66,7 +66,7 @@ const IBizFileUpload = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode("div", {
       "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : "", this.ns.is("show-default", this.showFormDefaultContent)],
       "ref": "componentRef"
-    }, [vue.createVNode(vue.resolveComponent("el-upload"), {
+    }, [vue.createVNode(vue.resolveComponent("el-upload"), vue.mergeProps({
       "class": [this.ns.b("icon"), this.ns.is("not-show", this.noUploadIcon)],
       "file-list": this.files,
       "action": this.uploadUrl,
@@ -81,7 +81,7 @@ const IBizFileUpload = /* @__PURE__ */ vue.defineComponent({
       "onError": this.onError,
       "onRemove": this.onRemove,
       "onPreview": this.onDownload
-    }, {
+    }, this.$attrs), {
       default: () => [this.noUploadIcon ? null : vue.createVNode(vue.resolveComponent("el-button"), {
         "class": [this.ns.b("button")],
         "size": this.isGridEditor ? "small" : "default"

package/lib/editor/upload/ibiz-image-preview/ibiz-image-preview.cjs

@@ -30,11 +30,11 @@ const IBizImagePreview = /* @__PURE__ */ vue.defineComponent({
       "onClick": (e) => {
         e.stopPropagation();
       }
-    }, [vue.createVNode(vue.resolveComponent("el-image"), {
+    }, [vue.createVNode(vue.resolveComponent("el-image"), vue.mergeProps({
       "fit": "contain",
       "src": this.value,
       "preview-src-list": [this.value]
-    }, null)]);
+    }, this.$attrs), null)]);
   }
 });
 

package/lib/editor/upload/ibiz-image-upload/ibiz-image-upload.cjs

@@ -95,7 +95,7 @@ const IBizImageUpload = /* @__PURE__ */ vue.defineComponent({
       "class": this.ns.e("remove-icon"),
       "onClick": () => this.onRemove(item),
       "name": "remove"
-    }, null)])]))]), vue.createVNode(vue.resolveComponent("el-upload"), {
+    }, null)])]))]), vue.createVNode(vue.resolveComponent("el-upload"), vue.mergeProps({
       "ref": "imageUpload",
       "class": [this.ns.b("icon"), this.ns.is("not-show", this.noUploadIcon)],
       "file-list": this.files,
@@ -112,19 +112,19 @@ const IBizImageUpload = /* @__PURE__ */ vue.defineComponent({
       "onError": this.onError,
       "onRemove": this.onRemove,
       "onPreview": this.onDownload
-    }, {
+    }, this.$attrs), {
       default: () => [vue.createVNode("ion-icon", {
         "name": "add-outline",
         "class": this.ns.e("image-upload-add")
       }, null)]
-    }), this.dialogVisible ? vue.createVNode(vue.resolveComponent("el-image-viewer"), {
+    }), this.dialogVisible ? vue.createVNode(vue.resolveComponent("el-image-viewer"), vue.mergeProps({
       "onClose": () => this.onDialogVisibleChange(false),
       "url-list": [this.dialogImageUrl],
       "hide-on-click-modal": true,
       "close-on-press-escape": true,
       "teleported": true,
       "z-index": 9999
-    }, null) : null]);
+    }, this.$attrs), null) : null]);
   }
 });
 

package/lib/editor/user/ibiz-searchcond-edit/ibiz-searchcond-edit.cjs

@@ -154,7 +154,7 @@ const IBizSearchCondEdit = /* @__PURE__ */ vue.defineComponent({
     if (this.readonly) {
       content = qxUtil.isNilOrEmpty(this.currentVal) ? "" : "".concat(this.currentVal);
     } else {
-      content = [vue.createVNode(vue.resolveComponent("el-input"), {
+      content = [vue.createVNode(vue.resolveComponent("el-input"), vue.mergeProps({
         "ref": "editorRef",
         "class": [this.ns.b("input")],
         "model-value": this.currentVal,
@@ -166,7 +166,7 @@ const IBizSearchCondEdit = /* @__PURE__ */ vue.defineComponent({
         "onFocus": this.onFocus,
         "onBlur": this.onBlur,
         "onKeyup": this.handleKeyUp
-      }, null), vue.createVNode(vue.resolveComponent("el-button"), {
+      }, this.$attrs), null), vue.createVNode(vue.resolveComponent("el-button"), {
         "ref": "filterButtonRef",
         "type": "primary",
         "title": "\u7F16\u8F91",

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

@@ -38,6 +38,16 @@ class ExpViewEngine extends runtime.MDViewEngine {
   get xdataControl() {
     return this.expBar.xDataController;
   }
+  constructor(view) {
+    var _a, _b;
+    const modelData = (_b = (_a = view.model.viewLayoutPanel) == null ? void 0 : _a.controls) == null ? void 0 : _b.find(
+      (item) => item.id === "searchbar"
+    );
+    if (modelData && !modelData.name) {
+      modelData.name = "searchbar";
+    }
+    super(view);
+  }
   /**
    * 组件创建
    *

package/lib/view-engine/index.cjs

@@ -44,6 +44,7 @@ var reportView_engine = require('./report-view.engine.cjs');
 var ganttView_engine = require('./gantt-view.engine.cjs');
 var deIndexViewEngine = require('./de-index-view-engine.cjs');
 var subAppRefView_engine = require('./sub-app-ref-view.engine.cjs');
+var tabSearchView_engine = require('./tab-search-view.engine.cjs');
 
 "use strict";
 const IBizViewEngine = {
@@ -276,6 +277,10 @@ const IBizViewEngine = {
       "VIEW_DEINDEXVIEW",
       (c) => new deIndexViewEngine.DEIndexViewEngine(c)
     );
+    ibiz.engine.register(
+      "VIEW_DETABSEARCHVIEW",
+      (c) => new tabSearchView_engine.TabSearchViewEngine(c)
+    );
   }
 };
 

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

@@ -0,0 +1,107 @@
+'use strict';
+
+var runtime = require('@ibiz-template/runtime');
+var tabExpView_engine = require('./tab-exp-view.engine.cjs');
+
+"use strict";
+class TabSearchViewEngine extends tabExpView_engine.TabExpViewEngine {
+  /**
+   * 搜索表单控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get searchForm() {
+    return this.view.getController("searchform");
+  }
+  /**
+   * 搜索栏控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get searchBar() {
+    return this.view.getController("searchbar");
+  }
+  /**
+   * 分页导航面板控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get tabExpPanel() {
+    return this.view.getController("tabexppanel");
+  }
+  async onCreated() {
+    await super.onCreated();
+    const { childNames } = this.view;
+    childNames.push("searchform", "searchbar");
+  }
+  async onMounted() {
+    await super.onMounted();
+    const controller = this.viewLayoutPanel.panelItems.view_searchform;
+    if (controller) {
+      const formExists = !!this.searchForm;
+      controller.state.keepAlive = formExists;
+      controller.state.visible = formExists;
+    }
+    const searchbarC = this.viewLayoutPanel.panelItems.view_searchbar;
+    if (searchbarC) {
+      const visible = this.searchBar && !!(this.searchBar.model.enableQuickSearch || this.searchBar.model.enableGroup || this.searchBar.model.enableFilter === true);
+      searchbarC.state.visible = visible;
+    }
+    if (this.searchForm) {
+      this.searchForm.evt.on("onSearch", () => {
+        this.calcViewParams();
+      });
+    }
+    if (this.searchBar) {
+      this.searchBar.evt.on("onSearch", () => {
+        this.calcViewParams();
+      });
+    }
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
+  async call(key, args) {
+    if (key === runtime.SysUIActionTag.SEARCH) {
+      await this.searchForm.search();
+      return null;
+    }
+    if (key === runtime.SysUIActionTag.RESET) {
+      await this.searchForm.reset();
+      return null;
+    }
+    if (key === runtime.SysUIActionTag.REFRESH) {
+      await this.calcViewParams();
+      return null;
+    }
+    return super.call(key, args);
+  }
+  /**
+   * 获取搜索相关的查询参数
+   * @author lxm
+   * @date 2023-05-22 03:26:04
+   * @return {*}  {IParams}
+   */
+  getSearchParams() {
+    const params = {};
+    if (this.searchForm) {
+      Object.assign(params, this.searchForm.getFilterParams());
+    }
+    if (this.searchBar) {
+      Object.assign(params, this.searchBar.getFilterParams());
+    }
+    return params;
+  }
+  /**
+   * 重新计算视图参数
+   * @author lxm
+   * @date 2024-03-18 05:00:02
+   */
+  calcViewParams() {
+    this.tabExpPanel.state.expViewParams = this.getSearchParams();
+    this.tabExpPanel.refresh();
+  }
+}
+
+exports.TabSearchViewEngine = TabSearchViewEngine;

package/lib/web-app/guard/auth-guard/auth-guard.cjs

@@ -115,11 +115,15 @@ class AuthGuard {
       const remember = qxUtil.getCookie(core.CoreConst.TOKEN_REMEMBER);
       const refreshToken = qxUtil.getCookie(core.CoreConst.REFRESH_TOKEN);
       if (responseStatus === 401 && remember && refreshToken != null && refreshToken !== "") {
-        await ibiz.auth.refreshToken();
-        if (ibiz.env.isSaaSMode === true) {
-          await this.loadOrgData();
+        try {
+          await ibiz.auth.refreshToken();
+          if (ibiz.env.isSaaSMode === true) {
+            await this.loadOrgData();
+          }
+          await this.loadAppData();
+        } catch (refreshTokenError) {
+          throw error;
         }
-        await this.loadAppData();
       } else {
         throw error;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "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.41",
-    "@ibiz-template/core": "0.6.10",
+    "@ibiz-template/core": "0.6.11",
     "@ibiz-template/devtool": "0.0.1-dev.6",
-    "@ibiz-template/model-helper": "0.6.10",
-    "@ibiz-template/runtime": "0.6.10",
+    "@ibiz-template/model-helper": "0.6.11",
+    "@ibiz-template/runtime": "0.6.11",
     "@ibiz-template/theme": "^0.6.0",
-    "@ibiz-template/vue3-util": "0.6.10",
-    "@ibiz-template/web-theme": "^1.1.11",
-    "@ibiz/model-core": "^0.1.15",
+    "@ibiz-template/vue3-util": "0.6.11",
+    "@ibiz-template/web-theme": "^1.1.12",
+    "@ibiz/model-core": "^0.1.17",
     "@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.15",
+    "@ibiz/model-core": "^0.1.17",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",