@ibiz-template/vue3-util 0.5.7-alpha.2 → 0.5.7-alpha.4

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

@@ -3,10 +3,10 @@
 import {
   getViewProvider,
   IViewProvider,
-  getMatchResPath,
+  calcDynaSysParams,
 } from '@ibiz-template/runtime';
 import { defineComponent, h, PropType, ref, resolveComponent } from 'vue';
-import { IAppDataEntity, IAppView } from '@ibiz/model-core';
+import { IAppView } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
 import { createUUID } from 'qx-util';
 import { isEmpty, isNil } from 'ramda';
@@ -42,13 +42,7 @@ export const IBizViewShell = defineComponent({
       if (viewModel.dynaSysMode === 1) {
         //* 计算实体资源路径上下文参数
         const appDataEntityId = viewModel.appDataEntityId;
-        let appDe: IAppDataEntity | undefined;
-        if (appDataEntityId) {
-          appDe = await ibiz.hub.getAppDataEntity(
-            appDataEntityId,
-            viewModel.appId,
-          );
-        } else {
+        if (!appDataEntityId) {
           throw new RuntimeError(
             `${viewModel.codeName}无实体,暂不支持加载动态模型`,
           );
@@ -57,38 +51,20 @@ export const IBizViewShell = defineComponent({
         const params = props.params || {};
 
         /** 加载动态模型的请求参数 */
-        const loadModelParams: IParams = {};
-        if (params.srfkey) {
-          loadModelParams.srfkey = params.srfkey;
-        } else {
-          // * 计算资源路径上下文参数
-          // 主键
-          const srfkey = props.context[appDe.codeName!.toLowerCase()];
-          if (srfkey) {
-            loadModelParams.srfkey = srfkey;
-          }
-        }
+        const loadModelParams: IParams = await calcDynaSysParams(
+          appDataEntityId,
+          props.context,
+          { viewParams: params, appId: viewModel.appId },
+        );
 
-        // 如果视图参数同时存在 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;
-          }
+        if (params.srfdatatype) {
+          loadModelParams.srfdatatype = params.srfdatatype;
         }
 
         // 如果视图参数中存在 srfwftag 则直接使用视图参数
         if (params.srfwftag) {
           loadModelParams.srfwftag = params.srfwftag;
-        } else if (appDe && viewModel.enableWF) {
+        } else if (appDataEntityId && viewModel.enableWF) {
           // 处理数据请求的上下文
           const context: IContext = { ...props.context };
           // 存在主键则加载数据计算对应的参数

package/src/util/store/app-store/app-store.ts

@@ -1,21 +1,10 @@
-import { IPortalAsyncAction } from '@ibiz-template/core';
 import { defineStore } from 'pinia';
-import { reactive, Ref } from 'vue';
-import { useAsyncAction } from '../async-action/async-action';
+import { reactive } from 'vue';
 
-export interface IAppStore {
-  allAsyncActions: Ref<IPortalAsyncAction[]>;
-  recentAsyncActions: IPortalAsyncAction[];
-}
+export interface IAppStore {}
 
 export const useAppStore = defineStore('appStore', () => {
-  const { allAsyncActions, recentAsyncActions } = useAsyncAction();
-  const appStore = reactive<IAppStore>({
-    allAsyncActions,
-    get recentAsyncActions() {
-      return recentAsyncActions.value;
-    },
-  });
+  const appStore = reactive<IAppStore>({});
 
   return { appStore };
 });

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

@@ -1,56 +0,0 @@
-/**
- * 使用异步操作消息
- * @author lxm
- * @date 2023-11-14 03:17:28
- * @export
- * @return {*}
- */
-export declare function useAsyncAction(): {
-    allAsyncActions: import("vue").Ref<{
-        asyncacitonid: string;
-        asyncacitonname: string;
-        fulltopictag: string;
-        srfdcid: string;
-        dcsystemid: string;
-        actiontype: string;
-        actionstate: 10 | 20 | 30 | 40;
-        actionresult?: unknown;
-        stepinfo?: string | undefined;
-        completionrate?: number | undefined;
-        asyncresultdownloadurl?: string | undefined;
-        actionparam?: unknown;
-        actionparam2?: unknown;
-        actionparam3?: unknown;
-        actionparam4?: unknown;
-        begintime: string;
-        endtime: string;
-        createman: string;
-        createdate: string;
-        updateman: string;
-        updatedate: string;
-    }[]>;
-    recentAsyncActions: import("vue").ComputedRef<{
-        asyncacitonid: string;
-        asyncacitonname: string;
-        fulltopictag: string;
-        srfdcid: string;
-        dcsystemid: string;
-        actiontype: string;
-        actionstate: 10 | 20 | 30 | 40;
-        actionresult?: unknown;
-        stepinfo?: string | undefined;
-        completionrate?: number | undefined;
-        asyncresultdownloadurl?: string | undefined;
-        actionparam?: unknown;
-        actionparam2?: unknown;
-        actionparam3?: unknown;
-        actionparam4?: unknown;
-        begintime: string;
-        endtime: string;
-        createman: string;
-        createdate: string;
-        updateman: string;
-        updatedate: string;
-    }[]>;
-};
-//# sourceMappingURL=async-action.d.ts.map

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

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

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

@@ -1,80 +0,0 @@
-import dayjs from 'dayjs';
-import { isNumber, isNil } from 'lodash-es';
-import { ref, computed, onUnmounted } from 'vue';
-
-"use strict";
-function formatAsyncAction(data) {
-  const dateFields = [
-    "begintime",
-    "endtime",
-    "createdate",
-    "updatedate"
-  ];
-  dateFields.forEach((key) => {
-    if (isNumber(data[key])) {
-      data[key] = dayjs(data[key]).format("YYYY-MM-DD HH:mm:ss");
-    }
-  });
-  if (!isNil(data.actionresult)) {
-    try {
-      const json = JSON.parse(data.actionresult);
-      data.actionresult = json;
-    } 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() {
-  const allAsyncActions = ref([]);
-  const showLength = ref(0);
-  const recentAsyncActions = computed(() => {
-    return allAsyncActions.value.filter(
-      (_item, index) => index < showLength.value
-    );
-  });
-  const load = async () => {
-    const res = await ibiz.asyncAction.fetch();
-    res.data.forEach(formatAsyncAction);
-    allAsyncActions.value = res.data;
-  };
-  const asyncActionCallBack = (msg) => {
-    if (!msg.data || msg.subtype !== "ASYNCACTION") {
-      return;
-    }
-    console.log("\u539F\u59CB\u6570\u636E", msg);
-    const asyncAction = formatAsyncAction(msg.data);
-    console.log("\u683C\u5F0F\u5316\u540E\u6570\u636E", asyncAction);
-    const findIndex = allAsyncActions.value.findIndex(
-      (item) => item.asyncacitonid === asyncAction.asyncacitonid
-    );
-    if (findIndex === -1) {
-      allAsyncActions.value.unshift(asyncAction);
-      showLength.value += 1;
-    } else {
-      const isShow = findIndex >= showLength.value;
-      if (isShow) {
-        allAsyncActions.value.splice(findIndex, 1);
-        allAsyncActions.value.unshift(asyncAction);
-        showLength.value += 1;
-      } else {
-        allAsyncActions.value.splice(findIndex, 1, asyncAction);
-      }
-    }
-  };
-  load();
-  ibiz.mc.command.asyncAction.on(asyncActionCallBack);
-  onUnmounted(() => {
-    ibiz.mc.command.asyncAction.off(asyncActionCallBack);
-  });
-  return { allAsyncActions, recentAsyncActions };
-}
-
-export { useAsyncAction };

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

@@ -1,122 +0,0 @@
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
-import { IPortalAsyncAction, IPortalMessage } from '@ibiz-template/core';
-import dayjs from 'dayjs';
-import { isNil, isNumber } from 'lodash-es';
-import { computed, onUnmounted, ref } from 'vue';
-
-/**
- * 格式化数据
- * @author lxm
- * @date 2023-11-14 09:02:49
- * @param {IPortalAsyncAction} data
- * @return {*}  {IPortalAsyncAction}
- */
-function formatAsyncAction(data: IPortalAsyncAction): IPortalAsyncAction {
-  // 处理时间日期为毫秒值时，转换成字符串。
-  const dateFields = [
-    'begintime',
-    'endtime',
-    'createdate',
-    'updatedate',
-  ] as const;
-  dateFields.forEach(key => {
-    if (isNumber(data[key])) {
-      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) {
-      // 不是对象类型就是字符串。
-    }
-  }
-
-  if (!isNil(data.completionrate)) {
-    const num = Number(data.completionrate);
-    if (Number.isNaN(num)) {
-      data.completionrate = undefined;
-    } else {
-      data.completionrate = num;
-    }
-  }
-
-  return data;
-}
-
-/**
- * 使用异步操作消息
- * @author lxm
- * @date 2023-11-14 03:17:28
- * @export
- * @return {*}
- */
-export function useAsyncAction() {
-  /** 所有消息数据 */
-  const allAsyncActions = ref<IPortalAsyncAction[]>([]);
-  /** 显示的长度 */
-  const showLength = ref(0);
-
-  /** 显示的消息数据 */
-  const recentAsyncActions = computed(() => {
-    return allAsyncActions.value.filter(
-      (_item, index) => index < showLength.value,
-    );
-  });
-
-  const load = async () => {
-    const res = await ibiz.asyncAction.fetch();
-    res.data.forEach(formatAsyncAction);
-    allAsyncActions.value = res.data;
-  };
-
-  /**
-   * 异步消息变更回调处理
-   * @author lxm
-   * @date 2023-11-14 03:53:08
-   */
-  const asyncActionCallBack = (msg: IPortalMessage) => {
-    if (!msg.data || msg.subtype !== 'ASYNCACTION') {
-      return;
-    }
-    console.log('原始数据', msg);
-
-    const asyncAction = formatAsyncAction(msg.data as IPortalAsyncAction);
-
-    console.log('格式化后数据', asyncAction);
-
-    const findIndex = allAsyncActions.value.findIndex(
-      item => item.asyncacitonid === asyncAction.asyncacitonid,
-    );
-    if (findIndex === -1) {
-      // 不存在的数据补充到最开始，并显示长度加一
-      allAsyncActions.value.unshift(asyncAction);
-      showLength.value += 1;
-    } else {
-      const isShow = findIndex >= showLength.value;
-      // 找的到但是不在显示列表里,移到开头，并增加长度
-      if (isShow) {
-        allAsyncActions.value.splice(findIndex, 1);
-        allAsyncActions.value.unshift(asyncAction);
-        showLength.value += 1;
-      } else {
-        allAsyncActions.value.splice(findIndex, 1, asyncAction);
-      }
-    }
-  };
-
-  // *初始化操作
-  load();
-
-  // 监听异步操作消息变更
-  ibiz.mc.command.asyncAction.on(asyncActionCallBack);
-  // 销毁时删除监听
-  onUnmounted(() => {
-    ibiz.mc.command.asyncAction.off(asyncActionCallBack);
-  });
-
-  return { allAsyncActions, recentAsyncActions };
-}