@ibiz-template/vue3-util 0.5.3-beta.9 → 0.5.4

package/es/plugin/plugin-factory/plugin-factory.d.ts

@@ -1,4 +1,4 @@
-import { IPluginFactory, IPluginItem, ISystemImportMap, RemotePluginItem } from '@ibiz-template/runtime';
+import { IPluginFactory, IPluginItem, ISystemImportMap, RemotePluginConfig, RemotePluginItem } from '@ibiz-template/runtime';
 import { ISysPFPlugin } from '@ibiz/model-core';
 import { App, Plugin } from 'vue';
 /**
@@ -163,6 +163,16 @@ export declare class PluginFactory implements IPluginFactory {
      * @return {*}  {string}
      */
     protected parseUrl(pathUrl: string, baseUrl?: string): string;
+    /**
+     * 加载插件的外部依赖
+     *
+     * @author chitanda
+     * @date 2024-01-19 19:01:39
+     * @protected
+     * @param {RemotePluginConfig} config
+     * @return {*}  {Promise<void>}
+     */
+    protected loadPluginExternal(config: RemotePluginConfig): Promise<void>;
     /**
      * 处理 systemjs importmap 配置
      *

package/es/plugin/plugin-factory/plugin-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-factory.d.ts","sourceRoot":"","sources":["../../../src/plugin/plugin-factory/plugin-factory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAEhB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAmB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAElC;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,cAAc;IAClD;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,SAA0B;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IAElD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAElE;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAM;IAEhD;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAa;IAE/D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAS/C;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIzC;;;;;;OAMG;IACH,wBAAwB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAInD;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAMxB;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASvD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAO3C;;;;;;;OAOG;IACG,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAuCxD;;;;;;;OAOG;IACG,aAAa,CACjB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;IAgDnB;;;;;;;;OAQG;cACa,UAAU,CAAC,YAAY,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCzE;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAA+B,GACvC,MAAM;IAwBT;;;;;;;;OAQG;IACH,SAAS,CAAC,qBAAqB,CAC7B,SAAS,EAAE,gBAAgB,GAC1B,gBAAgB,GAAG,IAAI;CAgC3B"}
+{"version":3,"file":"plugin-factory.d.ts","sourceRoot":"","sources":["../../../src/plugin/plugin-factory/plugin-factory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAmB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAElC;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,cAAc;IAClD;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,SAA0B;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IAElD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAElE;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAM;IAEhD;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAa;IAE/D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAS/C;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIzC;;;;;;OAMG;IACH,wBAAwB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAInD;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAMxB;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASvD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAO3C;;;;;;;OAOG;IACG,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAuCxD;;;;;;;OAOG;IACG,aAAa,CACjB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;IAyCnB;;;;;;;;OAQG;cACa,UAAU,CAAC,YAAY,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCzE;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAA+B,GACvC,MAAM;IAwBT;;;;;;;;OAQG;cACa,kBAAkB,CAChC,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,IAAI,CAAC;IA0BhB;;;;;;;;OAQG;IACH,SAAS,CAAC,qBAAqB,CAC7B,SAAS,EAAE,gBAAgB,GAC1B,gBAAgB,GAAG,IAAI;CA0C3B"}

package/es/plugin/plugin-factory/plugin-factory.mjs

@@ -228,14 +228,7 @@ class PluginFactory {
       configData
     );
     if (remotePlugin) {
-      if (remotePlugin.config["systemjs-importmap"]) {
-        const importMap = this.handleSystemImportMap(
-          remotePlugin.config["systemjs-importmap"]
-        );
-        if (importMap) {
-          System.addImportMap(importMap);
-        }
-      }
+      await this.loadPluginExternal(remotePlugin.config);
       try {
         await this.loadScript(remotePlugin);
         this.pluginCache.set(rtObjectName, remotePlugin);
@@ -328,6 +321,37 @@ class PluginFactory {
     }
     return url;
   }
+  /**
+   * 加载插件的外部依赖
+   *
+   * @author chitanda
+   * @date 2024-01-19 19:01:39
+   * @protected
+   * @param {RemotePluginConfig} config
+   * @return {*}  {Promise<void>}
+   */
+  async loadPluginExternal(config) {
+    if (!config["systemjs-importmap"]) {
+      return;
+    }
+    const importMap = this.handleSystemImportMap(config["systemjs-importmap"]);
+    if (importMap.packages) {
+      const pkgs = importMap.packages;
+      for (const key in pkgs) {
+        const pkgPath = pkgs[key];
+        const res = await ibiz.net.axios({
+          method: "get",
+          headers: { "Access-Control-Allow-Origin": "*" },
+          url: pkgPath
+        });
+        if (res.status !== 200) {
+          throw new Error("\u914D\u7F6E\u52A0\u8F7D\u5931\u8D25");
+        }
+        await this.loadPluginExternal(res.data);
+      }
+    }
+    System.addImportMap(importMap);
+  }
   /**
    * 处理 systemjs importmap 配置
    *
@@ -339,6 +363,15 @@ class PluginFactory {
    */
   handleSystemImportMap(importMap) {
     if (importMap) {
+      if (importMap.packages) {
+        const pkgs = importMap.packages;
+        for (const key in pkgs) {
+          if (Object.prototype.hasOwnProperty.call(pkgs, key)) {
+            const url = pkgs[key];
+            pkgs[key] = this.parseUrl(url, importMap.baseUrl);
+          }
+        }
+      }
       if (importMap.imports) {
         const imps = importMap.imports;
         for (const key in imps) {

package/es/props/editor/autocomplete.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getAutoCompleteProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridAutoCompleteProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/check-box-list.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getCheckboxListProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridCheckboxListProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/check-box.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getCheckboxProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridCheckboxProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/data-picker.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getDataPickerProps<C>(): {
-    value: (ObjectConstructor | ArrayConstructor | StringConstructor | NumberConstructor)[];
+    value: (ObjectConstructor | ArrayConstructor | NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridDataPickerProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (ObjectConstructor | ArrayConstructor | StringConstructor | NumberConstructor)[];
+    value: (ObjectConstructor | ArrayConstructor | NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/date-picker.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getDatePickerProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridDatePickerProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/date-range.d.ts

@@ -6,7 +6,7 @@
  * @returns {*}
  */
 export declare function getDateRangeProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -39,7 +39,7 @@ export declare function getGridDateRangeProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/dropdown-list.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getDropdownProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridDropdownProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/list-box.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getListBoxProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridListBoxProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/number-range.d.ts

@@ -6,7 +6,7 @@
  * @returns {*}
  */
 export declare function getNumberRangeProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -39,7 +39,7 @@ export declare function getGridNumberRangeProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/radio-button-list.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getRadioProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridRadioProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/rate.d.ts

@@ -6,7 +6,7 @@
  * @returns {*}
  */
 export declare function getRateProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -39,7 +39,7 @@ export declare function getGridRateProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/raw.d.ts

@@ -6,7 +6,7 @@
  * @returns {*}
  */
 export declare function getRawProps<C>(): {
-    value: (ArrayConstructor | StringConstructor | NumberConstructor)[];
+    value: (ArrayConstructor | NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -39,7 +39,7 @@ export declare function getGridRawProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (ArrayConstructor | StringConstructor | NumberConstructor)[];
+    value: (ArrayConstructor | NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/slider.d.ts

@@ -6,7 +6,7 @@
  * @returns {*}
  */
 export declare function getSliderProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -39,7 +39,7 @@ export declare function getGridSliderProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/span.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getSpanProps<C>(): {
-    value: (ObjectConstructor | ArrayConstructor | StringConstructor | NumberConstructor)[];
+    value: (ObjectConstructor | ArrayConstructor | NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridSpanProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (ObjectConstructor | ArrayConstructor | StringConstructor | NumberConstructor)[];
+    value: (ObjectConstructor | ArrayConstructor | NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/stepper.d.ts

@@ -6,7 +6,7 @@
  * @returns {*}
  */
 export declare function getStepperProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -39,7 +39,7 @@ export declare function getGridStepperProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/switch.d.ts

@@ -6,7 +6,7 @@
  * @returns {*}
  */
 export declare function getSwitchProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -39,7 +39,7 @@ export declare function getGridSwitchProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/props/editor/text-box.d.ts

@@ -8,7 +8,7 @@
  * @returns {*}
  */
 export declare function getInputProps<C>(): {
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {
@@ -43,7 +43,7 @@ export declare function getGridInputProps<C>(): {
     hasError: {
         type: BooleanConstructor;
     };
-    value: (StringConstructor | NumberConstructor)[];
+    value: (NumberConstructor | StringConstructor)[];
     controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
     data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
     disabled: {

package/es/use/view/use-view-controller/use-view-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-view-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/view/use-view-controller/use-view-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAEf,cAAc,EACf,MAAM,wBAAwB,CAAC;AAmEhC;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,eAAe,EACzD,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,cAAc,CAAC,KAAK,CAAC,GAC/D,CAAC,CAuDH"}
+{"version":3,"file":"use-view-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/view/use-view-controller/use-view-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAEf,cAAc,EACf,MAAM,wBAAwB,CAAC;AAmEhC;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,eAAe,EACzD,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,cAAc,CAAC,KAAK,CAAC,GAC/D,CAAC,CAkEH"}

package/es/use/view/use-view-controller/use-view-controller.mjs

@@ -51,6 +51,7 @@ function useViewController(fn) {
   } else {
     c = fn(props.modelData, props.context, props.params, ctx);
   }
+  ibiz.util.viewStack.add(c.id, c);
   watchAndUpdateContextParams(props, c);
   watchAndUpdateState(props, c);
   provide("ctx", c.ctx);
@@ -59,15 +60,24 @@ function useViewController(fn) {
   if (props.modal) {
     c.modal = props.modal;
   }
-  onActivated(() => c.onActivated());
-  onDeactivated(() => c.onDeactivated());
+  onActivated(() => {
+    c.onActivated();
+    ibiz.util.viewStack.active(c.id);
+  });
+  onDeactivated(() => {
+    c.onDeactivated();
+    ibiz.util.viewStack.deactivate(c.id);
+  });
   c.force = useForce();
   const vue = getCurrentInstance().proxy;
   c.evt.onAll((eventName, event) => {
     vue.$emit(eventName.slice(2), event);
   });
   c.created();
-  onBeforeUnmount(() => c.destroyed());
+  onBeforeUnmount(() => {
+    c.destroyed();
+    ibiz.util.viewStack.remove(c.id);
+  });
   return c;
 }
 

package/es/util/store/async-action/async-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"async-action.d.ts","sourceRoot":"","sources":["../../../../src/util/store/async-action/async-action.ts"],"names":[],"mappings":"AAwCA;;;;;;GAMG;AACH,wBAAgB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6D7B"}
+{"version":3,"file":"async-action.d.ts","sourceRoot":"","sources":["../../../../src/util/store/async-action/async-action.ts"],"names":[],"mappings":"AAiDA;;;;;;GAMG;AACH,wBAAgB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6D7B"}

package/es/util/store/async-action/async-action.mjs

@@ -22,6 +22,14 @@ function formatAsyncAction(data) {
     } catch (error) {
     }
   }
+  if (isNil(data.completionrate)) {
+    const num = Number(data.completionrate);
+    if (Number.isNaN(num)) {
+      data.completionrate = void 0;
+    } else {
+      data.completionrate = num;
+    }
+  }
   return data;
 }
 function useAsyncAction() {

package/lib/index.cjs

@@ -16,6 +16,7 @@ var controlShell = require('./common/control-shell/control-shell.cjs');
 var viewShell = require('./common/view-shell/view-shell.cjs');
 var codeList = require('./common/code-list/code-list.cjs');
 var controlLoadingPlaceholder = require('./common/control-loading-placeholder/control-loading-placeholder.cjs');
+var badge = require('./common/badge/badge.cjs');
 var panelContainer_state = require('./panel-component/panel-container/panel-container.state.cjs');
 var panelContainer_controller = require('./panel-component/panel-container/panel-container.controller.cjs');
 var index = require('./panel-component/panel-container/index.cjs');
@@ -115,6 +116,7 @@ exports.IBizControlShell = controlShell.IBizControlShell;
 exports.IBizViewShell = viewShell.IBizViewShell;
 exports.IBizCodeList = codeList.IBizCodeList;
 exports.ControlLoadingPlaceholder = controlLoadingPlaceholder.ControlLoadingPlaceholder;
+exports.IBizBadge = badge.IBizBadge;
 exports.PanelContainerState = panelContainer_state.PanelContainerState;
 exports.PanelContainerController = panelContainer_controller.PanelContainerController;
 exports.IBizPanelContainer = index.IBizPanelContainer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.5.3-beta.9",
+  "version": "0.5.4",
   "description": "vue3 工具包",
   "type": "module",
   "module": "es/index.mjs",
@@ -31,10 +31,10 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/cli": "^0.3.10",
-    "@ibiz-template/core": "^0.5.3-beta.7",
-    "@ibiz-template/runtime": "^0.5.3-beta.9",
+    "@ibiz-template/core": "^0.5.3",
+    "@ibiz-template/runtime": "^0.5.4",
     "@ibiz-template/theme": "^0.5.0",
-    "@ibiz/model-core": "^0.1.3",
+    "@ibiz/model-core": "^0.1.5",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -51,7 +51,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
     "@ibiz-template/runtime": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.3",
+    "@ibiz/model-core": "^0.1.5",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",
@@ -61,5 +61,5 @@
     "vue": "^3.3.4",
     "vue-router": "^4.2.4"
   },
-  "gitHead": "1d099a8c47c71f97618d5edbc0876853c35e90bc"
+  "gitHead": "627ad2605158cf11f72c589e6bf239467f2f90eb"
 }

package/src/common/badge/badge.scss

@@ -0,0 +1,29 @@
+$badge: (
+  bg-color: getCssVar(color, danger),
+);
+
+
+@include b(badge) {
+  display: inline-block;
+  padding: 3px 6px;
+  line-height: 1rem;
+  color: #fff;
+  background-color: getCssVar(badge, bg-color);
+  border-radius: 10px;
+
+  @include m(danger){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,danger);
+  }
+  @include m(success){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,success);
+  }
+  @include m(warning){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,warning);
+  }
+  @include m(info){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,info);
+  }
+  @include m(primary){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,primary);
+  }
+}

package/src/common/badge/badge.tsx

@@ -0,0 +1,26 @@
+import { defineComponent, PropType } from 'vue';
+import { useNamespace } from '../../use';
+import './badge.scss';
+
+export const IBizBadge = defineComponent({
+  name: 'IBizBadge',
+  props: {
+    value: {
+      type: Number,
+      required: true,
+    },
+    type: {
+      type: String as PropType<
+        'primary' | 'success' | 'warning' | 'danger' | 'info'
+      >,
+      default: 'danger',
+    },
+  },
+  setup() {
+    const ns = useNamespace('badge');
+    return { ns };
+  },
+  render() {
+    return <div class={[this.ns.b(), this.ns.m(this.type)]}>{this.value}</div>;
+  },
+});

package/src/common/index.ts

@@ -6,3 +6,4 @@ export * from './view-shell/view-shell';
 export * from './code-list/code-list';
 export * from './code-list/code-list';
 export * from './control-loading-placeholder/control-loading-placeholder';
+export * from './badge/badge';