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

package/src/common/view-shell/view-shell.tsx

@@ -54,24 +54,41 @@ export const IBizViewShell = defineComponent({
           );
         }
 
+        const params = props.params || {};
+
         /** 加载动态模型的请求参数 */
         const loadModelParams: IParams = {};
-        // * 计算资源路径上下文参数
-        // 主键
-        const srfkey = props.context[appDe.codeName!.toLowerCase()];
-        if (srfkey) {
-          loadModelParams.srfkey = srfkey;
+        if (params.srfkey) {
+          loadModelParams.srfkey = params.srfkey;
+        } else {
+          // * 计算资源路径上下文参数
+          // 主键
+          const srfkey = props.context[appDe.codeName!.toLowerCase()];
+          if (srfkey) {
+            loadModelParams.srfkey = srfkey;
+          }
         }
-        // 上层资源路径主实体名称和主键
-        const match = getMatchResPath(props.context, appDe);
-        if (match && match.keys.length > 1) {
-          const parentDeKey = match.keys[match.keys.length - 2];
-          loadModelParams.srfparentkey = props.context[parentDeKey];
-          loadModelParams.srfparentdeanme = parentDeKey;
+
+        // 如果视图参数同时存在 srfparentkey 与 srfparentdeanme 则直接使用视图参数
+        if (params.srfparentkey && params.srfparentdeanme) {
+          loadModelParams.srfparentkey = params.srfparentkey;
+          loadModelParams.srfparentdeanme = params.srfparentdeanme;
+        } else {
+          // 上层资源路径主实体名称和主键
+          const match = getMatchResPath(props.context, appDe);
+          if (match && match.keys.length > 1) {
+            const parentDeKey = match.keys[match.keys.length - 2];
+            loadModelParams.srfparentkey =
+              params.srfparentkey || props.context[parentDeKey];
+            loadModelParams.srfparentdeanme =
+              params.srfparentdeanme || parentDeKey;
+          }
         }
 
-        // 工作流视图加载数据补充srfwftag
-        if (appDe && viewModel.enableWF) {
+        // 如果视图参数中存在 srfwftag 则直接使用视图参数
+        if (params.srfwftag) {
+          loadModelParams.srfwftag = params.srfwftag;
+        } else if (appDe && viewModel.enableWF) {
           // 处理数据请求的上下文
           const context: IContext = { ...props.context };
           // 存在主键则加载数据计算对应的参数

package/src/plugin/plugin-factory/plugin-factory.ts

@@ -260,14 +260,7 @@ export class PluginFactory implements IPluginFactory {
       configData as RemotePluginConfig,
     );
     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);
@@ -366,6 +359,43 @@ export class PluginFactory implements IPluginFactory {
     return url;
   }
 
+  /**
+   * 加载插件的外部依赖
+   *
+   * @author chitanda
+   * @date 2024-01-19 19:01:39
+   * @protected
+   * @param {RemotePluginConfig} config
+   * @return {*}  {Promise<void>}
+   */
+  protected async loadPluginExternal(
+    config: RemotePluginConfig,
+  ): Promise<void> {
+    if (!config['systemjs-importmap']) {
+      return;
+    }
+    const importMap = this.handleSystemImportMap(config['systemjs-importmap'])!;
+    if (importMap.packages) {
+      const pkgs = importMap.packages;
+      // eslint-disable-next-line no-restricted-syntax, guard-for-in
+      for (const key in pkgs) {
+        const pkgPath = pkgs[key];
+        // eslint-disable-next-line no-await-in-loop
+        const res = await ibiz.net.axios({
+          method: 'get',
+          headers: { 'Access-Control-Allow-Origin': '*' },
+          url: pkgPath,
+        });
+        if (res.status !== 200) {
+          throw new Error(`配置加载失败`);
+        }
+        // eslint-disable-next-line no-await-in-loop
+        await this.loadPluginExternal(res.data!);
+      }
+    }
+    System.addImportMap(importMap);
+  }
+
   /**
    * 处理 systemjs importmap 配置
    *
@@ -379,6 +409,16 @@ export class PluginFactory implements IPluginFactory {
     importMap: ISystemImportMap,
   ): ISystemImportMap | null {
     if (importMap) {
+      if (importMap.packages) {
+        const pkgs = importMap.packages;
+        // eslint-disable-next-line no-restricted-syntax
+        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;
         // eslint-disable-next-line no-restricted-syntax

package/src/use/view/use-view-controller/use-view-controller.ts

@@ -107,6 +107,8 @@ export function useViewController<T extends IViewController>(
     c = fn(props.modelData, props.context, props.params, ctx) as T;
   }
 
+  ibiz.util.viewStack.add(c.id, c);
+
   watchAndUpdateContextParams(props, c);
   watchAndUpdateState(props, c);
 
@@ -123,9 +125,15 @@ export function useViewController<T extends IViewController>(
     c.modal = props.modal;
   }
 
-  onActivated(() => c.onActivated());
+  onActivated(() => {
+    c.onActivated();
+    ibiz.util.viewStack.active(c.id);
+  });
 
-  onDeactivated(() => c.onDeactivated());
+  onDeactivated(() => {
+    c.onDeactivated();
+    ibiz.util.viewStack.deactivate(c.id);
+  });
 
   c.force = useForce();
 
@@ -137,6 +145,9 @@ export function useViewController<T extends IViewController>(
   c.created();
 
   // 卸载时销毁
-  onBeforeUnmount(() => c.destroyed());
+  onBeforeUnmount(() => {
+    c.destroyed();
+    ibiz.util.viewStack.remove(c.id);
+  });
   return c as T;
 }

package/src/util/store/async-action/async-action.ts

@@ -35,6 +35,15 @@ function formatAsyncAction(data: IPortalAsyncAction): IPortalAsyncAction {
     }
   }
 
+  if (isNil(data.completionrate)) {
+    const num = Number(data.completionrate);
+    if (Number.isNaN(num)) {
+      data.completionrate = undefined;
+    } else {
+      data.completionrate = num;
+    }
+  }
+
   return data;
 }