@ibiz-template/vue3-util 0.5.3-beta.0 → 0.5.3-beta.10

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

@@ -1,16 +1,14 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable vue/no-mutating-props */
 import {
-  convertNavData,
-  getControl,
   getViewProvider,
   IViewProvider,
-  calcDeCodeNameById,
+  getMatchResPath,
 } from '@ibiz-template/runtime';
 import { defineComponent, h, PropType, ref, resolveComponent } from 'vue';
-import { IAppDEXDataView, IAppView } from '@ibiz/model-core';
+import { IAppDataEntity, IAppView } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
-import { createUUID, notNilEmpty } from 'qx-util';
+import { createUUID } from 'qx-util';
 import { isEmpty, isNil } from 'ramda';
 import { useNamespace } from '../../use';
 import './view-shell.scss';
@@ -42,73 +40,94 @@ export const IBizViewShell = defineComponent({
       }
 
       if (viewModel.dynaSysMode === 1) {
-        // 处理自定义导航上下文
-        const navContexts = viewModel.appViewNavContexts;
-        let context: IParams = {};
-        if (notNilEmpty(navContexts)) {
-          context = convertNavData(
-            navContexts!,
-            props.params || {},
-            props.context,
+        //* 计算实体资源路径上下文参数
+        const appDataEntityId = viewModel.appDataEntityId;
+        let appDe: IAppDataEntity | undefined;
+        if (appDataEntityId) {
+          appDe = await ibiz.hub.getAppDataEntity(
+            appDataEntityId,
+            viewModel.appId,
+          );
+        } else {
+          throw new RuntimeError(
+            `${viewModel.codeName}无实体,暂不支持加载动态模型`,
           );
         }
 
-        // 处理自定义视图参数
-        const navParams = viewModel.appViewNavParams;
-        let params: IParams = {};
-        if (notNilEmpty(navParams)) {
-          params = convertNavData(
-            navParams!,
-            props.params || {},
-            props.context,
-          );
+        /** 加载动态模型的请求参数 */
+        const loadModelParams: IParams = {};
+        // * 计算资源路径上下文参数
+        // 主键
+        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;
         }
 
-        // 根据当前视图指定的数据部件，查找数据并取 srfwftag 使用
-        const { xdataControlName } = viewModel as IAppDEXDataView;
-        if (xdataControlName) {
-          const ctrl = getControl(viewModel, xdataControlName);
-          if (ctrl) {
-            const deCodeName = calcDeCodeNameById(ctrl.appDataEntityId!);
-            if (context[deCodeName]) {
-              const id = createUUID();
-              // 只要上下文中无 srfsessionid 则生成一个
-              if (
-                isNil(props.context.srfsessionid) ||
-                isEmpty(props.context.srfsessionid)
-              ) {
-                // 生成一个界面域，界面域标识为当前控制器实例的标识
-                const domain = ibiz.uiDomainManager.create(id);
-                context.srfsessionid = domain.id;
+        // 工作流视图加载数据补充srfwftag
+        if (appDe && viewModel.enableWF) {
+          // 处理数据请求的上下文
+          const context: IContext = { ...props.context };
+          // 存在主键则加载数据计算对应的参数
+          if (loadModelParams.srfkey) {
+            const noSrfSessionId =
+              isNil(props.context.srfsessionid) ||
+              isEmpty(props.context.srfsessionid);
+            const id = createUUID();
+            // 只要上下文中无 srfsessionid 则生成一个
+            if (noSrfSessionId) {
+              // 生成一个界面域，界面域标识为当前控制器实例的标识
+              const domain = ibiz.uiDomainManager.create(id);
+              context.srfsessionid = domain.id;
+            }
+
+            const app = ibiz.hub.getApp(viewModel.appId);
+            const service = await app.deService.getService(
+              props.context,
+              appDataEntityId!,
+            );
+            const res = await service.get(context, props.params || {});
+            if (res.ok && res.data) {
+              const { srfwftag, processdefinitionkey, taskdefinitionkey } =
+                res.data;
+              if (srfwftag) {
+                loadModelParams.srfwftag = srfwftag;
               }
 
-              const app = ibiz.hub.getApp(ctrl.appId);
-              const service = await app.deService.getService(
-                props.context,
-                ctrl.appDataEntityId!,
-              );
-              const res = await service.get(
-                { ...props.context, srfsessionid: id },
-                props.params || {},
-              );
-              if (res.ok && res.data) {
-                const { data } = res;
-                const { srfwftag } = data;
-                if (srfwftag) {
-                  params.srfwftag = srfwftag;
+              // *动态工作流编辑视图从数据里额外获取参数
+              if (
+                ['DEWFDYNAEDITVIEW3', 'DEWFDYNAEDITVIEW'].includes(
+                  viewModel.viewType!,
+                )
+              ) {
+                const viewParams = props.params!;
+                // 如果视图参数中没有获取到对应流程实例标识与步骤标识，则从请求回来的数据中获取对应信息
+                if (isNil(viewParams.processDefinitionKey)) {
+                  viewParams.processDefinitionKey = processdefinitionkey;
+                }
+                if (isNil(viewParams.taskDefinitionKey)) {
+                  viewParams.taskDefinitionKey = taskdefinitionkey;
                 }
               }
+            }
+
+            if (noSrfSessionId) {
               ibiz.uiDomainManager.destroy(id);
             }
-          } else {
-            throw new RuntimeError('未找到数据控件');
           }
         }
 
+        // *加载动态模型
         viewModelData.value = await ibiz.hub.loadAppView(
           viewModel.appId,
           viewModel.id!,
-          { ...props.context, ...context, ...params },
+          loadModelParams,
         );
       } else {
         viewModelData.value = viewModel;

package/src/panel-component/index.ts

@@ -10,3 +10,4 @@ export * from './grid-container';
 export * from './panel-container-image';
 export * from './panel-container-group';
 export * from './panel-tab-page';
+export * from './panel-item-render';

package/src/panel-component/nav-pos/nav-pos.tsx

@@ -92,7 +92,7 @@ export const NavPos = defineComponent({
         ? h(resolveComponent('IBizViewShell'), {
             context: navViewMsgs[currentKey].context,
             params: navViewMsgs[currentKey].params,
-            key: navViewMsgs[currentKey].key,
+            key: currentKey,
             viewId: navViewMsgs[currentKey].viewId,
             onCreated: this.onViewCreated,
           })

package/src/panel-component/panel-item-render/index.ts

@@ -0,0 +1,18 @@
+import { registerPanelItemProvider } from '@ibiz-template/runtime';
+import { App } from 'vue';
+import { withInstall } from '../../util';
+import { PanelItemRender } from './panel-item-render';
+import { PanelItemRenderProvider } from './panel-item-render.provider';
+
+export const IBizPanelItemRender = withInstall(
+  PanelItemRender,
+  function (v: App) {
+    v.component(PanelItemRender.name, PanelItemRender);
+    registerPanelItemProvider(
+      'PREDEFINE_RENDER',
+      () => new PanelItemRenderProvider(),
+    );
+  },
+);
+
+export default IBizPanelItemRender;

package/src/panel-component/panel-item-render/panel-item-render.controller.ts

@@ -0,0 +1,52 @@
+import { IControlRender, IPanelContainer } from '@ibiz/model-core';
+import {
+  PanelItemController,
+  ScriptFactory,
+  ViewLayoutPanelController,
+} from '@ibiz-template/runtime';
+
+/**
+ * 面板绘制器控制器
+ *
+ * @author zk
+ * @date 2024-01-15 06:01:08
+ * @export
+ * @class PanelItemRenderController
+ * @extends {PanelItemController<IPanelContainer>}
+ */
+export class PanelItemRenderController extends PanelItemController<IPanelContainer> {
+  /**
+   * 面板控制器
+   *
+   * @author lxm
+   * @date 2022-08-24 22:08:59
+   * @type {PanelController}
+   */
+  declare panel: ViewLayoutPanelController;
+
+  /**
+   * 获取面板绘制器自定义html
+   *
+   * @author zk
+   * @date 2024-01-15 01:01:11
+   * @export
+   * @param {IControlRender[]} controlRenders
+   * @return {*}  {(string | undefined)}
+   */
+  getPanelItemCustomHtml(
+    controlRenders: IControlRender[],
+    data: IData | undefined,
+  ): string | undefined {
+    if (controlRenders.length === 0) {
+      return undefined;
+    }
+    const controlRender = controlRenders[0];
+    if (controlRender.layoutPanelModel) {
+      return ScriptFactory.execScriptFn(
+        { data: data || {} },
+        controlRender.layoutPanelModel,
+        { singleRowReturn: true, isAsync: false },
+      ) as string;
+    }
+  }
+}

package/src/panel-component/panel-item-render/panel-item-render.provider.ts

@@ -0,0 +1,30 @@
+import {
+  IPanelItemProvider,
+  PanelController,
+  PanelItemController,
+} from '@ibiz-template/runtime';
+import { IPanelContainer } from '@ibiz/model-core';
+import { PanelItemRenderController } from './panel-item-render.controller';
+
+/**
+ * 面板绘制器适配器
+ *
+ * @author zk
+ * @date 2024-01-15 06:01:32
+ * @export
+ * @class PanelItemRenderProvider
+ * @implements {IPanelItemProvider}
+ */
+export class PanelItemRenderProvider implements IPanelItemProvider {
+  component: string = 'IBizPanelItemRender';
+
+  async createController(
+    panelItem: IPanelContainer,
+    panel: PanelController,
+    parent: PanelItemController | undefined,
+  ): Promise<PanelItemRenderController> {
+    const c = new PanelItemRenderController(panelItem, panel, parent);
+    await c.init();
+    return c;
+  }
+}

package/src/panel-component/panel-item-render/panel-item-render.tsx

@@ -0,0 +1,50 @@
+import { IPanelContainer } from '@ibiz/model-core';
+import { computed, defineComponent, PropType } from 'vue';
+import { useNamespace } from '../../use';
+import { PanelItemRenderController } from './panel-item-render.controller';
+
+export const PanelItemRender = defineComponent({
+  name: 'IBizPanelItemRender',
+  props: {
+    modelData: {
+      type: Object as PropType<IPanelContainer>,
+      required: true,
+    },
+    controller: {
+      type: PanelItemRenderController,
+      required: true,
+    },
+  },
+  setup(props) {
+    const ns = useNamespace('panel-item-render');
+
+    const nsType = useNamespace(
+      `panel-${props.modelData.itemType?.toLowerCase()}`,
+    );
+
+    const { id } = props.modelData;
+
+    // 类名控制
+    const classArr = computed(() => {
+      const result: Array<string | false> = [
+        ns.b(),
+        ns.m(id),
+        nsType.b(),
+        ns.is('hidden', !props.controller.state.visible),
+      ];
+      return result;
+    });
+
+    const htmlCode = computed(() => {
+      return props.controller.getPanelItemCustomHtml(
+        props.modelData.controlRenders!,
+        props.controller.data,
+      );
+    });
+
+    return { ns, classArr, htmlCode };
+  },
+  render() {
+    return <div class={this.classArr} v-html={this.htmlCode}></div>;
+  },
+});

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/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;