@ibiz-template/runtime 0.1.12 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.12",
+    "@ibiz-template/core": "^0.1.13",
     "@ibiz/model-core": "^0.0.15",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -37,6 +37,7 @@
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.9",
     "echarts": "^5.4.3",
+    "handlebars": "^4.7.8",
     "lodash-es": "^4.17.21",
     "path-browserify": "^1.0.1",
     "qs": "^6.11.2",
@@ -49,11 +50,12 @@
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
+    "handlebars": "^4.7.8",
     "lodash-es": "^4.17.21",
     "path-browserify": "^1.0.1",
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "980e348c7fa465d0a62e655991c1bb816fca100a"
+  "gitHead": "609d58f98989f485823ff7be7ecedf4956d7fad2"
 }

package/src/controller/common/editor/editor.controller.ts

@@ -110,7 +110,7 @@ export class EditorController<T extends IEditor = IEditor>
     }
     if (this.model.editorParams) {
       Object.keys(this.model.editorParams).forEach(key => {
-        this.editorParams[key.toLowerCase()] = this.model.editorParams![key];
+        this.editorParams[key] = this.model.editorParams![key];
       });
     }
   }
@@ -126,21 +126,18 @@ export class EditorController<T extends IEditor = IEditor>
     data: IData,
     context: IContext,
     params: IParams,
