@ibiz-template/vue3-util 0.0.3-beta.6 → 0.0.4-beta.1

package/src/util/route/route.ts

@@ -1,9 +1,8 @@
-import { isNilOrEmpty, notNilEmpty } from 'qx-util';
-import { IBizContext, RuntimeError } from '@ibiz-template/core';
-import { IPSApplication, IPSAppView, IPSSubAppRef } from '@ibiz-template/model';
+import { notNilEmpty } from 'qx-util';
+import { RuntimeError } from '@ibiz-template/core';
+import { IApplication, IAppView } from '@ibiz/model-core';
 import qs from 'qs';
 import { RouteLocationNormalizedLoaded as Route } from 'vue-router';
-import { calcRouteContext } from '@ibiz-template/runtime';
 import { IRoutePath, IRoutePathNode, IRouteViewData } from '../../interface';
 
 /**
@@ -32,16 +31,16 @@ export function getOwnRouteContext(context: IContext): IParams {
  * @author lxm
  * @date 2022-08-17 21:08:00
  * @export
- * @param {IPSAppView} appView 视图模型
+ * @param {IAppView} appView 视图模型
  * @param {Route} route 路由对象
- * @param {(IBizContext | undefined)} [context] 上下文对象
+ * @param {(IContext | undefined)} [context] 上下文对象
  * @param {(IParams | undefined)} [_params] 视图参数
  * @returns {*}  {string}
  */
 export function generateRoutePath(
-  appView: IPSAppView,
+  appView: IAppView,
   route: Route,
-  context: IBizContext,
+  context: IContext,
   params?: IParams | undefined,
 ): { path: string } {
   const routePath = route2routePath(route);
@@ -66,7 +65,7 @@ export function generateRoutePath(
   }
 
   // 重定向视图跳转的一级首页路由
-  if (routePath.pathNodes[0]?.viewName === 'appredirectview') {
+  if (route.fullPath.startsWith('/appredirectview')) {
     if (params?.srfindexname) {
       routePath.pathNodes[0].viewName = params.srfindexname;
       delete params.srfindexname;
@@ -77,33 +76,33 @@ export function generateRoutePath(
 
   // 计算目标视图path路径
   routePath.pathNodes.push({
-    viewName: appView.codeName.toLowerCase(),
+    viewName: appView.codeName!.toLowerCase(),
     context: getOwnRouteContext(context),
     params,
   });
 
   // 计算二级视图的资源路径加到index后面
-  const codeName = appView.getPSAppDataEntity()?.codeName;
-  if (level === 2 && codeName) {
-    const app = ibiz.hub.getApp(appView.getPSModelService().app);
-    const paths = app.resourcePathUtil.calcPaths(codeName);
-    const resContext = calcRouteContext(context, paths);
-    if (!isNilOrEmpty(resContext)) {
-      // 资源路径不为空,二级视图的上下文删掉多余的资源上下文
-      routePath.pathNodes[0].context = resContext;
-      Object.keys(resContext).forEach(key => {
-        const currentNode = routePath.pathNodes[level - 1];
-        if (
-          currentNode.context &&
-          Object.prototype.hasOwnProperty.call(currentNode.context, key)
-        ) {
-          delete currentNode.context[key];
-        }
-      });
-    } else {
-      routePath.pathNodes[0].context = undefined;
-    }
-  }
+  // const codeName = appView.getPSAppDataEntity()?.codeName;
+  // if (level === 2 && codeName) {
+  //   const app = ibiz.hub.getApp(appView.getPSModelService().app);
+  //   const paths = app.resourcePathUtil.calcPaths(codeName);
+  //   const resContext = calcRouteContext(context, paths);
+  //   if (!isNilOrEmpty(resContext)) {
+  //     // 资源路径不为空,二级视图的上下文删掉多余的资源上下文
+  //     routePath.pathNodes[0].context = resContext;
+  //     Object.keys(resContext).forEach(key => {
+  //       const currentNode = routePath.pathNodes[level - 1];
+  //       if (
+  //         currentNode.context &&
+  //         Object.prototype.hasOwnProperty.call(currentNode.context, key)
+  //       ) {
+  //         delete currentNode.context[key];
+  //       }
+  //     });
+  //   } else {
+  //     routePath.pathNodes[0].context = undefined;
+  //   }
+  // }
 
   // 视图参数通过query传递
 
@@ -114,64 +113,66 @@ export function generateRoutePath(
  * 获取视图模型的codeName(小写)
  *
  * @export
- * @param {IPSAppView} model
+ * @param {IAppView} model
  * @returns {*}
  */
-export function getViewName(model: IPSAppView) {
-  const viewName = model.isFill
-    ? model.codeName
-    : (model.refM.resource || '') + model.refM.view;
-  return viewName.toLowerCase();
+export function getViewName(model: IAppView) {
+  return model.codeName!.toLowerCase();
 }
 
 /**
  * 在单个应用里
  * 通过视图的codeName找到视图模型
  *
- * @param {(IPSApplication | IPSSubAppRef)} appModel 主应用或子应用
+ * @param {(IApplication | ISubAppRef)} appModel 主应用或子应用
  * @param {string} viewCodeName 视图名称小写
  * @returns {*}
  */
 export function findViewByName(
-  appModel: IPSApplication | IPSSubAppRef,
-  viewCodeName: string,
-) {
-  return appModel.getAllPSAppViews()?.find((model: IPSAppView) => {
-    return getViewName(model) === viewCodeName;
-  });
+  _appModel: IApplication,
+  _viewCodeName: string,
+): undefined {
+  // return appModel.getAllPSAppViews()?.find((model: IAppView) => {
+  //   return getViewName(model) === viewCodeName;
+  // });
+  return undefined;
 }
 
 /**
  * 从子应用和主应用里
  * 通过视图的codeName找视图模型
  *
- * @param {IPSApplication} appModel 主应用
+ * @param {IApplication} appModel 主应用
  * @param {string} viewCodeName 视图名称小写
  * @returns {*}
  */
-export function findView(appModel: IPSApplication, viewCodeName: string) {
-  let viewModel: IPSAppView | null | undefined;
-  viewCodeName = viewCodeName.toLowerCase();
-  // index找默认首页视图，其他匹配codeName
-  if (viewCodeName === 'index') {
-    viewModel = appModel.getDefaultPSAppIndexView();
-  } else {
-    // 先查找子应用，找到则不继续找了,优先从最后面的子应用找起
-    if (appModel.getAllPSSubAppRefs()?.length) {
-      appModel
-        .getAllPSSubAppRefs()!
-        .reverse()
-        .find(sub => {
-          viewModel = findViewByName(sub, viewCodeName);
-          return !!viewModel;
-        });
-    }
-    // 子应用里没有就在主应用里找。
-    if (!viewModel) {
-      viewModel = findViewByName(appModel, viewCodeName);
-    }
-  }
-  return viewModel;
+export function findView(
+  _appModel: IApplication,
+  _viewCodeName: string,
+): undefined {
+  // let viewModel: IAppView | null | undefined;
+  // viewCodeName = viewCodeName.toLowerCase();
+  // // index找默认首页视图，其他匹配codeName
+  // if (viewCodeName === 'index') {
+  //   viewModel = appModel.getDefaultPSAppIndexView();
+  // } else {
+  //   // 先查找子应用，找到则不继续找了,优先从最后面的子应用找起
+  //   if (appModel.getAllPSSubAppRefs()?.length) {
+  //     appModel
+  //       .getAllPSSubAppRefs()!
+  //       .reverse()
+  //       .find(sub => {
+  //         viewModel = findViewByName(sub, viewCodeName);
+  //         return !!viewModel;
+  //       });
+  //   }
+  //   // 子应用里没有就在主应用里找。
+  //   if (!viewModel) {
+  //     viewModel = findViewByName(appModel, viewCodeName);
+  //   }
+  // }
+  // return viewModel;
+  return undefined;
 }
 
 /**
@@ -180,13 +181,13 @@ export function findView(appModel: IPSApplication, viewCodeName: string) {
  * @author lxm
  * @date 2022-08-17 22:08:51
  * @export
- * @param {IPSApplication} appModel 视图模型
+ * @param {IApplication} appModel 视图模型
  * @param {Route} route 路由对象
  * @param {number} level 层级
  * @returns {*}  {IRouteViewData}
  */
 export function parseRouteViewData(
-  appModel: IPSApplication,
+  appModel: IApplication,
   route: Route,
   level: number,
 ): IRouteViewData {
@@ -207,9 +208,6 @@ export function parseRouteViewData(
     throw new RuntimeError(`找不到视图${viewCodeName}`);
   }
 
-  const modelPath = viewModel.modelPath!;
-  const { viewType } = viewModel.refM;
-
   // !解析上下文参数,整合当前层级之前所有的上下文参数
   const context: IParams = {};
   // 合并appData里的应用上下文
@@ -234,8 +232,7 @@ export function parseRouteViewData(
   const { params, srfnav } = routePath.pathNodes[level - 1];
 
   return {
-    viewPath: modelPath,
-    viewType,
+    viewType: '',
     context,
     params,
     srfnav,

package/out/props/common.d.ts

@@ -1,19 +0,0 @@
-/**
- * 必填props类型
- *
- * @author lxm
- * @date 2022-11-01 19:11:47
- * @export
- * @class RequiredProp
- * @template T type的类型
- * @template D 默认值的类型
- * @template V 校验函数的类型
- */
-export declare class RequiredProp<T, D = undefined, V = undefined> {
-    readonly required = true;
-    type: T;
-    default?: D | undefined;
-    validator?: V | undefined;
-    constructor(type: T, _default?: D, validator?: V);
-}
-//# sourceMappingURL=common.d.ts.map

package/out/props/common.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/props/common.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,GAAG,SAAS;IACvD,QAAQ,CAAC,QAAQ,QAAQ;IAEzB,IAAI,EAAE,CAAC,CAAC;IAER,OAAO,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IAExB,SAAS,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;gBAEd,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC;CASjD"}

package/out/props/common.js

@@ -1,23 +0,0 @@
-/**
- * 必填props类型
- *
- * @author lxm
- * @date 2022-11-01 19:11:47
- * @export
- * @class RequiredProp
- * @template T type的类型
- * @template D 默认值的类型
- * @template V 校验函数的类型
- */
-export class RequiredProp {
-    constructor(type, _default, validator) {
-        this.required = true;
-        if (_default) {
-            this.default = _default;
-        }
-        if (validator) {
-            this.validator = validator;
-        }
-        this.type = type;
-    }
-}

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

@@ -1,55 +0,0 @@
-import { AutoCompleteEditorController } from '@ibiz-template/runtime';
-/**
- * 获取自动完成的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export declare function getAutoCompleteProps<C = AutoCompleteEditorController>(): {
-    value: StringConstructor;
-    controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
-    data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
-    disabled: {
-        type: BooleanConstructor;
-    };
-    readonly: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autoFocus: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-};
-/**
- * 获取表格自动完成的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export declare function getGridAutoCompleteProps<C = AutoCompleteEditorController>(): {
-    hasError: {
-        type: BooleanConstructor;
-    };
-    value: StringConstructor;
-    controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
-    data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
-    disabled: {
-        type: BooleanConstructor;
-    };
-    readonly: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autoFocus: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-};
-//# sourceMappingURL=autocomplete.d.ts.map

package/out/props/editor/autocomplete.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"autocomplete.d.ts","sourceRoot":"","sources":["../../../src/props/editor/autocomplete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAGtE;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,GAAG,4BAA4B;;;;;;;;;;;;;;;EAEpE;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,GAAG,4BAA4B;;;;;;;;;;;;;;;;;;EAExE"}

package/out/props/editor/autocomplete.js

@@ -1,25 +0,0 @@
-import { getEditorProps, getGridEditorCommonProps } from './common';
-/**
- * 获取自动完成的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export function getAutoCompleteProps() {
-    return Object.assign(Object.assign({}, getEditorProps()), { value: String });
-}
-/**
- * 获取表格自动完成的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export function getGridAutoCompleteProps() {
-    return Object.assign(Object.assign({}, getAutoCompleteProps()), getGridEditorCommonProps());
-}

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

@@ -1,55 +0,0 @@
-import { CheckBoxListEditorController } from '@ibiz-template/runtime';
-/**
- * 获取选项框列表的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export declare function getCheckboxListProps<C = CheckBoxListEditorController>(): {
-    value: (StringConstructor | NumberConstructor)[];
-    controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
-    data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
-    disabled: {
-        type: BooleanConstructor;
-    };
-    readonly: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autoFocus: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-};
-/**
- * 获取表格选项框列表的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export declare function getGridCheckboxListProps<C = CheckBoxListEditorController>(): {
-    hasError: {
-        type: BooleanConstructor;
-    };
-    value: (StringConstructor | NumberConstructor)[];
-    controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
-    data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
-    disabled: {
-        type: BooleanConstructor;
-    };
-    readonly: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autoFocus: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-};
-//# sourceMappingURL=check-box-list.d.ts.map

package/out/props/editor/check-box-list.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"check-box-list.d.ts","sourceRoot":"","sources":["../../../src/props/editor/check-box-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAGtE;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,GAAG,4BAA4B;;;;;;;;;;;;;;;EAEpE;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,GAAG,4BAA4B;;;;;;;;;;;;;;;;;;EAExE"}

package/out/props/editor/check-box-list.js

@@ -1,25 +0,0 @@
-import { getEditorProps, getGridEditorCommonProps } from './common';
-/**
- * 获取选项框列表的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export function getCheckboxListProps() {
-    return Object.assign(Object.assign({}, getEditorProps()), { value: [String, Number] });
-}
-/**
- * 获取表格选项框列表的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export function getGridCheckboxListProps() {
-    return Object.assign(Object.assign({}, getCheckboxListProps()), getGridEditorCommonProps());
-}

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

@@ -1,55 +0,0 @@
-import { CheckBoxEditorController } from '@ibiz-template/runtime';
-/**
- * 获取选项框的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export declare function getCheckboxProps<C = CheckBoxEditorController>(): {
-    value: (StringConstructor | NumberConstructor)[];
-    controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
-    data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
-    disabled: {
-        type: BooleanConstructor;
-    };
-    readonly: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autoFocus: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-};
-/**
- * 获取表格选项框列表的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export declare function getGridCheckboxProps<C = CheckBoxEditorController>(): {
-    hasError: {
-        type: BooleanConstructor;
-    };
-    value: (StringConstructor | NumberConstructor)[];
-    controller: import("..").RequiredProp<import("vue").PropType<C>, undefined, undefined>;
-    data: import("..").RequiredProp<import("vue").PropType<IData>, undefined, undefined>;
-    disabled: {
-        type: BooleanConstructor;
-    };
-    readonly: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autoFocus: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-};
-//# sourceMappingURL=check-box.d.ts.map

package/out/props/editor/check-box.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"check-box.d.ts","sourceRoot":"","sources":["../../../src/props/editor/check-box.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAGlE;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,wBAAwB;;;;;;;;;;;;;;;EAE5D;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,GAAG,wBAAwB;;;;;;;;;;;;;;;;;;EAEhE"}

package/out/props/editor/check-box.js

@@ -1,25 +0,0 @@
-import { getEditorProps, getGridEditorCommonProps } from './common';
-/**
- * 获取选项框的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export function getCheckboxProps() {
-    return Object.assign(Object.assign({}, getEditorProps()), { value: [String, Number] });
-}
-/**
- * 获取表格选项框列表的props
- *
- * @author lxm
- * @date 2022-11-01 19:11:12
- * @export
- * @template C
- * @returns {*}
- */
-export function getGridCheckboxProps() {
-    return Object.assign(Object.assign({}, getCheckboxProps()), getGridEditorCommonProps());
-}

package/out/props/editor/common.d.ts

@@ -1,71 +0,0 @@
-import { PropType } from 'vue';
-import { RequiredProp } from '../common';
-/**
- * 获取编辑器通用props
- *
- * @author lxm
- * @date 2022-11-01 19:11:04
- * @export
- * @template C
- * @returns {*}
- */
-export declare function getEditorProps<C>(): {
-    value: StringConstructor;
-    controller: RequiredProp<PropType<C>, undefined, undefined>;
-    data: RequiredProp<PropType<IData>, undefined, undefined>;
-    disabled: {
-        type: BooleanConstructor;
-    };
-    readonly: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autoFocus: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-};
-/**
- * 获取编辑器通用emits
- *
- * @author lxm
- * @date 2022-11-01 19:11:04
- * @export
- * @template V
- * @returns {*}
- */
-export declare function getEditorEmits<V>(): {
-    /** 值变更事件 */
-    change: (_value: V, _name?: string) => boolean;
-    /** 是否正在操作事件 */
-    operate: (_isOperating: boolean) => boolean;
-};
-/**
- * 获取表格列编辑器通用emits
- *
- * @author lxm
- * @date 2022-11-01 19:11:04
- * @export
- * @template V
- * @returns {*}
- */
-export declare function getGridEditorEmits<V>(): {
-    /** 值变更事件 */
-    change: (_value: V, _name?: string) => boolean;
-    /** 是否正在操作事件 */
-    rowSave: () => boolean;
-};
-/**
- * 表格编辑器通用props
- *
- * @author lxm
- * @date 2022-11-02 10:11:02
- * @export
- * @returns {*}
- */
-export declare function getGridEditorCommonProps(): {
-    hasError: {
-        type: BooleanConstructor;
-    };
-};
-//# sourceMappingURL=common.d.ts.map

package/out/props/editor/common.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/props/editor/common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,CAAC;;;;;;;;;;;;;;;EAiB/B;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,CAAC;IAE5B,YAAY;qBACK,CAAC,UAAU,MAAM;IAClC,eAAe;4BACS,OAAO;EAElC;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,CAAC;IAEhC,YAAY;qBACK,CAAC,UAAU,MAAM;IAClC,eAAe;;EAGlB;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB;;;;EAMvC"}