@ibiz-template/vue3-util 0.7.41-alpha.27 → 0.7.41-alpha.28

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/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/panel-component/panel-container-group/panel-container-group.cjs

@@ -5,8 +5,8 @@ var panelContainerGroup_controller = require('./panel-container-group.controller
 require('../../use/index.cjs');
 require('../../common/index.cjs');
 require('./panel-container-group.css');
-var namespace = require('../../use/namespace/namespace.cjs');
 var icon = require('../../common/icon/icon.cjs');
+var namespace = require('../../use/namespace/namespace.cjs');
 
 "use strict";
 function _isSlot(s) {

package/lib/view/html-view/html-view.cjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.7.41-alpha.27",
+  "version": "0.7.41-alpha.28",
   "description": "通用组件库(vue3)",
   "main": "lib/index.cjs",
   "types": "es/index.d.ts",
@@ -37,10 +37,10 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/cli": "^0.3.23",
-    "@ibiz-template/core": "^0.7.41-alpha.26",
-    "@ibiz-template/runtime": "^0.7.41-alpha.27",
+    "@ibiz-template/core": "^0.7.41-alpha.28",
+    "@ibiz-template/runtime": "^0.7.41-alpha.28",
     "@ibiz-template/theme": "^0.7.39",
-    "@ibiz/model-core": "^0.1.81",
+    "@ibiz/model-core": "^0.1.82",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -57,7 +57,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
     "@ibiz-template/runtime": "^0.6.0",
-    "@ibiz/model-core": "^0.1.81",
+    "@ibiz/model-core": "^0.1.82",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",
@@ -67,5 +67,5 @@
     "vue": "^3.3.8",
     "vue-router": "^4.2.4"
   },
-  "gitHead": "e1cf592ba49a4a3e93a5398aabb5c8a97073b698"
+  "gitHead": "78695c3344ebc9601708c7c334f3cc96c955b023"
 }