@ibiz-template/vue3-util 0.5.3-beta.1 → 0.5.3-beta.11

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

@@ -2,6 +2,7 @@ import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
 import {
   IPluginFactory,
   IPluginItem,
+  ISystemImportMap,
   RemotePluginConfig,
   RemotePluginItem,
 } from '@ibiz-template/runtime';
@@ -259,6 +260,14 @@ 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);
+        }
+      }
       try {
         await this.loadScript(remotePlugin);
         this.pluginCache.set(rtObjectName, remotePlugin);
@@ -324,24 +333,28 @@ export class PluginFactory implements IPluginFactory {
    * 编译请求文件地址
    *
    * @author chitanda
-   * @date 2022-10-31 14:10:19
+   * @date 2024-01-11 16:01:19
    * @protected
-   * @param {string} script
+   * @param {string} pathUrl
+   * @param {string} [baseUrl=ibiz.env.pluginBaseUrl]
    * @return {*}  {string}
    */
-  protected parseUrl(script: string): string {
-    if (this.urlReg.test(script)) {
-      return script;
+  protected parseUrl(
+    pathUrl: string,
+    baseUrl: string = ibiz.env.pluginBaseUrl,
+  ): string {
+    if (this.urlReg.test(pathUrl)) {
+      return pathUrl;
     }
     let url: string = '';
-    if (this.urlReg.test(ibiz.env.pluginBaseUrl)) {
-      if (script.startsWith('/')) {
-        url = ibiz.env.pluginBaseUrl + script;
+    if (this.urlReg.test(baseUrl)) {
+      if (pathUrl.startsWith('/')) {
+        url = baseUrl + pathUrl;
       } else {
-        url = `${ibiz.env.pluginBaseUrl}/${script}`;
+        url = `${baseUrl}/${pathUrl}`;
       }
     } else {
-      url = `${join(ibiz.env.pluginBaseUrl, script)}`;
+      url = `${join(baseUrl, pathUrl)}`;
     }
     const { origin, pathname } = window.location;
     if (pathname.endsWith('/') && url.startsWith('/')) {
@@ -352,4 +365,48 @@ export class PluginFactory implements IPluginFactory {
     }
     return url;
   }
+
+  /**
+   * 处理 systemjs importmap 配置
+   *
+   * @author chitanda
+   * @date 2024-01-11 20:01:07
+   * @protected
+   * @param {ISystemImportMap} importMap
+   * @return {*}  {IParams}
+   */
+  protected handleSystemImportMap(
+    importMap: ISystemImportMap,
+  ): ISystemImportMap | null {
+    if (importMap) {
+      if (importMap.imports) {
+        const imps = importMap.imports;
+        // eslint-disable-next-line no-restricted-syntax
+        for (const key in imps) {
+          if (Object.prototype.hasOwnProperty.call(imps, key)) {
+            const url = imps[key];
+            imps[key] = this.parseUrl(url, importMap.baseUrl);
+          }
+        }
+      }
+      if (importMap.styles) {
+        const styles = importMap.styles;
+        // eslint-disable-next-line no-restricted-syntax
+        for (const key in styles) {
+          if (Object.prototype.hasOwnProperty.call(styles, key)) {
+            const urls = styles[key];
+            if (typeof urls === 'string') {
+              styles[key] = this.parseUrl(urls, importMap.baseUrl);
+            } else {
+              styles[key] = urls.map(url =>
+                this.parseUrl(url, importMap.baseUrl),
+              );
+            }
+          }
+        }
+      }
+      return importMap;
+    }
+    return null;
+  }
 }

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/route/route.ts

@@ -162,7 +162,12 @@ export function routePath2string(routePath: IRoutePath): string {
  */
 export function getOwnRouteContext(context: IContext): IParams {
   const ownContext = context.getOwnContext();
-  const excludeKeys = ['srfsessionid', 'srfappid'];
+  const excludeKeys = [
+    'srfsessionid',
+    'srfappid',
+    'currentSrfNav',
+    'toRouteDepth',
+  ];
   Object.keys(ownContext).forEach(key => {
     if (excludeKeys.includes(key)) {
       delete ownContext[key];
@@ -258,8 +263,8 @@ export async function generateRoutePath(
   let depth = context.srfdefaulttoroutedepth || 2; // 默认层级看上下文的srfdefaulttoroutedepth，如果没有就是2
   if (context.toRouteDepth) {
     depth = context.toRouteDepth;
-    // 使用完后删除，避免添加到上下文里
-    delete context.toRouteDepth;
+    // 使用完后转为undefined，避免添加到上下文里
+    context.toRouteDepth = undefined;
   } else if (ibiz.env.isMob) {
     // 移动端默认补充home层级
     routePath.pathNodes[0] = {
@@ -275,8 +280,8 @@ export async function generateRoutePath(
     const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
     currentNode.params = currentNode.params || {};
     currentNode.srfnav = context.currentSrfNav;
-    // 使用完后删除，避免添加到上下文里
-    delete context.currentSrfNav;
+    // 使用完后转为undefined，避免添加到上下文里
+    context.currentSrfNav = undefined;
   }
 
   // 重定向视图跳转的一级首页路由

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

@@ -2,7 +2,7 @@
 
 import { IPortalAsyncAction, IPortalMessage } from '@ibiz-template/core';
 import dayjs from 'dayjs';
-import { isNumber } from 'lodash-es';
+import { isNil, isNumber } from 'lodash-es';
 import { computed, onUnmounted, ref } from 'vue';
 
 /**
@@ -25,6 +25,16 @@ function formatAsyncAction(data: IPortalAsyncAction): IPortalAsyncAction {
       data[key] = dayjs(data[key]).format('YYYY-MM-DD HH:mm:ss');
     }
   });
+
+  if (!isNil(data.actionresult)) {
+    try {
+      const json = JSON.parse(data.actionresult as string);
+      data.actionresult = json;
+    } catch (error) {
+      // 不是对象类型就是字符串。
+    }
+  }
+
   return data;
 }
 
@@ -50,6 +60,7 @@ export function useAsyncAction() {
 
   const load = async () => {
     const res = await ibiz.asyncAction.fetch();
+    res.data.forEach(formatAsyncAction);
     allAsyncActions.value = res.data;
   };
 
@@ -63,10 +74,11 @@ export function useAsyncAction() {
       return;
     }
     const asyncAction = formatAsyncAction(msg.data as IPortalAsyncAction);
+
     const findIndex = allAsyncActions.value.findIndex(
       item => item.asyncacitonid === asyncAction.asyncacitonid,
     );
-    if (findIndex !== -1) {
+    if (findIndex === -1) {
       // 不存在的数据补充到最开始，并显示长度加一
       allAsyncActions.value.unshift(asyncAction);
       showLength.value += 1;