-  ): { context: IContext; params: IParams } {
+  ): { context: IData; params: IParams } {
     const { navigateContexts, navigateParams } = this
       .model as INavigateParamContainer;
     let selfContext = {};
     if (navigateContexts && data) {
       selfContext = convertNavData(navigateContexts!, context, params, data);
     }
-    const _context = Object.assign(context.clone(), selfContext);
-
     let selfParams = {};
     if (navigateParams && data) {
       selfParams = convertNavData(navigateParams!, context, params, data);
     }
-    const _params: IParams = { ...params, ...selfParams };
-    return { context: _context, params: _params };
+    return { context: selfContext, params: selfParams };
   }
 
   /**

package/src/controller/control/chart/chart.controller.ts

@@ -45,7 +45,7 @@ export class ChartController
     this.service = new ChartService(this.model);
     await this.service.init(this.context);
     this.generator = new ChartOptionsGenerator(this.model);
-    await this.generator.loadCodeList(this.context, this.params);
+    await this.generator.init(this.context, this.params);
 
     // 监听resize调整图表大小
     window.addEventListener('resize', this.resizeChart);

package/src/controller/control/chart/generator/base-series-generator.ts

@@ -147,9 +147,11 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
     if (!model.valueField) {
       throw new RuntimeModelError(model, '缺少值属性配置');
     }
-    this.catalogField = model.catalogField!.toLowerCase();
-    this.valueField = model.valueField!.toLowerCase();
-    this.groupField = model.seriesField?.toLowerCase();
+    this.catalogField = chartGenerator.getFieldKey(model.catalogField);
+    this.valueField = chartGenerator.getFieldKey(model.valueField);
+    this.groupField = model.seriesField
+      ? chartGenerator.getFieldKey(model.seriesField)
+      : undefined;
 
     const { chartXAxisId, chartYAxisId } = (chartSeriesEncode ||
       {}) as IChartSeriesCSCartesian2DEncode;

package/src/controller/control/chart/generator/chart-options-generator.ts

@@ -6,6 +6,7 @@ import type {
   ECElementEvent,
 } from 'echarts';
 import {
+  IAppDataEntity,
   IChartXAxis,
   IChartYAxis,
   IDEChart,
@@ -54,6 +55,14 @@ export function parseUserParams(userParams: Record<string, string>): IData {
 }
 
 export class ChartOptionsGenerator {
+  /**
+   * 实体模型
+   * @author lxm
+   * @date 2023-08-29 06:39:01
+   * @type {IAppDataEntity}
+   */
+  entity!: IAppDataEntity;
+
   /**
    * 根据模型配置算出来的静态echarts配置
    * @author lxm
@@ -106,7 +115,6 @@ export class ChartOptionsGenerator {
   codeListMap: Map<string, Readonly<CodeListItem[]>> = new Map();
 
   constructor(private model: IDEChart) {
-    this.initSeriesGenerators();
     const {
       dechartTitle,
       dechartLegend,
@@ -256,6 +264,32 @@ export class ChartOptionsGenerator {
     return AxisOption;
   }
 
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2023-08-29 06:34:04
+   * @param {IContext} context
+   * @param {IParams} params
+   * @return {*}  {Promise<void>}
+   */
+  async init(context: IContext, params: IParams): Promise<void> {
+    await this.loadCodeList(context, params);
+    this.entity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId!);
+    this.initSeriesGenerators();
+  }
+
+  /**
+   * 找到实体属性的codeName小写
+   * @author lxm
+   * @date 2023-08-29 06:42:06
+   * @param {string} fieldName 属性的name
+   * @return {*}  {string}
+   */
+  getFieldKey(fieldName: string): string {
+    const find = this.entity.appDEFields!.find(item => item.name === fieldName);
+    return find ? find.codeName!.toLowerCase() : fieldName.toLowerCase();
+  }
+
   /**
    * 加载代码表，
    * - 如果已经加载过会清空缓存重新加载

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -83,9 +83,7 @@ export class EditFormController
       await this.endLoading();
     }
 
-    // !getDraft的时候不替换，进行合并，空值不覆盖
-    mergeInLeft(this.data, res.data);
-
+    this.state.data = res.data;
     // 处理后台导致的新建默认值丢失
     mergeDefaultInLeft(this.data, params);
 

package/src/controller/control/grid/grid/grid.controller.ts

@@ -3,6 +3,7 @@ import {
   awaitTimeout,
   debounceAndAsyncMerge,
   HttpResponse,
+  recursiveIterate,
   RuntimeError,
   RuntimeModelError,
 } from '@ibiz-template/core';
@@ -186,6 +187,7 @@ export class GridController
 
     this.service = new GridService(this.model);
     await this.service.init(this.context);
+    this.initColumnStates();
     await this.initGridColumns();
 
     // !数据变更通知防抖，且合并参数,如果有同一批触发不同行的值变更则该方法需要重写
@@ -528,13 +530,6 @@ export class GridController
     // 初始化表格列控制器
     const controller = await provider.createController(column, this);
     this.columns[column.codeName!] = controller as GridColumnController;
-    if (column.columnType !== 'GROUPGRIDCOLUMN') {
-      this.state.columnStates.push({
-        key: column.codeName!,
-        caption: column.caption!,
-        hidden: !!column.hideDefault,
-      });
-    }
     // 分类存放控制器
     if (column.columnType === 'DEFGRIDCOLUMN') {
       this.fieldColumns[column.codeName!] =
@@ -556,6 +551,29 @@ export class GridController
     }
   }
 
+  /**
+   * 初始化表格列状态
+   * @author lxm
+   * @date 2023-08-28 02:53:12
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected initColumnStates(): void {
+    recursiveIterate(
+      this.model,
+      (column: IDEGridColumn) => {
+        if (column.columnType !== 'GROUPGRIDCOLUMN') {
+          this.state.columnStates.push({
+            key: column.codeName!,
+            caption: column.caption!,
+            hidden: !!column.hideDefault,
+          });
+        }
+      },
+      { childrenFields: ['degridColumns'] },
+    );
+  }
+
   /**
    * 初始化表格属性列，操作列，编辑项控制器
    *

package/src/global/global-util/global-util.ts

@@ -1,5 +1,5 @@
 import { IExportExcelUtil } from '../../interface';
-import { TextUtil, LayoutPanelUtil } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil } from '../../utils';
 
 /**
  * 全局工具方法或对象
@@ -26,6 +26,14 @@ export class GlobalUtil {
    */
   readonly text = new TextUtil();
 
