@ibiz-template/vue3-util 0.7.41-alpha.3 → 0.7.41-alpha.31

package/es/util/route/route.mjs

@@ -36,7 +36,7 @@ function route2routePath(route, isRouteModal = false) {
         params = void 0;
       } else {
         if (params.srfnavctx) {
-          context = JSON.parse(decodeURIComponent(params.srfnavctx));
+          context = JSON.parse(params.srfnavctx);
           delete params.srfnavctx;
         }
         if (params.srfnav) {
@@ -117,8 +117,13 @@ function getOwnRouteContext(context) {
     }
     delete ownContext.attributekeys;
   }
+  let srfKeepNull = false;
+  if (Object.prototype.hasOwnProperty.call(ownContext, "srfkeepnull")) {
+    srfKeepNull = ownContext.srfkeepnull === true || ownContext.srfkeepnull === "true";
+    delete ownContext.srfkeepnull;
+  }
   Object.keys(ownContext).forEach((key) => {
-    if (excludeKeys.includes(key) || isNil(ownContext[key])) {
+    if (excludeKeys.includes(key) || !srfKeepNull && isNil(ownContext[key])) {
       delete ownContext[key];
     }
   });
@@ -174,6 +179,7 @@ async function calcResRoutePath(routePath, context, appDataEntityId, appId) {
   }
 }
 async function generateRoutePath(appView, route, context, params) {
+  var _a;
   const routePath = route2routePath(route);
   let depth = context.srfdefaulttoroutedepth || 2;
   if (context.toRouteDepth) {
@@ -186,6 +192,10 @@ async function generateRoutePath(appView, route, context, params) {
       };
     }
   }
+  let srfmenuitem = params == null ? void 0 : params.srfmenuitem;
+  if (!srfmenuitem && routePath.pathNodes.length > 1) {
+    srfmenuitem = (_a = routePath.pathNodes[1].params) == null ? void 0 : _a.srfmenuitem;
+  }
   routePath.pathNodes.splice(depth - 1, routePath.pathNodes.length - depth + 1);
   if (context.currentSrfNav) {
     const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
@@ -219,6 +229,10 @@ async function generateRoutePath(appView, route, context, params) {
       delete routePath.pathNodes[0].context[deName];
     }
   }
+  if (srfmenuitem && routePath.pathNodes.length > 1) {
+    const tempParams = routePath.pathNodes[1].params || {};
+    routePath.pathNodes[1].params = { ...tempParams, srfmenuitem };
+  }
   return { path: routePath2string(routePath) };
 }
 async function generateRoutePathByModal(appView, route, context, params) {
@@ -308,7 +322,7 @@ function getNestedRoutePath(route, depth, noSrfNav = true) {
   if (noSrfNav) {
     delete pathNode.srfnav;
   }
-  if (pathNode.context) {
+  if (!ibiz.env.isMob && pathNode.context) {
     delete pathNode.context.srfnavctrlid;
   }
   return routePath2string(routePath);
@@ -319,7 +333,8 @@ function onRouteChange(callback, depth) {
     throw new RuntimeError(ibiz.i18n.t("vue3Util.util.routeCorrectly"));
   }
   watch(
-    () => route == null ? void 0 : route.path,
+    // fix: odoo脚本触发路径query变更未触发路由变更事件
+    () => route == null ? void 0 : route.fullPath,
     () => {
       const currentKey = getNestedRoutePath(route, depth);
       callback({ currentKey, fullPath: route.fullPath });

package/es/util/store/app-store/app-store.d.ts

@@ -1,8 +1,8 @@
 export interface IAppStore {
 }
-export declare const useAppStore: import("pinia").StoreDefinition<"appStore", import("pinia")._UnwrapAll<Pick<{
+export declare const useAppStore: import("pinia").StoreDefinition<"appStore", Pick<{
     appStore: IAppStore;
-}, "appStore">>, Pick<{
+}, "appStore">, Pick<{
     appStore: IAppStore;
 }, never>, Pick<{
     appStore: IAppStore;

package/es/util/store/ui-store/ui-store.d.ts

@@ -10,13 +10,13 @@ export interface IUIState {
     zIndex: Ref<number>;
     theme: string;
 }
-export declare const useUIStore: import("pinia").StoreDefinition<"uiStore", import("pinia")._UnwrapAll<Pick<{
+export declare const useUIStore: import("pinia").StoreDefinition<"uiStore", Pick<{
     UIStore: {
         zIndex: number;
         theme: string;
     };
     zIndex: import("./z-index").IzIndexStore;
-}, "zIndex" | "UIStore">>, Pick<{
+}, "zIndex" | "UIStore">, Pick<{
     UIStore: {
         zIndex: number;
         theme: string;

package/es/view/app-redirect-view/app-redirect-view.d.ts

@@ -1,2 +1,2 @@
-export declare const AppRedirectView: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+export declare const AppRedirectView: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //# sourceMappingURL=app-redirect-view.d.ts.map

package/es/view/app-redirect-view/app-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/view/app-redirect-view/app-redirect-view.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,sSAqB1B,CAAC"}
+{"version":3,"file":"app-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/view/app-redirect-view/app-redirect-view.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,iRAqB1B,CAAC"}

package/es/view/app-redirect-view/app-redirect-view.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, onUnmounted, onMounted, createVNode } from 'vue';
+import { defineComponent, createVNode, onUnmounted, onMounted } from 'vue';
 import { IBizContext } from '@ibiz-template/core';
 import { toLocalOpenWFRedirectView } from '@ibiz-template/runtime';
 

package/es/view/common/index.d.ts

@@ -1,4 +1,4 @@
-export declare const IBizView: import("../../util").TypeWithInstall<import("vue").DefineComponent<{
+export declare const IBizView: import("../../util").TypeWithInstall<import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiContext>;
     };
@@ -19,7 +19,7 @@ export declare const IBizView: import("../../util").TypeWithInstall<import("vue"
     provider: {
         type: import("vue").PropType<import("@ibiz-template/runtime").IViewProvider>;
     };
-}, {
+}>, {
     c: import("@ibiz-template/runtime").ViewController<import("@ibiz/model-core").IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
     ns: import("@ibiz-template/core").Namespace;
     controls: import("@ibiz/model-core").IControl[];
@@ -32,7 +32,7 @@ export declare const IBizView: import("../../util").TypeWithInstall<import("vue"
     }>;
     getCtrlTeleportTag: (ctrl: import("@ibiz/model-core").IControl) => string | undefined;
     getControlStyle: () => {};
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiContext>;
     };
@@ -53,7 +53,7 @@ export declare const IBizView: import("../../util").TypeWithInstall<import("vue"
     provider: {
         type: import("vue").PropType<import("@ibiz-template/runtime").IViewProvider>;
     };
-}>>, {
+}>> & Readonly<{}>, {
     params: import("@ibiz-template/core").IApiParams;
-}, {}>>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
 //# sourceMappingURL=index.d.ts.map

package/es/view/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/common/index.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQnB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/common/index.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6EAUnB,CAAC"}

package/es/view/common/index.mjs

@@ -3,6 +3,7 @@ import '../../util/index.mjs';
 import { ViewProvider } from './view.provider.mjs';
 import { View } from './view.mjs';
 import { AppDataUploadViewProvider } from '../app-data-upload-view/app-data-upload-view.provider.mjs';
+import { MDCustomViewProvider } from '../md-custom-view/md-custom-view.provider.mjs';
 import { withInstall } from '../../util/install.mjs';
 
 "use strict";
@@ -13,6 +14,7 @@ const IBizView = withInstall(View, function(v) {
     "APPDATAUPLOADVIEW",
     () => new AppDataUploadViewProvider()
   );
+  registerViewProvider("DEMDCUSTOMVIEW", () => new MDCustomViewProvider());
 });
 
 export { IBizView };

package/es/view/common/view.d.ts

@@ -2,7 +2,7 @@ import { IModal, IViewLayoutPanelController, IViewProvider, ViewController } fro
 import { IAppView, IControl } from '@ibiz/model-core';
 import { PropType, VNode } from 'vue';
 import './view.scss';
-export declare const View: import("vue").DefineComponent<{
+export declare const View: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     /**
      * @description 应用上下文
      */
@@ -42,7 +42,7 @@ export declare const View: import("vue").DefineComponent<{
     provider: {
         type: PropType<IViewProvider>;
     };
-}, {
+}>, {
     c: ViewController<IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
     ns: import("@ibiz-template/core").Namespace;
     controls: IControl[];
@@ -53,7 +53,7 @@ export declare const View: import("vue").DefineComponent<{
     renderControl: (ctrl: IControl, slotProps?: IData) => VNode;
     getCtrlTeleportTag: (ctrl: IControl) => string | undefined;
     getControlStyle: () => {};
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /**
      * @description 应用上下文
      */
@@ -93,7 +93,7 @@ export declare const View: import("vue").DefineComponent<{
     provider: {
         type: PropType<IViewProvider>;
     };
-}>>, {
+}>> & Readonly<{}>, {
     params: import("@ibiz-template/core").IApiParams;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //# sourceMappingURL=view.d.ts.map

package/es/view/common/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/common/view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,0BAA0B,EAC1B,aAAa,EACb,cAAc,EACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAGL,QAAQ,EAER,KAAK,EAIN,MAAM,KAAK,CAAC;AACb,OAAO,aAAa,CAAC;AAGrB,eAAO,MAAM,IAAI;IAGb;;OAEG;;;;IAEH;;;OAGG;;;;;IAEH;;OAEG;;;;;IAEH;;OAEG;;;;IAEH;;OAEG;;;;IAEH;;OAEG;;;;;;;;;;uCAkDW,0BAA0B,KACrC,IAAI;yBAmBqB,QAAQ,cAAa,KAAK,KAAQ,OAAO;0BAkBxC,QAAQ,cAAa,KAAK,KAAQ,KAAK;+BA/DlC,QAAQ,KAAG,MAAM,GAAG,SAAS;;;IAhD/D;;OAEG;;;;IAEH;;;OAGG;;;;;IAEH;;OAEG;;;;;IAEH;;OAEG;;;;IAEH;;OAEG;;;;IAEH;;OAEG;;;;;;MAgNL,CAAC"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/common/view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,0BAA0B,EAC1B,aAAa,EACb,cAAc,EACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAGL,QAAQ,EAER,KAAK,EAON,MAAM,KAAK,CAAC;AACb,OAAO,aAAa,CAAC;AAGrB,eAAO,MAAM,IAAI;IAGb;;OAEG;;;;IAEH;;;OAGG;;;;;IAEH;;OAEG;;;;;IAEH;;OAEG;;;;IAEH;;OAEG;;;;IAEH;;OAEG;;;;;;;;;;uCAkDW,0BAA0B,KACrC,IAAI;yBAmBqB,QAAQ,cAAa,KAAK,KAAQ,OAAO;0BAkBxC,QAAQ,cAAa,KAAK,KAAQ,KAAK;+BA/DlC,QAAQ,KAAG,MAAM,GAAG,SAAS;;;IAhD/D;;OAEG;;;;IAEH;;;OAGG;;;;;IAEH;;OAEG;;;;;IAEH;;OAEG;;;;IAEH;;OAEG;;;;IAEH;;OAEG;;;;;;4EAuOL,CAAC"}

package/es/view/common/view.mjs

@@ -1,5 +1,5 @@
-import { isVNode, defineComponent, computed, renderSlot, resolveComponent, h, createVNode, Teleport, withDirectives, resolveDirective } from 'vue';
-import { ViewController, getControlsByView, getCtrlTeleportParams, getErrorViewProvider } from '@ibiz-template/runtime';
+import { isVNode, defineComponent, createVNode, h, resolveComponent, Teleport, withDirectives, resolveDirective, computed, renderSlot, onMounted, nextTick, onBeforeUnmount } from 'vue';
+import { getErrorViewProvider, ViewController, getControlsByView, getCtrlTeleportParams } from '@ibiz-template/runtime';
 import './view.css';
 import '../../use/index.mjs';
 import { useNamespace } from '../../use/namespace/namespace.mjs';
@@ -127,6 +127,19 @@ const View = /* @__PURE__ */ defineComponent({
       }
       return h(comp, ctrlProps);
     };
+    let watermarkDestroy;
+    onMounted(() => {
+      nextTick(async () => {
+        const container = document.getElementById(c.id);
+        const appView = await ibiz.hub.config.view.get(c.model.id);
+        if (!container || !(appView == null ? void 0 : appView.waterMarkOption))
+          return;
+        watermarkDestroy = ibiz.util.watermark.mount(appView.waterMarkOption, container, c.context, c.params, c.state.srfactiveviewdata || {});
+      });
+    });
+    onBeforeUnmount(() => {
+      watermarkDestroy == null ? void 0 : watermarkDestroy();
+    });
     return {
       c,
       ns,

package/es/view/de-redirect-view/de-redirect-view.d.ts

@@ -1,7 +1,7 @@
 import { ViewController } from '@ibiz-template/runtime';
 import { IAppDERedirectView } from '@ibiz/model-core';
 import { PropType } from 'vue';
-export declare const DeRedirectView: import("vue").DefineComponent<{
+export declare const DeRedirectView: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: {
         type: PropType<import("@ibiz-template/core").IApiContext>;
         required: true;
@@ -18,12 +18,12 @@ export declare const DeRedirectView: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}, {
+}>, {
     c: ViewController<import("@ibiz/model-core").IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
-    toViewId: import("vue").Ref<string | undefined>;
-    toViewContext: import("vue").Ref<import("@ibiz-template/core").IApiContext | undefined>;
-    toViewParams: import("vue").Ref<import("@ibiz-template/core").IApiParams | undefined>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    toViewId: import("vue").Ref<string | undefined, string | undefined>;
+    toViewContext: import("vue").Ref<import("@ibiz-template/core").IApiContext | undefined, import("@ibiz-template/core").IApiContext | undefined>;
+    toViewParams: import("vue").Ref<import("@ibiz-template/core").IApiParams | undefined, import("@ibiz-template/core").IApiParams | undefined>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: {
         type: PropType<import("@ibiz-template/core").IApiContext>;
         required: true;
@@ -40,8 +40,8 @@ export declare const DeRedirectView: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}>>, {
+}>> & Readonly<{}>, {
     params: import("@ibiz-template/core").IApiParams;
     isEmbedCtrlNav: boolean;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //# sourceMappingURL=de-redirect-view.d.ts.map

package/es/view/de-redirect-view/de-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/view/de-redirect-view/de-redirect-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAuB,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAGL,QAAQ,EAKT,MAAM,KAAK,CAAC;AAGb,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAuEzB,CAAC"}
+{"version":3,"file":"de-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/view/de-redirect-view/de-redirect-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAuB,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAGL,QAAQ,EAKT,MAAM,KAAK,CAAC;AAGb,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EAuEzB,CAAC"}

package/es/view/de-redirect-view/de-redirect-view.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, toRaw, watch, h, resolveComponent, withDirectives, createVNode, resolveDirective } from 'vue';
+import { defineComponent, h, resolveComponent, withDirectives, createVNode, resolveDirective, ref, toRaw, watch } from 'vue';
 import { RuntimeError } from '@ibiz-template/core';
 import { ViewController, getDERedirectToView } from '@ibiz-template/runtime';
 import '../../use/index.mjs';

package/es/view/de-redirect-view/index.d.ts

@@ -1,4 +1,4 @@
-export declare const IBizDeRedirectView: import("../../util").TypeWithInstall<import("vue").DefineComponent<{
+export declare const IBizDeRedirectView: import("../../util").TypeWithInstall<import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiContext>;
         required: true;
@@ -15,12 +15,12 @@ export declare const IBizDeRedirectView: import("../../util").TypeWithInstall<im
         type: BooleanConstructor;
         default: boolean;
     };
-}, {
+}>, {
     c: import("@ibiz-template/runtime").ViewController<import("@ibiz/model-core").IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
-    toViewId: import("vue").Ref<string | undefined>;
-    toViewContext: import("vue").Ref<import("@ibiz-template/core").IApiContext | undefined>;
-    toViewParams: import("vue").Ref<import("@ibiz-template/core").IApiParams | undefined>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    toViewId: import("vue").Ref<string | undefined, string | undefined>;
+    toViewContext: import("vue").Ref<import("@ibiz-template/core").IApiContext | undefined, import("@ibiz-template/core").IApiContext | undefined>;
+    toViewParams: import("vue").Ref<import("@ibiz-template/core").IApiParams | undefined, import("@ibiz-template/core").IApiParams | undefined>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiContext>;
         required: true;
@@ -37,8 +37,8 @@ export declare const IBizDeRedirectView: import("../../util").TypeWithInstall<im
         type: BooleanConstructor;
         default: boolean;
     };
-}>>, {
+}>> & Readonly<{}>, {
     params: import("@ibiz-template/core").IApiParams;
     isEmbedCtrlNav: boolean;
-}, {}>>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
 //# sourceMappingURL=index.d.ts.map

package/es/view/de-redirect-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/de-redirect-view/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAU9B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/de-redirect-view/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6EAU9B,CAAC"}

package/es/view/html-view/html-view.d.ts

@@ -1,8 +1,8 @@
 import { IAppDEHtmlView } from '@ibiz/model-core';
-import { ViewController } from '@ibiz-template/runtime';
+import { HtmlViewController } from '@ibiz-template/runtime';
 import { PropType } from 'vue';
 import './html-view.scss';
-export declare const HtmlView: import("vue").DefineComponent<{
+export declare const HtmlView: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: PropType<import("@ibiz-template/core").IApiContext>;
     params: {
         type: PropType<import("@ibiz-template/core").IApiParams>;
@@ -18,15 +18,14 @@ export declare const HtmlView: import("vue").DefineComponent<{
     state: {
         type: PropType<import("@ibiz-template/core").IApiData>;
     };
-}, {
-    c: ViewController<import("@ibiz/model-core").IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
+}>, {
+    c: HtmlViewController<IAppDEHtmlView, import("@ibiz-template/runtime").IHtmlViewState, import("@ibiz-template/runtime").IViewEvent>;
     ns: import("@ibiz-template/core").Namespace;
     controls: import("@ibiz/model-core").IControl[] | undefined;
     viewClassNames: (string | undefined)[];
-    url: import("vue").ComputedRef<string>;
-    isLoading: import("vue").Ref<boolean>;
+    isLoading: import("vue").Ref<boolean, boolean>;
     onLoad: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: PropType<import("@ibiz-template/core").IApiContext>;
     params: {
         type: PropType<import("@ibiz-template/core").IApiParams>;
@@ -42,7 +41,7 @@ export declare const HtmlView: import("vue").DefineComponent<{
     state: {
         type: PropType<import("@ibiz-template/core").IApiData>;
     };
-}>>, {
+}>> & Readonly<{}>, {
     params: import("@ibiz-template/core").IApiParams;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //# sourceMappingURL=html-view.d.ts.map

package/es/view/html-view/html-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html-view.d.ts","sourceRoot":"","sources":["../../../src/view/html-view/html-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAwB,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAGL,QAAQ,EAKT,MAAM,KAAK,CAAC;AAEb,OAAO,kBAAkB,CAAC;AAE1B,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA+DnB,CAAC"}
+{"version":3,"file":"html-view.d.ts","sourceRoot":"","sources":["../../../src/view/html-view/html-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACL,kBAAkB,EAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAGL,QAAQ,EAIT,MAAM,KAAK,CAAC;AAEb,OAAO,kBAAkB,CAAC;AAE1B,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EAiEnB,CAAC"}

package/es/view/html-view/html-view.mjs

@@ -1,6 +1,5 @@
-import { defineComponent, ref, computed, onBeforeMount, withDirectives, createVNode, resolveDirective, h, resolveComponent } from 'vue';
-import { StringUtil } from '@ibiz-template/core';
-import { ViewController, getErrorViewProvider } from '@ibiz-template/runtime';
+import { defineComponent, withDirectives, createVNode, resolveDirective, h, resolveComponent, ref, onBeforeMount } from 'vue';
+import { getErrorViewProvider, HtmlViewController } from '@ibiz-template/runtime';
 import '../../use/index.mjs';
 import './html-view.css';
 import { useNamespace } from '../../use/namespace/namespace.mjs';
@@ -29,7 +28,7 @@ const HtmlView = /* @__PURE__ */ defineComponent({
   setup() {
     var _a;
     const ns = useNamespace("view");
-    const c = useViewController((...args) => new ViewController(...args));
+    const c = useViewController((model, ...args) => new HtmlViewController(model, ...args));
     const controls = ((_a = c.model.viewLayoutPanel) == null ? void 0 : _a.controls) || c.model.controls;
     const {
       viewType,
@@ -40,16 +39,8 @@ const HtmlView = /* @__PURE__ */ defineComponent({
     const sysCssName = sysCss == null ? void 0 : sysCss.cssName;
     const viewClassNames = [ns.b(), ns.b(typeClass), ns.m(codeName), sysCssName];
     const isLoading = ref(false);
-    const url = computed(() => {
-      const {
-        htmlUrl
-      } = c.model;
-      if (htmlUrl)
-        return StringUtil.fill(htmlUrl, c.context, c.params);
-      return "";
-    });
     onBeforeMount(() => {
-      if (url.value) {
+      if (c.state.htmlUrl) {
         isLoading.value = true;
       }
     });
@@ -61,17 +52,18 @@ const HtmlView = /* @__PURE__ */ defineComponent({
       ns,
       controls,
       viewClassNames,
-      url,
       isLoading,
       onLoad
     };
   },
   render() {
-    if (this.url) {
+    if (!this.c.state.isCreated)
+      return;
+    if (this.c.state.htmlUrl) {
       return withDirectives(createVNode("div", {
         "class": this.viewClassNames
       }, [createVNode("iframe", {
-        "src": this.url,
+        "src": this.c.state.htmlUrl,
         "onLoad": () => this.onLoad()
       }, null)]), [[resolveDirective("loading"), this.isLoading]]);
     }

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

@@ -1,4 +1,4 @@
-export declare const IBizHtmlView: import("../../util").TypeWithInstall<import("vue").DefineComponent<{
+export declare const IBizHtmlView: import("../../util").TypeWithInstall<import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: import("vue").PropType<import("@ibiz-template/core").IApiContext>;
     params: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiParams>;
@@ -14,15 +14,14 @@ export declare const IBizHtmlView: import("../../util").TypeWithInstall<import("
     state: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiData>;
     };
-}, {
-    c: import("@ibiz-template/runtime").ViewController<import("@ibiz/model-core").IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
+}>, {
+    c: import("@ibiz-template/runtime").HtmlViewController<import("@ibiz/model-core").IAppDEHtmlView, import("@ibiz-template/runtime").IHtmlViewState, import("@ibiz-template/runtime").IViewEvent>;
     ns: import("@ibiz-template/core").Namespace;
     controls: import("@ibiz/model-core").IControl[] | undefined;
     viewClassNames: (string | undefined)[];
-    url: import("vue").ComputedRef<string>;
-    isLoading: import("vue").Ref<boolean>;
+    isLoading: import("vue").Ref<boolean, boolean>;
     onLoad: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: import("vue").PropType<import("@ibiz-template/core").IApiContext>;
     params: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiParams>;
@@ -38,7 +37,7 @@ export declare const IBizHtmlView: import("../../util").TypeWithInstall<import("
     state: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiData>;
     };
-}>>, {
+}>> & Readonly<{}>, {
     params: import("@ibiz-template/core").IApiParams;
-}, {}>>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
 //# sourceMappingURL=index.d.ts.map

package/es/view/html-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/html-view/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAGvB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/html-view/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6EAGvB,CAAC"}

package/es/view/md-custom-view/md-custom-view.provider.d.ts

@@ -0,0 +1,13 @@
+import { CTX, IMDCustomViewState, IViewController, IViewEvent, IViewProvider } from '@ibiz-template/runtime';
+import { IAppDECustomView } from '@ibiz/model-core';
+/**
+ * @description 实体多数据自定义视图适配器
+ * @export
+ * @class MDCustomViewProvider
+ * @implements {IViewProvider}
+ */
+export declare class MDCustomViewProvider implements IViewProvider {
+    component: string;
+    createController(model: IAppDECustomView, context: IContext, params?: IParams | undefined, ctx?: CTX<IViewController<IAppDECustomView, IMDCustomViewState, IViewEvent>> | undefined): IViewController<IAppDECustomView, IMDCustomViewState, IViewEvent>;
+}
+//# sourceMappingURL=md-custom-view.provider.d.ts.map

package/es/view/md-custom-view/md-custom-view.provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"md-custom-view.provider.d.ts","sourceRoot":"","sources":["../../../src/view/md-custom-view/md-custom-view.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,kBAAkB,EAClB,eAAe,EACf,UAAU,EACV,aAAa,EAEd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD;;;;;GAKG;AACH,qBAAa,oBAAqB,YAAW,aAAa;IACxD,SAAS,EAAE,MAAM,CAAc;IAE/B,gBAAgB,CACd,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,EAC5B,GAAG,CAAC,EACA,GAAG,CAAC,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,UAAU,CAAC,CAAC,GACtE,SAAS,GACZ,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,UAAU,CAAC;CAGrE"}

package/es/view/md-custom-view/md-custom-view.provider.mjs

@@ -0,0 +1,13 @@
+import { MDCustomViewController } from '@ibiz-template/runtime';
+
+"use strict";
+class MDCustomViewProvider {
+  constructor() {
+    this.component = "IBizView";
+  }
+  createController(model, context, params, ctx) {
+    return new MDCustomViewController(model, context, params, ctx);
+  }
+}
+
+export { MDCustomViewProvider };

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

@@ -1,4 +1,4 @@
-export declare const IBizPortalView: import("../../util").TypeWithInstall<import("vue").DefineComponent<{
+export declare const IBizPortalView: import("../../util").TypeWithInstall<import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: import("vue").PropType<import("@ibiz-template/core").IApiContext>;
     params: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiParams>;
@@ -14,12 +14,12 @@ export declare const IBizPortalView: import("../../util").TypeWithInstall<import
     state: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiData>;
     };
-}, {
+}>, {
     c: import("@ibiz-template/runtime").ViewController<import("@ibiz/model-core").IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
     ns: import("@ibiz-template/core").Namespace;
     controls: import("@ibiz/model-core").IControl[] | undefined;
     viewClassNames: (string | undefined)[];
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: import("vue").PropType<import("@ibiz-template/core").IApiContext>;
     params: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiParams>;
@@ -35,7 +35,7 @@ export declare const IBizPortalView: import("../../util").TypeWithInstall<import
     state: {
         type: import("vue").PropType<import("@ibiz-template/core").IApiData>;
     };
-}>>, {
+}>> & Readonly<{}>, {
     params: import("@ibiz-template/core").IApiParams;
-}, {}>>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
 //# sourceMappingURL=index.d.ts.map

package/es/view/portal-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/portal-view/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAWzB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/portal-view/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6EAWzB,CAAC"}

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

@@ -1,7 +1,7 @@
 import { IModal, ViewController } from '@ibiz-template/runtime';
 import { IAppPortalView } from '@ibiz/model-core';
 import { PropType } from 'vue';
-export declare const PortalView: import("vue").DefineComponent<{
+export declare const PortalView: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     context: PropType<import("@ibiz-template/core").IApiContext>;
     params: {
         type: PropType<import("@ibiz-template/core").IApiParams>;
@@ -17,12 +17,12 @@ export declare const PortalView: import("vue").DefineComponent<{
     state: {
         type: PropType<import("@ibiz-template/core").IApiData>;
     };
-}, {
+}>, {
     c: ViewController<import("@ibiz/model-core").IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
     ns: import("@ibiz-template/core").Namespace;
     controls: import("@ibiz/model-core").IControl[] | undefined;
     viewClassNames: (string | undefined)[];
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: PropType<import("@ibiz-template/core").IApiContext>;
     params: {
         type: PropType<import("@ibiz-template/core").IApiParams>;
@@ -38,7 +38,7 @@ export declare const PortalView: import("vue").DefineComponent<{
     state: {
         type: PropType<import("@ibiz-template/core").IApiData>;
     };
-}>>, {
+}>> & Readonly<{}>, {
     params: import("@ibiz-template/core").IApiParams;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //# sourceMappingURL=portal-view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"portal-view.d.ts","sourceRoot":"","sources":["../../../src/view/portal-view/portal-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAsB,QAAQ,EAAoB,MAAM,KAAK,CAAC;AAGrE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA6ErB,CAAC"}
+{"version":3,"file":"portal-view.d.ts","sourceRoot":"","sources":["../../../src/view/portal-view/portal-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAsB,QAAQ,EAAoB,MAAM,KAAK,CAAC;AAGrE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EA6ErB,CAAC"}

package/es/view/todo-redirect/todo-redirect.d.ts

@@ -1,2 +1,2 @@
-export declare const TodoRedirect: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+export declare const TodoRedirect: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 //# sourceMappingURL=todo-redirect.d.ts.map

package/es/view/todo-redirect/todo-redirect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"todo-redirect.d.ts","sourceRoot":"","sources":["../../../src/view/todo-redirect/todo-redirect.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,sSA8CvB,CAAC"}
+{"version":3,"file":"todo-redirect.d.ts","sourceRoot":"","sources":["../../../src/view/todo-redirect/todo-redirect.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,iRA8CvB,CAAC"}

package/lib/common/badge/badge.css

@@ -1 +1 @@
-.ibiz-badge{display:inline-block;width:var(--ibiz-width-icon-large);height:var(--ibiz-width-icon-large);line-height:var(--ibiz-width-icon-large);color:var(--ibiz-color-danger-text);background-color:var(--ibiz-badge-bg-color);border-radius:var(--ibiz-border-radius-circle)}.ibiz-badge--danger{--ibiz-badge-bg-color:var(--ibiz-color-danger)}.ibiz-badge--success{--ibiz-badge-bg-color:var(--ibiz-color-success)}.ibiz-badge--warning{--ibiz-badge-bg-color:var(--ibiz-color-warning)}.ibiz-badge--info{--ibiz-badge-bg-color:var(--ibiz-color-info)}.ibiz-badge--primary{--ibiz-badge-bg-color:var(--ibiz-color-primary)}
+.ibiz-badge{--ibiz-badge-bg-color:var(--ibiz-color-danger);--ibiz-badge-height:18px;--ibiz-badge-border-radius:10px;display:inline-flex;align-items:center;justify-content:center;width:auto;height:var(--ibiz-badge-height);padding:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-small);line-height:normal;color:var(--ibiz-color-danger-text);white-space:nowrap;background-color:var(--ibiz-badge-bg-color);border:1px solid transparent;border-radius:var(--ibiz-badge-border-radius)}.ibiz-badge--danger{--ibiz-badge-bg-color:var(--ibiz-color-danger)}.ibiz-badge--success{--ibiz-badge-bg-color:var(--ibiz-color-success)}.ibiz-badge--warning{--ibiz-badge-bg-color:var(--ibiz-color-warning)}.ibiz-badge--info{--ibiz-badge-bg-color:var(--ibiz-color-info)}.ibiz-badge--primary{--ibiz-badge-bg-color:var(--ibiz-color-primary)}