@ibiz-template/vue3-components 0.7.38-alpha.56 → 0.7.39

package/es/view-engine/custom-view.engine.d.ts

@@ -1,7 +1,36 @@
-import { IViewController, ViewEngineBase, IViewEvent, IViewState } from '@ibiz-template/runtime';
-import { IAppDECustomView } from '@ibiz/model-core';
+import { IViewEvent, IViewState, ViewEngineBase, IViewController } from '@ibiz-template/runtime';
+import { IControl, IMDControl, IAppDECustomView } from '@ibiz/model-core';
 export declare class CustomViewEngine extends ViewEngineBase {
     protected view: IViewController<IAppDECustomView, IViewState, IViewEvent>;
+    /**
+     * 部件集合
+     *
+     * @type {IControl[]}
+     * @memberof CustomViewEngine
+     */
+    controls: IControl[];
+    /**
+     * 视图created生命周期执行逻辑
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof CustomViewEngine
+     */
+    onCreated(): Promise<void>;
+    /**
+     * 视图mounted生命周期执行逻辑
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof CustomViewEngine
+     */
+    onMounted(): Promise<void>;
+    /**
+     * 计算工具栏按钮状态
+     *
+     * @param {IMDControl} control 数据部件模型
+     * @param {(IData | undefined)} data 数据
+     * @memberof CustomViewEngine
+     */
+    calcToolbarButtonState(control: IMDControl, data: IData | undefined): void;
     /**
      * 执行视图预置界面行为能力
      *

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

@@ -1,7 +1,81 @@
-import { ViewEngineBase, SysUIActionTag } from '@ibiz-template/runtime';
+import { ViewEngineBase, getControlsByView, SysUIActionTag } 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 CustomViewEngine extends ViewEngineBase {
+  constructor() {
+    super(...arguments);
+    /**
+     * 部件集合
+     *
+     * @type {IControl[]}
+     * @memberof CustomViewEngine
+     */
+    __publicField(this, "controls", []);
+  }
+  /**
+   * 视图created生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof CustomViewEngine
+   */
+  async onCreated() {
+    await super.onCreated();
+    this.controls = getControlsByView(this.view.model);
+  }
+  /**
+   * 视图mounted生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof CustomViewEngine
+   */
+  async onMounted() {
+    await super.onMounted();
+    this.calcToolbarState = this.calcToolbarState.bind(this);
+    this.controls.forEach((ctrl) => {
+      const control = this.view.getController(
+        ctrl.name
+      );
+      control == null ? void 0 : control.evt.on(
+        "onLoadSuccess",
+        () => this.calcToolbarButtonState(ctrl, void 0)
+      );
+      control == null ? void 0 : control.evt.on(
+        "onSelectionChange",
+        (evt) => this.calcToolbarButtonState(ctrl, evt.data[0])
+      );
+      control == null ? void 0 : control.evt.on(
+        "onRefreshSuccess",
+        (evt) => this.calcToolbarButtonState(ctrl, evt.data[0])
+      );
+    });
+  }
+  /**
+   * 计算工具栏按钮状态
+   *
+   * @param {IMDControl} control 数据部件模型
+   * @param {(IData | undefined)} data 数据
+   * @memberof CustomViewEngine
+   */
+  calcToolbarButtonState(control, data) {
+    const model = this.controls.find(
+      (ctrl) => {
+        var _a;
+        return ctrl.controlType === "TOOLBAR" && ((_a = ctrl.xdataControlName) == null ? void 0 : _a.toLowerCase()) === control.name;
+      }
+    );
+    if (model) {
+      const toolbar = this.view.getController(
+        model.name
+      );
+      toolbar == null ? void 0 : toolbar.calcButtonState(data, control.appDataEntityId);
+    }
+  }
   /**
    * 执行视图预置界面行为能力
    *

package/es/view-engine/edit-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IEditFormController, EventBase, IEditViewState, IEditViewEvent, IPanelItemCoopPosController, DEMainViewEngine, FormSaveParams } from '@ibiz-template/runtime';
+import { ViewController, IEditFormController, EventBase, IEditViewState, IEditViewEvent, DEMainViewEngine, FormSaveParams } from '@ibiz-template/runtime';
 import { IAppDEEditView } from '@ibiz/model-core';
 export declare class EditViewEngine extends DEMainViewEngine {
     /**
@@ -14,7 +14,6 @@ export declare class EditViewEngine extends DEMainViewEngine {
      */
     protected view: ViewController<IAppDEEditView, IEditViewState, IEditViewEvent>;
     get form(): IEditFormController;