+  /**
+   * handlebars 工具
+   *
+   * @author chitanda
+   * @date 2023-08-28 23:08:59
+   */
+  readonly hbs = new HandlebarsUtil();
+
   /**
    * 获取导出Excel工具类对象
    * @author lxm

package/src/hub/config/app-view-config-service.ts

@@ -24,6 +24,7 @@ export class AppViewConfigService implements IAppViewConfigService {
         id: model.id!,
         codeName: model.codeName!,
         openMode: model.openMode!,
+        viewType: model.viewType!,
         width: model.width,
         height: model.height,
         appDataEntityId: model.appDataEntityId,

package/src/interface/common/i-app-view-config-service/i-app-view-config-service.ts

@@ -18,6 +18,10 @@ export interface IViewConfig {
    * 打开方式
    */
   openMode: string;
+  /**
+   * 视图类型
+   */
+  viewType: string;
   /**
    * 宽度
    */

package/src/service/service/entity/method/method.ts

@@ -121,20 +121,16 @@ export abstract class Method {
       let res: HttpResponse | null = null;
       switch (requestMethod) {
         case 'POST':
-          res = await this.app.net.post(`${path}/${methodName}`, data, params);
+          res = await this.app.net.post(`${path}/${methodName}`, data);
           break;
         case 'GET':
-          res = await this.app.net.get(`${path}/${methodName}`, data, params);
+          res = await this.app.net.get(`${path}/${methodName}`, params);
           break;
         case 'PUT':
-          res = await this.app.net.put(`${path}/${methodName}`, data, params);
+          res = await this.app.net.put(`${path}/${methodName}`, data);
           break;
         case 'DELETE':
-          res = await this.app.net.delete(
-            `${path}/${methodName}`,
-            data,
-            params,
-          );
+          res = await this.app.net.delete(`${path}/${methodName}`, params);
           break;
         default:
           if (requestMethod) {

package/src/service/utils/index.ts

@@ -4,5 +4,4 @@ export { DEDQCondUtil } from './de-dq-cond-util/de-dq-cond-util';
 export { DynamicCodeListCache } from './dynamic-code-list/dynamic-code-list';
 export { DECache } from './de-cache/de-cache';
 export { getMatchResPath, calcResPath } from './res-path/res-path';
-export { calcRouteContext } from './route-context/route-context';
 export { SearchFilter } from './search-filter/search-filter';

package/src/ui-action/provider/backend-ui-action-provider.ts

@@ -33,7 +33,6 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       data,
       params,
     );
-    const tempParams = { ...params, ...resultParams };
 
     // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
     const frontPSAppView = action.frontAppViewId;
@@ -71,7 +70,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       methodName,
       resultContext,
       isMultiData ? _data : _data[0],
-      tempParams,
+      resultParams,
     );
 
     // 适配界面行为成功提示信息
@@ -81,7 +80,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
     Object.assign(actionResult, {
       data: isArray(res.data) ? res.data : [res.data],
       nextContext: resultContext,
-      nextParams: tempParams,
+      nextParams: resultParams,
     });
 
     return actionResult;

package/src/utils/handlebars/handlebars.ts

@@ -0,0 +1,70 @@
+/**
+ * handlebars 渲染工具类
+ *
+ * @author chitanda
+ * @date 2023-08-28 17:08:13
+ * @export
+ * @class HandlebarsUtil
+ */
+export class HandlebarsUtil {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  protected hsb: any;
+
+  /**
+   * handlebars 是否已经初始化
+   *
+   * @author chitanda
+   * @date 2023-08-28 18:08:01
+   * @readonly
+   * @type {boolean}
+   */
+  get isInit(): boolean {
+    return !!this.hsb;
+  }
+
+  /**
+   * 异步加载，初始化 handlebars
+   *
+   * @author chitanda
+   * @date 2023-08-28 17:08:24
+   * @return {*}  {Promise<void>}
+   */
+  async init(): Promise<void> {
+    this.hsb = await import('handlebars');
+  }
+
+  /**
+   * 异步绘制模板，返回渲染后的字符串
+   *
+   * @author chitanda
+   * @date 2023-08-28 18:08:10
+   * @param {string} template
+   * @param {IData} data
+   * @return {*}  {Promise<string>}
+   */
+  async render(template: string, data: IData): Promise<string> {
+    if (!this.hsb) {
+      await this.init();
+    }
+    const tmp = this.hsb.compile(template);
+    return tmp(data);
+  }
+
+  /**
+   * 同步绘制模板，返回渲染后的字符串
+   *
+   * @description 需要自己保证 handlebars 已经加载
+   * @author chitanda
+   * @date 2023-08-28 18:08:14
+   * @param {string} template
+   * @param {IData} data
+   * @return {*}  {string}
+   */
+  syncRender(template: string, data: IData): string {
+    if (!this.hsb) {
+      throw new Error('handlebars not init');
+    }
+    const tmp = this.hsb.compile(template);
+    return tmp(data);
+  }
+}

package/src/utils/index.ts

@@ -1,3 +1,4 @@
+export { HandlebarsUtil } from './handlebars/handlebars';
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
 export {

package/src/utils/text-util/text-util.ts

@@ -19,4 +19,16 @@ export class TextUtil {
   format(value: string, _code: string): string {
     return value;
   }
+
+  /**
+   * 拷贝文本
+   *
+   * @author zhanghengfeng
+   * @date 2023-08-28 14:08:57
+   * @param {string} value
+   * @return {*}  {Promise<void>}
+   */
+  async copy(value: string): Promise<void> {
+    return navigator.clipboard.writeText(value);
+  }
 }

package/out/service/utils/route-context/route-context.d.ts

@@ -1,20 +0,0 @@
-import { IAppView } from '@ibiz/model-core';
-/**
- * 计算资源上下文时，需要排除自身实体codeName的视图（导航类视图和多数据视图）
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-02-20 15:45:46
- */
-export declare const excludeViewTypes: string[];
-/**
- * 计算放置到路径中的资源上下文参数
- *
- * @author chitanda
- * @date 2023-01-10 14:01:51
- * @export
- * @param {IParams} context
- * @param {ServicePathItem[][]} pathItems
- * @return {*}  {Record<string, unknown>}
- */
-export declare function calcRouteContext(_appView?: IAppView): Record<string, unknown>;
-//# sourceMappingURL=route-context.d.ts.map

package/out/service/utils/route-context/route-context.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"route-context.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/route-context/route-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,EAYpC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAG9B,QAAQ,CAAC,EAAE,QAAQ,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqCzB"}

package/out/service/utils/route-context/route-context.js

@@ -1,71 +0,0 @@
-import { ViewType } from '../../../constant';
-/**
- * 计算资源上下文时，需要排除自身实体codeName的视图（导航类视图和多数据视图）
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-02-20 15:45:46
- */
-export const excludeViewTypes = [
-    ViewType.DE_GRID_VIEW,
-    ViewType.DE_GRID_EXP_VIEW,
-    ViewType.DE_LIST_VIEW,
-    ViewType.DE_LIST_EXP_VIEW,
-    ViewType.DE_DATA_VIEW,
-    ViewType.DE_DATAVIEW_EXP_VIEW,
-    ViewType.DE_CALENDAR_VIEW,
-    ViewType.DE_CALENDAR_EXP_VIEW,
-    ViewType.DE_CHART_VIEW,
-    ViewType.DE_CHART_EXP_VIEW,
-    ViewType.DE_KANBAN_VIEW,
-];
-/**
- * 计算放置到路径中的资源上下文参数
- *
- * @author chitanda
- * @date 2023-01-10 14:01:51
- * @export
- * @param {IParams} context
- * @param {ServicePathItem[][]} pathItems
- * @return {*}  {Record<string, unknown>}
- */
-export function calcRouteContext(
-// context: IParams,
-// pathItems: ServicePathItem[][],
-_appView) {
-    let paths = [];
-    // pathItems.forEach(items => {
-    //   const values: string[][] = [];
-    //   for (let i = 0; i < items.length; i++) {
-    //     const arr: string[] = [];
-    //     const item = items[i];
-    //     if (
-    //       appView &&
-    //       appView.viewType &&
-    //       excludeViewTypes.includes(appView.viewType)
-    //     ) {
-    //       // 排除导航类视图和多数据视图自身
-    //       const deName = appView.getPSAppDataEntity()?.codeName.toLowerCase();
-    //       if (deName === item.name) {
-    //         return;
-    //       }
-    //     }
-    //     const val = context[item.lower];
-    //     if (val) {
-    //       arr.push(item.lower);
-    //       arr.push(val);
-    //       values.push(arr);
-    //     }
-    //   }
-    //   paths.push(values);
-    // });
-    paths = paths.sort((a, b) => b.length - a.length);
-    const [pathArr] = paths;
-    if (pathArr) {
-        const obj = {};
-        pathArr.forEach(([key, val]) => {
-            obj[key] = val;
-        });
-        return obj;
-    }
-    return {};
-}

package/src/service/utils/route-context/route-context.ts

@@ -1,75 +0,0 @@
-import { IAppView } from '@ibiz/model-core';
-import { ViewType } from '../../../constant';
-
-/**
- * 计算资源上下文时，需要排除自身实体codeName的视图（导航类视图和多数据视图）
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-02-20 15:45:46
- */
-export const excludeViewTypes: string[] = [
-  ViewType.DE_GRID_VIEW,
-  ViewType.DE_GRID_EXP_VIEW,
-  ViewType.DE_LIST_VIEW,
-  ViewType.DE_LIST_EXP_VIEW,
-  ViewType.DE_DATA_VIEW,
-  ViewType.DE_DATAVIEW_EXP_VIEW,
-  ViewType.DE_CALENDAR_VIEW,
-  ViewType.DE_CALENDAR_EXP_VIEW,
-  ViewType.DE_CHART_VIEW,
-  ViewType.DE_CHART_EXP_VIEW,
-  ViewType.DE_KANBAN_VIEW,
-];
-
-/**
- * 计算放置到路径中的资源上下文参数
- *
- * @author chitanda
- * @date 2023-01-10 14:01:51
- * @export
- * @param {IParams} context
- * @param {ServicePathItem[][]} pathItems
- * @return {*}  {Record<string, unknown>}
- */
-export function calcRouteContext(
-  // context: IParams,
-  // pathItems: ServicePathItem[][],
-  _appView?: IAppView,
-): Record<string, unknown> {
-  let paths: string[][][] = [];
-  // pathItems.forEach(items => {
-  //   const values: string[][] = [];
-  //   for (let i = 0; i < items.length; i++) {
-  //     const arr: string[] = [];
-  //     const item = items[i];
-  //     if (
-  //       appView &&
-  //       appView.viewType &&
-  //       excludeViewTypes.includes(appView.viewType)
-  //     ) {
-  //       // 排除导航类视图和多数据视图自身
-  //       const deName = appView.getPSAppDataEntity()?.codeName.toLowerCase();
-  //       if (deName === item.name) {
-  //         return;
-  //       }
-  //     }
-  //     const val = context[item.lower];
-  //     if (val) {
-  //       arr.push(item.lower);
-  //       arr.push(val);
-  //       values.push(arr);
-  //     }
-  //   }
-  //   paths.push(values);
-  // });
-  paths = paths.sort((a, b) => b.length - a.length);
-  const [pathArr] = paths;
-  if (pathArr) {
-    const obj: Record<string, unknown> = {};
-    pathArr.forEach(([key, val]) => {
-      obj[key] = val;
-    });
-    return obj;
-  }
-  return {};
-}