@ibiz-template/vue3-components 0.5.7-alpha.4 → 0.5.7-alpha.6

package/lib/util/confirm-util/confirm-util.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var core = require('@ibiz-template/core');
-var ElementPlus = require('element-plus');
+var elementPlus = require('element-plus');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -16,7 +16,7 @@ class ConfirmUtil {
   }
   async info(params) {
     return new Promise((resolve) => {
-      ElementPlus.ElMessageBox.confirm(params.desc, params.title, {
+      elementPlus.ElMessageBox.confirm(params.desc, params.title, {
         customClass: "".concat(this.ns.b(), " ").concat(this.ns.e("info")),
         type: "info",
         cancelButtonClass: "".concat(this.ns.b("cancel"), " el-button--info"),
@@ -27,7 +27,7 @@ class ConfirmUtil {
   }
   async success(params) {
     return new Promise((resolve) => {
-      ElementPlus.ElMessageBox.confirm(params.desc, params.title, {
+      elementPlus.ElMessageBox.confirm(params.desc, params.title, {
         customClass: "".concat(this.ns.b(), " ").concat(this.ns.e("success")),
         cancelButtonClass: "".concat(this.ns.b("cancel"), " el-button--info"),
         confirmButtonClass: "".concat(this.ns.b("ok")),
@@ -38,7 +38,7 @@ class ConfirmUtil {
   }
   async warning(params) {
     return new Promise((resolve) => {
-      ElementPlus.ElMessageBox.confirm(params.desc, params.title, {
+      elementPlus.ElMessageBox.confirm(params.desc, params.title, {
         customClass: "".concat(this.ns.b(), " ").concat(this.ns.e("warning")),
         cancelButtonClass: "".concat(this.ns.b("cancel"), " el-button--info"),
         confirmButtonClass: "".concat(this.ns.b("ok")),
@@ -49,7 +49,7 @@ class ConfirmUtil {
   }
   async error(params) {
     return new Promise((resolve) => {
-      ElementPlus.ElMessageBox.confirm(params.desc, params.title, {
+      elementPlus.ElMessageBox.confirm(params.desc, params.title, {
         customClass: "".concat(this.ns.b(), " ").concat(this.ns.e("error")),
         cancelButtonClass: "".concat(this.ns.b("cancel"), " el-button--info"),
         confirmButtonClass: "".concat(this.ns.b("ok")),

package/lib/util/loading-util/loading-util.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var ElementPlus = require('element-plus');
+var elementPlus = require('element-plus');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -44,7 +44,7 @@ class LoadingUtil {
    */
   show() {
     if (this.count === 0) {
-      this.loading = ElementPlus.ElLoading.service({ lock: true, fullscreen: true });
+      this.loading = elementPlus.ElLoading.service({ lock: true, fullscreen: true });
     }
     this.count += 1;
   }

package/lib/util/message-util/message-util.cjs

@@ -1,32 +1,32 @@
 'use strict';
 
-var ElementPlus = require('element-plus');
+var elementPlus = require('element-plus');
 
 "use strict";
 class MessageUtil {
   info(msg, duration, closable) {
-    ElementPlus.ElMessage.info({
+    elementPlus.ElMessage.info({
       message: msg,
       duration: duration ? duration * 1e3 : duration,
       showClose: closable
     });
   }
   success(msg, duration, closable) {
-    ElementPlus.ElMessage.success({
+    elementPlus.ElMessage.success({
       message: msg,
       duration: duration ? duration * 1e3 : duration,
       showClose: closable
     });
   }
   warning(msg, duration, closable) {
-    ElementPlus.ElMessage.warning({
+    elementPlus.ElMessage.warning({
       message: msg,
       duration: duration ? duration * 1e3 : duration,
       showClose: closable
     });
   }
   error(msg, duration, closable) {
-    ElementPlus.ElMessage.error({
+    elementPlus.ElMessage.error({
       message: msg,
       duration: duration ? duration * 1e3 : duration,
       showClose: closable

package/lib/util/modal-util/modal-util.cjs

@@ -1,24 +1,24 @@
 'use strict';
 
-var ElementPlus = require('element-plus');
+var elementPlus = require('element-plus');
 
 "use strict";
 class ModalUtil {
   async info(params) {
-    await ElementPlus.ElMessageBox.alert(params.desc, params.title, { type: "info" });
+    await elementPlus.ElMessageBox.alert(params.desc, params.title, { type: "info" });
   }
   async success(params) {
-    await ElementPlus.ElMessageBox.alert(params.desc, params.title, { type: "success" });
+    await elementPlus.ElMessageBox.alert(params.desc, params.title, { type: "success" });
   }
   async warning(params) {
-    await ElementPlus.ElMessageBox.alert(params.desc, params.title, { type: "warning" });
+    await elementPlus.ElMessageBox.alert(params.desc, params.title, { type: "warning" });
   }
   async error(params) {
-    await ElementPlus.ElMessageBox.alert(params.desc, params.title, { type: "error" });
+    await elementPlus.ElMessageBox.alert(params.desc, params.title, { type: "error" });
   }
   async confirm(params) {
     return new Promise((resolve) => {
-      ElementPlus.ElMessageBox.confirm(params.desc, params.title, params).then(() => resolve(true)).catch(() => resolve(false));
+      elementPlus.ElMessageBox.confirm(params.desc, params.title, params).then(() => resolve(true)).catch(() => resolve(false));
     });
   }
 }

package/lib/util/notice-util/notice-util.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var runtime = require('@ibiz-template/runtime');
-var ElementPlus = require('element-plus');
+var elementPlus = require('element-plus');
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 require('../../common/index.cjs');
@@ -22,7 +22,7 @@ class NoticeUtil {
     const ns = vue3Util.useNamespace("async-action-notice");
     const porvider = await runtime.getAsyncActionProvider(asyncAction);
     if (porvider.render) {
-      const ins = ElementPlus.ElNotification({
+      const ins = elementPlus.ElNotification({
         customClass: ns.b(),
         message: porvider.render({
           action: asyncAction,
@@ -38,7 +38,7 @@ class NoticeUtil {
   showDoingNotice(info) {
     if (!this.doingNotice) {
       const reactiveInfo = vue.reactive(info);
-      const ins = ElementPlus.ElNotification({
+      const ins = elementPlus.ElNotification({
         message: vue.h(doingNotice.DoingNotice, {
           info: reactiveInfo
         }),

package/lib/util/notification-util/notification-util.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var ElementPlus = require('element-plus');
+var elementPlus = require('element-plus');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -51,10 +51,11 @@ class NotificationUtil {
    */
   handleNotice(params, noticeType) {
     const duration = params.duration ? params.duration * 1e3 : 4500;
-    ElementPlus.ElNotification({
+    elementPlus.ElNotification({
       title: params.title,
       message: params.desc,
       type: noticeType,
+      position: params.position || "top-right",
       duration
     });
   }

package/lib/util/open-view-util/open-view-util.cjs

@@ -59,6 +59,13 @@ class OpenViewUtil {
   }
   async popover(appViewId, event, context, params, options = {}) {
     const appView = await ibiz.hub.config.view.get(appViewId);
+    const opts = {
+      width: appView.width,
+      height: appView.height,
+      autoClose: true,
+      placement: "bottom",
+      ...options
+    };
     return vue3Util.openViewPopover(
       event,
       {
@@ -66,7 +73,7 @@ class OpenViewUtil {
         params,
         viewId: appView.id
       },
-      { autoClose: true, placement: "bottom", ...options }
+      opts
     );
   }
   /**

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

@@ -151,16 +151,43 @@ class ReportViewEngine extends runtime.ViewEngineBase {
    * @memberof ReportViewEngine
    */
   calcViewHeaderVisible() {
-    let showHeader = super.calcViewHeaderVisible();
-    if (!this.searchBar || !this.searchBar.state.visible) {
-      const controller = this.viewLayoutPanel.panelItems.view_searchbar;
-      if (controller) {
-        controller.state.visible = false;
-      }
-    } else {
-      showHeader = true;
+    const showHeader = super.calcViewHeaderVisible();
+    const visible = this.calcViewSearchBarVisible();
+    return visible || showHeader;
+  }
+  /**
+   * 计算搜索栏显示
+   *
+   * @author zk
+   * @date 2024-01-29 05:01:36
+   * @protected
+   * @return {*}  {boolean}
+   * @memberof MDViewEngine
+   */
+  calcViewSearchBarVisible() {
+    const { model } = this.view;
+    const has = this.isExistAndInLayout("searchbar");
+    if (!has) {
+      return has;
+    }
+    const searchBar = runtime.getControl(model, "searchbar");
+    const visible = !!(searchBar.enableQuickSearch || searchBar.enableGroup || searchBar.enableFilter === true);
+    return visible;
+  }
+  /**
+   * 计算移除的模型名称
+   *
+   * @author zk
+   * @date 2024-01-29 03:01:42
+   * @return {*}  {string[]}
+   * @memberof MDViewEngine
+   */
+  calcRemoveLayoutModel() {
+    const names = super.calcRemoveLayoutModel();
+    if (!this.calcViewSearchBarVisible()) {
+      names.push("view_searchbar");
     }
-    return showHeader;
+    return names;
   }
   /**
    * 切换搜索表单的显示与否

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

@@ -22,6 +22,7 @@ class TabExpViewEngine extends runtime.ViewEngineBase {
    */
   async onCreated() {
     var _a;
+    this.preprocessTabExpModelLayout();
     await super.onCreated();
     const { childNames, model } = this.view;
     childNames.push("tabexppanel");
@@ -33,7 +34,6 @@ class TabExpViewEngine extends runtime.ViewEngineBase {
       (item) => item.id === "srfdefaultnav"
     )) == null ? void 0 : _a.value;
     this.view.slotProps.tabexppanel.defaultTabName = this.view.state.srfnav || srfdefaultnav;
-    this.preprocessTabExpModelLayout();
   }
   async onMounted() {
     await super.onMounted();
@@ -144,7 +144,7 @@ class TabExpViewEngine extends runtime.ViewEngineBase {
   calcViewHeaderVisible() {
     let showHeader = super.calcViewHeaderVisible();
     const { tabLayout } = this.view.model;
-    if ((tabLayout === void 0 || tabLayout === "TOP") && this.tabExpPanel) {
+    if (tabLayout === void 0 || tabLayout === "TOP" && runtime.getControl(this.view.model, "tabexppanel")) {
       showHeader = true;
     }
     return showHeader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.5.7-alpha.4",
+  "version": "0.5.7-alpha.6",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -27,12 +27,12 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.1",
     "@ibiz-template-plugin/gantt": "0.1.1",
-    "@ibiz-template/core": "^0.5.7-alpha.4",
-    "@ibiz-template/model-helper": "^0.5.7-alpha.4",
-    "@ibiz-template/runtime": "^0.5.7-alpha.4",
+    "@ibiz-template/core": "^0.5.7-alpha.6",
+    "@ibiz-template/model-helper": "^0.5.7-alpha.6",
+    "@ibiz-template/runtime": "^0.5.7-alpha.6",
     "@ibiz-template/theme": "^0.5.0",
-    "@ibiz-template/vue3-util": "^0.5.7-alpha.4",
-    "@ibiz/model-core": "^0.1.8",
+    "@ibiz-template/vue3-util": "^0.5.7-alpha.6",
+    "@ibiz/model-core": "^0.1.9",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",