-    get coopPos(): IPanelItemCoopPosController | undefined;
     protected init(): void;
     /**
      * 模态事件钩子

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

@@ -6,10 +6,6 @@ class EditViewEngine extends DEMainViewEngine {
   get form() {
     return this.view.getController("form");
   }
-  get coopPos() {
-    var _a;
-    return (_a = this.view.layoutPanel) == null ? void 0 : _a.panelItems.coop_pos;
-  }
   init() {
     super.init();
     if (this.view.model.multiFormMode === 1 && this.view.params.srfdatatype) {
@@ -342,31 +338,14 @@ class EditViewEngine extends DEMainViewEngine {
    * @memberof EditViewEngine
    */
   doMarkDataAction() {
+    super.doMarkDataAction();
     if (this.doActions.includes("VIEW")) {
-      const callback = async (data) => {
-        const dataInfo = this.form.getData()[0].srfmajortext;
-        this.markOpenDataCallback(data, dataInfo);
-      };
-      this.form.evt.on("onLoadSuccess", async (event) => {
-        const data = event.data[0];
-        const result = await this.sendMarkDataAction("VIEW", data.srfkey);
-        if (result.ok && result.data.length > 0) {
-          result.data.forEach((item) => {
-            var _a;
-            if (item.data) {
-              (_a = this.coopPos) == null ? void 0 : _a.updateMessage({
-                data: item.data
-              });
-            }
-          });
-        }
-        this.subscribeMarkDataAction(data.srfkey, callback);
-      });
+      this.form.evt.on("onLoadSuccess", () => this.sendViewDataAction());
     }
     if (this.doActions.includes("EDIT")) {
       let isWait = false;
-      this.form.evt.on("onFormDataChange", (event) => {
-        const data = event.data[0];
+      this.form.evt.on("onFormDataChange", () => {
+        const data = this.form.getData()[0];
         if (isWait) {
           return;
         }
@@ -381,8 +360,8 @@ class EditViewEngine extends DEMainViewEngine {
       });
     }
     if (this.doActions.includes("UPDATE")) {
-      this.form.evt.on("onSaveSuccess", (event) => {
-        const data = event.data[0];
+      this.form.evt.on("onSaveSuccess", () => {
+        const data = this.form.getData()[0];
         this.sendMarkDataAction("UPDATE", data.srfkey);
       });
     }

package/es/view-engine/index.d.ts

@@ -5,6 +5,49 @@ export * from './data-view.engine';
 export * from './opt-view.engine';
 export * from './tab-exp-view.engine';
 export * from './tree-exp-view.engine';
+export * from './app-data-upload-view.engine';
+export * from './calendar-exp-view.engine';
+export * from './calendar-view.engine';
+export * from './chart-exp-view.engine';
+export * from './chart-view.engine';
+export * from './custom-view.engine';
+export * from './data-view-exp-view.engine';
+export * from './de-index-view-engine';
+export * from './edit-view.engine';
+export * from './edit-view2.engine';
+export * from './edit-view3.engine';
+export * from './edit-view4.engine';
+export * from './exp-view.engine';
+export * from './form-pickup-data-view.engine';
+export * from './gantt-view.engine';
+export * from './grid-exp-view.engine';
+export * from './kanban-view.engine';
+export * from './list-exp-view.engine';
+export * from './list-view.engine';
+export * from './login-view.engine';
+export * from './map-view.engine';
+export * from './medit-view9.engine';
+export * from './mpickup-view-engine';
+export * from './mpickup-view2-engine';
+export * from './panel-view-engine';
+export * from './pickup-data-view.engine';
+export * from './pickup-grid-view.engine';
+export * from './pickup-tree-view.engine';
+export * from './pickup-view.engine';
+export * from './pickup-view2.engine';
+export * from './portal-view-engine';
+export * from './report-view.engine';
+export * from './sub-app-ref-view.engine';
+export * from './tab-search-view.engine';
+export * from './tree-grid-ex-view.engine';
+export * from './tree-grid-view.engine';
+export * from './tree-view.engine';
+export * from './wf-dyna-action-view.engine';
+export * from './wf-dyna-edit-view.engine';
+export * from './wf-dyna-edit-view3.engine';
+export * from './wf-dyna-start-view.engine';
+export * from './wf-step-data-view.engine';
+export * from './wizard-view-engine';
 export declare const IBizViewEngine: {
     install: (_v: App) => void;
 };

package/es/view-engine/index.mjs

@@ -46,6 +46,7 @@ import { SubAppRefViewEngine } from './sub-app-ref-view.engine.mjs';
 import { TabSearchViewEngine } from './tab-search-view.engine.mjs';
 import { AppDataUploadViewEngine } from './app-data-upload-view.engine.mjs';
 import { WFStepDataViewEngine } from './wf-step-data-view.engine.mjs';
+export { ExpViewEngine } from './exp-view.engine.mjs';
 
 "use strict";
 const IBizViewEngine = {
@@ -301,4 +302,4 @@ const IBizViewEngine = {
   }
 };
 
-export { DataViewEngine, GridViewEngine, IBizViewEngine, IndexViewEngine, OptViewEngine, TabExpViewEngine, TreeExpViewEngine };
+export { AppDataUploadViewEngine, CalendarExpViewEngine, CalendarViewEngine, ChartExpViewEngine, ChartViewEngine, CustomViewEngine, DEIndexViewEngine, DataViewEngine, DataViewExpViewEngine, EditView2Engine, EditView3Engine, EditView4Engine, EditViewEngine, FormPickupDataViewEngine, GanttViewEngine, GridExpViewEngine, GridViewEngine, IBizViewEngine, IndexViewEngine, KanbanViewEngine, ListExpViewEngine, ListViewEngine, LoginViewEngine, MEditView9Engine, MPickupView2Engine, MPickupViewEngine, MapViewEngine, OptViewEngine, PanelViewEngine, PickupDataViewEngine, PickupGridViewEngine, PickupTreeViewEngine, PickupView2Engine, PickupViewEngine, PortalViewEngine, ReportViewEngine, SubAppRefViewEngine, TabExpViewEngine, TabSearchViewEngine, TreeExpViewEngine, TreeGridExViewEngine, TreeGridViewEngine, TreeViewEngine, WFDynaActionViewEngine, WFDynaEditView3Engine, WFDynaEditViewEngine, WFDynaStartViewEngine, WFStepDataViewEngine, WizardViewEngine };

package/es/view-engine/portal-view-engine.d.ts

@@ -30,6 +30,14 @@ export declare class PortalViewEngine extends DEMainViewEngine {
      * @memberof PortalViewEngine
      */
     refresh(): Promise<void>;
+    /**
+     * 主数据
+     *
+     * @protected
+     * @return {*}  {IData[]}
+     * @memberof PortalViewEngine
+     */
+    protected getData(): IData[];
     /**
      * 执行视图预置界面行为能力
      *

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

@@ -31,6 +31,16 @@ class PortalViewEngine extends DEMainViewEngine {
   async refresh() {
     await this.dashboard.refresh();
   }
+  /**
+   * 主数据
+   *
+   * @protected
+   * @return {*}  {IData[]}
+   * @memberof PortalViewEngine
+   */
+  getData() {
+    return this.view.state.srfactiveviewdata ? [this.view.state.srfactiveviewdata] : [];
+  }
   /**
    * 执行视图预置界面行为能力
    *
@@ -62,30 +72,14 @@ class PortalViewEngine extends DEMainViewEngine {
    * @memberof PortalViewEngine
    */
   doMarkDataAction() {
-    let data;
+    super.doMarkDataAction();
     if (this.doActions.includes("VIEW")) {
-      const callback = async (_data) => {
-        this.markOpenDataCallback(_data, data == null ? void 0 : data.srfmajortext);
-      };
-      this.view.evt.on("onDataChange", async (event) => {
-        data = event.data[0];
-        const result = await this.sendMarkDataAction("VIEW", data.srfkey);
-        if (result.ok && result.data.length > 0) {
-          result.data.forEach((item) => {
-            var _a;
-            if (item.data) {
-              (_a = this.coopPos) == null ? void 0 : _a.updateMessage({
-                data: item.data
-              });
-            }
-          });
-        }
-        this.subscribeMarkDataAction(data.srfkey, callback);
-      });
+      this.view.evt.on("onDataChange", () => this.sendViewDataAction());
     }
     if (this.doActions.includes("EDIT")) {
       let isWait = false;
       this.dashboard.evt.on("onConfigChange", () => {
+        const data = this.getData()[0];
         if (!(data == null ? void 0 : data.srfkey) || isWait) {
           return;
         }
@@ -101,18 +95,12 @@ class PortalViewEngine extends DEMainViewEngine {
     }
     if (this.doActions.includes("UPDATE")) {
       this.dashboard.evt.on("onSavePortlet", () => {
+        const data = this.getData()[0];
         if (data == null ? void 0 : data.srfkey) {
           this.sendMarkDataAction("UPDATE", data == null ? void 0 : data.srfkey);
         }
       });
     }
-    if (this.doActions.includes("CLOSE")) {
-      this.view.evt.on("onCloseView", () => {
-        if (data == null ? void 0 : data.srfkey) {
-          this.sendMarkDataAction("CLOSE", data.srfkey);
-        }
-      });
-    }
   }
 }
 

package/es/web-app/App.mjs

@@ -1,5 +1,5 @@
-import { defineComponent, onUnmounted, createVNode, resolveComponent } from 'vue';
-import { Modal, ViewMode } from '@ibiz-template/runtime';
+import { onUnmounted, resolveComponent, createVNode, defineComponent } from 'vue';
+import { ViewMode, Modal } from '@ibiz-template/runtime';
 import './App.css';
 
 "use strict";

package/es/web-app/attach-environment-config.mjs

@@ -15,7 +15,7 @@ async function attachEnvironmentConfig() {
   Object.keys(ibiz.env).forEach((key) => {
     const key2 = envMap.has(key) ? envMap.get(key) : key;
     if (env[key2] != null) {
-      if (key2 === "customParams") {
+      if (key2 === "customParams" || key2 === "devtoolConfig") {
         ibiz.env[key] = JSON.parse(env[key2]);
       } else {
         ibiz.env[key] = env[key2];

package/es/web-app/components/modal-router-shell/modal-router-shell.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, toRaw, onUnmounted, createVNode } from 'vue';
+import { ref, toRaw, onUnmounted, createVNode, defineComponent } from 'vue';
 import { parseRouteViewData, createOverlayView, routerCallback, route2routePath } from '@ibiz-template/vue3-util';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { IBizContext } from '@ibiz-template/core';

package/es/web-app/components/router-shell/router-shell.mjs

@@ -1,7 +1,7 @@
-import { defineComponent, ref, toRaw, onUnmounted, watch, onActivated, onDeactivated, createVNode, Fragment, h, resolveComponent } from 'vue';
+import { ref, toRaw, onUnmounted, watch, onActivated, onDeactivated, Fragment, resolveComponent, h, createVNode, defineComponent } from 'vue';
 import { parseRouteViewData } from '@ibiz-template/vue3-util';
 import { useRoute, useRouter } from 'vue-router';
-import { Modal, ViewMode, RouteConst } from '@ibiz-template/runtime';
+import { ViewMode, Modal, RouteConst } from '@ibiz-template/runtime';
 import { IBizContext } from '@ibiz-template/core';
 import { mergeDeepLeft } from 'ramda';
 

package/es/web-app/guard/auth-guard/auth-guard.mjs

@@ -1,6 +1,7 @@
-import { RuntimeError, getAppCookie, CoreConst, HttpError } from '@ibiz-template/core';
+import { RuntimeError, CoreConst, getAppCookie, HttpError } from '@ibiz-template/core';
 import { mergeDeepRight } from 'ramda';
 import { AppHooks } from '@ibiz-template/vue3-util';
+import { updateDevToolConfig } from '@ibiz-template/devtool';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -166,6 +167,7 @@ class AuthGuard {
     }
     if (res.ok) {
       ibiz.appData = res.data;
+      updateDevToolConfig();
     }
   }
   /**

package/es/web-app/main.mjs

@@ -34,7 +34,6 @@ async function runApp(plugins, opts) {
   });
   install();
   install$1();
-  install$2();
   ibiz.util.getGlobalParam = () => {
     return useAppStore().appStore;
   };
@@ -59,6 +58,7 @@ async function runApp(plugins, opts) {
     });
   });
   await attachEnvironmentConfig();
+  install$2();
   let authGuard;
   if (opts == null ? void 0 : opts.getAuthGuard) {
     authGuard = opts.getAuthGuard();

package/es/web-app/router/index.mjs

@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory } from 'vue-router';
+import { createWebHashHistory, createRouter } from 'vue-router';
 import qs from 'qs';
 import { AppRedirectView } from '@ibiz-template/vue3-util';
 import { RouteConst } from '@ibiz-template/runtime';

package/lib/common/action-toolbar/action-toolbar.cjs

@@ -2,8 +2,8 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-require('./action-toolbar.css');
 var core = require('@ibiz-template/core');
+require('./action-toolbar.css');
 
 "use strict";
 function _isSlot(s) {
@@ -48,7 +48,13 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
     var _a;
     const ns = vue3Util.useNamespace("action-toolbar");
     const dropdownRef = vue.ref();
-    const popoverVisible = vue.ref(false);
+    const groupButtonRef = vue.ref();
+    const {
+      popoverVisible,
+      setPopoverVisible
+    } = vue3Util.usePopoverVisible(groupButtonRef, (ele) => {
+      return ele.ref;
+    });
     (_a = props.actionDetails) == null ? void 0 : _a.forEach((detail) => {
       if (detail.capLanguageRes && detail.capLanguageRes.lanResTag) {
         detail.caption = ibiz.i18n.t(detail.capLanguageRes.lanResTag, detail.caption);
@@ -63,7 +69,7 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
         await props.actionCallBack(detail, e);
       }
       if (props.mode === "buttons") {
-        popoverVisible.value = false;
+        setPopoverVisible(false);
       } else if (dropdownRef.value) {
         dropdownRef.value.handleClose();
       }
@@ -82,7 +88,6 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
         }
       });
     }
-    const groupButtonRef = vue.ref();
     const calcActionItemClass = (item) => {
       const {
         actionLevel
@@ -155,7 +160,10 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
         "text": true,
         "disabled": pdisabled,
         "ref": "groupButtonRef",
-        "class": [this.ns.e("item"), this.ns.is("expand", this.popoverVisible)]
+        "class": [this.ns.e("item"), this.ns.is("group", true), this.ns.is("expand", this.popoverVisible)],
+        "onClick": () => {
+          this.popoverVisible = !this.popoverVisible;
+        }
       }, {
         icon: () => vue.createVNode("ion-icon", {
           "class": this.ns.e("icon"),
@@ -165,9 +173,7 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
       }), vue.createVNode(vue.resolveComponent("el-popover"), {
         "placement": "bottom-start",
         "virtual-ref": this.groupButtonRef,
-        "trigger": "click",
         "visible": this.popoverVisible,
-        "onUpdate:visible": ($event) => this.popoverVisible = $event,
         "popper-class": this.ns.e("popover"),
         "virtual-triggering": true,
         "popper-style": "z-index:".concat(this.popoverIndex)