@ibiz-template/runtime 0.1.6 → 0.1.8

package/out/utils/open-redirect-view/open-redirect-view.d.ts

@@ -1,5 +1,5 @@
 import { IAppDERedirectView, IAppDataEntity, IAppRedirectView } from '@ibiz/model-core';
-import { IModalData } from '../../interface';
+import { IModalData, IOpenViewOptions } from '../../interface';
 /**
  * 打开重定向视图
  *
@@ -12,7 +12,7 @@ import { IModalData } from '../../interface';
  * @param {IData} [data={}]
  * @return {*}  {Promise<IModalData>}
  */
-export declare function openRedirectView(appView: IAppRedirectView, context: IContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+export declare function openRedirectView(appView: IAppRedirectView, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData>;
 /**
  * 本地打开工作流重定向视图
  *
@@ -24,7 +24,7 @@ export declare function openRedirectView(appView: IAppRedirectView, context: ICo
  * @param {IContext} context
  * @param {string} linkUrl
  */
-export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string): Promise<void>;
+export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string, opts?: IOpenViewOptions): Promise<void>;
 /**
  * 打开实体重定向视图
  *
@@ -37,7 +37,7 @@ export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: st
  * @param {IData[]} [data=[]]
  * @return {*}  {Promise<IModalData>}
  */
-export declare function openDERedirectView(appView: IAppDERedirectView, context: IContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+export declare function openDERedirectView(appView: IAppDERedirectView, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData>;
 /**
  * 计算重定向标识
  *

package/out/utils/open-redirect-view/open-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAmDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAyGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA0CjB"}
+{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAwGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA4CjB"}

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -16,8 +16,8 @@ import { calcDeCodeNameById, findFieldById } from '../../model';
  * @param {IData} [data={}]
  * @return {*}  {Promise<IModalData>}
  */
-export async function openRedirectView(appView, context, params = {}, data = []) {
-    return openDERedirectView(appView, context, params, data);
+export async function openRedirectView(appView, context, params = {}, opts = {}) {
+    return openDERedirectView(appView, context, params, opts);
 }
 /**
  * 本地打开工作流重定向视图
@@ -30,7 +30,7 @@ export async function openRedirectView(appView, context, params = {}, data = [])
  * @param {IContext} context
  * @param {string} linkUrl
  */
-export async function toLocalOpenWFRedirectView(context, linkUrl) {
+export async function toLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
     const i = linkUrl.lastIndexOf('?');
     const queryStr = decodeURIComponent(linkUrl.substring(i + 1, linkUrl.length));
     const params = qs.parse(queryStr, { delimiter: ';' });
@@ -65,7 +65,7 @@ export async function toLocalOpenWFRedirectView(context, linkUrl) {
         context.srfprocessinstanceid = params.srfprocessinstanceid;
         delete params.srfprocessinstanceid;
     }
-    await ibiz.commands.execute(OpenAppViewCommand.TAG, deRdView.id, context, params);
+    await ibiz.commands.execute(OpenAppViewCommand.TAG, deRdView.id, context, params, opts);
 }
 /**
  * 打开实体重定向视图
@@ -79,7 +79,8 @@ export async function toLocalOpenWFRedirectView(context, linkUrl) {
  * @param {IData[]} [data=[]]
  * @return {*}  {Promise<IModalData>}
  */
-export async function openDERedirectView(appView, context, params = {}, data = []) {
+export async function openDERedirectView(appView, context, params = {}, opts = {}) {
+    var _a;
     // 计算重定向视图上下文参数转换
     const navContext = appView.appViewNavContexts || [];
     const navContextData = convertNavData(navContext, context, params);
@@ -91,7 +92,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
     // 重定向视图对应应用实体
     const entityId = appView.appDataEntityId;
     const key = calcDeCodeNameById(entityId);
-    let curData = data[0] || {};
+    let curData = ((_a = opts.data) === null || _a === void 0 ? void 0 : _a[0]) || {};
     // 将数据主键转换到上下文当中
     context[key] = curData[key] || context[key] || params[key];
     // 实体重定向视图获取数据行为
@@ -125,7 +126,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
                     });
                 }
                 if (linkUrl.startsWith('appredirectview?')) {
-                    await toLocalOpenWFRedirectView(context, linkUrl);
+                    await toLocalOpenWFRedirectView(context, linkUrl, opts);
                     return { ok: true, data: [] };
                 }
                 return { ok: false, data: [] };
@@ -145,13 +146,14 @@ export async function openDERedirectView(appView, context, params = {}, data = [
     // 所有重定向引用视图
     const allRefViews = appView.redirectAppViewRefs;
     const refView = allRefViews === null || allRefViews === void 0 ? void 0 : allRefViews.find(view => {
+        const matchKey = view.name || view.id;
         // 特殊补充 wfRdTag 匹配，子流程应用特殊模式
-        return (view.name === deRdTag || view.name === rdTag || view.name === wfRdTag);
+        return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
     });
     if (refView) {
         const viewId = refView.refAppViewId;
         if (viewId) {
-            const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, viewId, context, params, { data: [curData] });
+            const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, viewId, context, params, Object.assign(Object.assign({}, opts), { data: [curData] }));
             if (result) {
                 return result;
             }
@@ -184,16 +186,6 @@ export async function openDERedirectView(appView, context, params = {}, data = [
  */
 export async function calcDERdTag(entity, rdView, params, data) {
     let rdTag = '';
-    const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
-    // 如果流程步骤存在，按照工作流优先
-    const srfWf = params.srfwf;
-    if (notNilEmpty(srfWf)) {
-        if (notNilEmpty(params.wf)) {
-            return `${defView}:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
-        }
-        return `${defView}:${srfWf.toUpperCase()}`;
-    }
-    let typeValue = '';
     // 重定向视图自定义类别属性
     const typeFieldId = rdView.typeAppDEFieldId;
     // 自定义重定向
@@ -201,15 +193,24 @@ export async function calcDERdTag(entity, rdView, params, data) {
         const { codeName } = findFieldById(entity, typeFieldId);
         const value = data[codeName.toLowerCase()];
         if (notNilEmpty(value)) {
-            typeValue = value;
+            return `${value}`;
         }
+        ibiz.log.warn(`重定向视图[${rdView.name}]自定义类别属性[${typeFieldId}]值为空`, data);
     }
-    if (isNilOrEmpty(typeValue)) {
-        // 从索引属性获取重定向视图类型
-        if (entity.indexTypeAppDEFieldId) {
-            const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
-            typeValue = data[codeName.toLowerCase()];
+    const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
+    // 如果流程步骤存在，按照工作流优先
+    const srfWf = params.srfwf;
+    if (notNilEmpty(srfWf)) {
+        if (notNilEmpty(params.wf)) {
+            return `${defView}:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
         }
+        return `${defView}:${srfWf.toUpperCase()}`;
+    }
+    let typeValue = '';
+    // 从索引属性获取重定向视图类型
+    if (entity.indexTypeAppDEFieldId) {
+        const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
+        typeValue = data[codeName.toLowerCase()];
     }
     if (isNilOrEmpty(typeValue)) {
         // 从多表单属性判断重定向视图类型
@@ -219,7 +220,7 @@ export async function calcDERdTag(entity, rdView, params, data) {
         }
     }
     if (notNilEmpty(typeValue)) {
-        rdTag = `${defView}:${typeValue.toUpperCase()}`;
+        rdTag = `${defView}:${typeValue.toString().toUpperCase()}`;
     }
     else {
         rdTag = `${defView}`;

package/out/utils/script/script-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAQtD,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAQ/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAQT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAS5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAoB7C;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
+{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAQtD,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAQT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAS5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAoB7C;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}

package/out/utils/script/script-function.js

@@ -13,7 +13,10 @@ export class ScriptFunction {
         this.options = options;
         const code = this.formatCode(scriptCode, options);
         this.calcArgKeys(argKeys, options);
-        this.scriptFn = new Function(...this.argKeys, code);
+        const fn = new Function(...this.argKeys, code);
+        this.scriptFn = function callBack(...args) {
+            return fn.apply({}, args);
+        };
     }
     /**
      * 格式化脚本

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.6",
+    "@ibiz-template/core": "^0.1.8",
     "@ibiz/model-core": "^0.0.14",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -53,5 +53,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "b140871c2a8700d063b3a6380f0eef5c02768822"
+  "gitHead": "cb6f466a8477cdcf184a8be03b8c26bd67324a70"
 }

package/src/command/app/open-app-view/open-app-view.ts

@@ -1,6 +1,6 @@
 import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { IAppRedirectView } from '@ibiz/model-core';
-import { IModalData, IViewConfig } from '../../../interface';
+import { IModalData, IOpenViewOptions, IViewConfig } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { openRedirectView } from '../../../utils';
 
@@ -34,7 +34,7 @@ export class OpenAppViewCommand {
     appViewId: string,
     context: IContext,
     params: IParams = {},
-    opts: IData = {},
+    opts: IOpenViewOptions = {},
   ): Promise<IModalData | void> {
     const appView = await ibiz.hub.config.view.get(appViewId!);
     if (!appView) {
@@ -54,7 +54,7 @@ export class OpenAppViewCommand {
         fullViewModel as IAppRedirectView,
         context,
         params,
-        opts.data,
+        opts,
       );
     }
     const { openMode = 'INDEXVIEWTAB' } = appView;
@@ -72,7 +72,7 @@ export class OpenAppViewCommand {
       case 'POPUPAPP':
         throw new ModelError(appView, '未支持的视图打开模式: POPUPAPP');
       case 'POPOVER':
-        return this.openPopover(appView, opts.event, context, params);
+        return this.openPopover(appView, opts.event!, context, params);
       case 'DRAWER_LEFT':
       case 'DRAWER_RIGHT':
       case 'DRAWER_TOP':
@@ -135,10 +135,13 @@ export class OpenAppViewCommand {
    */
   protected async openPopover(
     appView: IViewConfig,
-    event: MouseEvent,
+    event: MouseEvent | undefined,
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
+    if (!event) {
+      throw new RuntimeError('气泡打开缺少event');
+    }
     return ibiz.openView.popover(appView, event, context, params);
   }
 

package/src/constant/sys-uiaction-tag.ts

@@ -143,6 +143,14 @@ export enum SysUIActionTag {
    * 行编辑
    */
   'TOGGLE_ROW_EDIT' = 'ToggleRowEdit',
+  /**
+   * 树界面_刷新全部操作
+   */
+  'REFRESH_ALL' = 'RefreshAll',
+  /**
+   * 树界面_刷新父节点操作
+   */
+  'REFRESH_PARENT' = 'RefreshParent',
 
   // 非预置界面行为 Start
 

package/src/controller/common/base.controller.ts

@@ -200,7 +200,7 @@ export class BaseController<
   async destroyed(): Promise<void> {
     await this.onDestroyed();
     ibiz.log.debug(`${this.constructor.name}:${this.name} onDestroyed`);
-    this._evt.emit('onDestroyed', undefined);
+    await this._evt.emit('onDestroyed', undefined);
     this.evt.destroy();
   }
 

package/src/controller/common/control/md-control.controller.ts

@@ -60,16 +60,25 @@ export class MDControlController<
     this.state.groups = [];
   }
 
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    // 设置默认排序
+    this.setSort();
+  }
+
   /**
    * 设置排序
+   * 无参数时设置的是默认排序。
    *
    * @author lxm
    * @date 2022-09-28 13:09:44
    * @param {string} key 排序字段
    * @param {string} order 排序顺序
    */
-  setSort(key: string, order: 'asc' | 'desc'): void {
-    this.state.sortQuery = `${key},${order}`;
+  setSort(key?: string, order?: 'asc' | 'desc'): void {
+    if (key && order) {
+      this.state.sortQuery = `${key},${order}`;
+    }
   }
 
   /**
@@ -189,14 +198,20 @@ export class MDControlController<
     if (!data?.length) {
       throw new RuntimeError('未选中数据');
     }
-    const del = await ibiz.modal.confirm({
-      title: '数据删除',
-      desc: '确认删除数据？',
-    });
-    if (!del) {
-      return;
+
+    // 删除确认提示
+    if (args?.silent !== true) {
+      const del = await ibiz.confirm.error({
+        title: '数据删除',
+        desc: '确认删除数据？',
+      });
+      if (!del) {
+        return;
+      }
     }
+
     await this.startLoading();
+    let needRefresh = false;
     try {
       const deName = calcDeCodeNameById(this.model.appDataEntityId!);
       await Promise.allSettled(
@@ -207,17 +222,25 @@ export class MDControlController<
             tempContext[deName] = item.srfkey;
             // 删除后台的数据
             await this.service.remove(tempContext, params);
+            needRefresh = true;
           }
 
           this.afterRemove(data);
         }),
       );
-      ibiz.notification.success({
-        desc: `数据[${data
-          .map(item => item.srfmajortext)
-          .join('、')}]删除成功!`,
-      });
-      this.refresh();
+
+      if (args?.silent !== true) {
+        ibiz.notification.success({
+          desc: `数据[${data
+            .map(item => item.srfmajortext)
+            .join('、')}]删除成功!`,
+        });
+      }
+
+      // 刷新数据，补全这一页缺少的数据
+      if (needRefresh) {
+        this.refresh();
+      }
     } finally {
       await this.endLoading();
     }

package/src/controller/common/view/view.controller.ts

@@ -252,9 +252,12 @@ export class ViewController<
       this.scheduler.defaultParamsCb = (): IUILogicParams => {
         return this.getEventArgs();
       };
-      this.evt.onAll((_eventName, event) => {
-        this.scheduler!.triggerViewEvent(event);
-      });
+      if (this.scheduler.hasViewEventTrigger) {
+        // 监听视图事件触发视图事件触发器
+        this.evt.onAll((_eventName, event) => {
+          this.scheduler!.triggerViewEvent(event);
+        });
+      }
     }
 
     // 执行视图引擎的doCreated
@@ -380,5 +383,15 @@ export class ViewController<
         this.mountCounter.attend(this.layoutPanel!.model.name!);
       });
     }
+
+    if (this.scheduler?.hasControlEventTrigger) {
+      // 监听部件事件触发部件事件触发器
+      panel.evt.on('onControlEvent', event => {
+        this.scheduler!.triggerControlEvent(
+          event.triggerControlName,
+          event.triggerEvent,
+        );
+      });
+    }
   }
 }

package/src/controller/ctx/ctx.ts

@@ -48,7 +48,7 @@ export class CTX<V extends IViewController = IViewController> {
    * @date 2023-04-26 07:54:46
    * @protected
    */
-  readonly evt = new QXEvent<CTXEvent>();
+  readonly evt = new QXEvent<CTXEvent>(3000);
 
   /**
    * 当前视图控制器集合（包含自身视图控制器，部件控制器，和下一层级的视图的控制器）

package/src/engine/md-view.engine.ts

@@ -142,11 +142,11 @@ export class MDViewEngine extends ViewEngineBase {
       return null;
     }
     if (key === SysUIActionTag.EDIT || key === SysUIActionTag.VIEW) {
-      this.openData(args!);
+      await this.openData(args!);
       return null;
     }
     if (key === SysUIActionTag.NEW) {
-      this.newData(args!);
+      await this.newData(args!);
       return null;
     }
     if (key === SysUIActionTag.REMOVE) {
@@ -300,10 +300,19 @@ export class MDViewEngine extends ViewEngineBase {
     // 有搜索表单的整合相关参数
     if (this.searchForm) {
       const addParams = this.searchForm.getData()[0];
-      Object.assign(params, addParams);
+      const filteredParams = Object.entries(addParams).reduce(
+        (result: IData, [key, value]) => {
+          if (value !== null && value !== undefined && value !== '') {
+            result[key] = value;
+          }
+          return result;
+        },
+        {},
+      );
+      Object.assign(params, filteredParams);
     }
     // 有搜索栏的整合相关参数
-    if (this.searchBar) {
+    if (this.searchBar && this.searchBar.state.query) {
       const addParams = {
         query: this.searchBar.state.query,
       };

package/src/install.ts

@@ -1,7 +1,7 @@
 import { GlobalConfig } from './config/global-config';
 import { RegisterCenter } from './register/register-center';
 import { installCommand } from './command';
-import { AuthService } from './service';
+import { V7AuthService } from './service';
 import { AppHub } from './app-hub';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
@@ -26,7 +26,7 @@ export function install(): void {
   // 初始化全局配置
   ibiz.config = new GlobalConfig();
   // 挂载认证服务
-  ibiz.auth = new AuthService();
+  ibiz.auth = new V7AuthService();
   // 挂载引擎工厂
   ibiz.engine = new EngineFactory();
   // 安装默认指令

package/src/interface/common/i-open-view-options/i-open-view-options.ts

@@ -0,0 +1,40 @@
+/**
+ * 打开视图额外参数
+ * @author lxm
+ * @date 2023-08-14 11:46:55
+ * @export
+ * @interface IOpenViewOptions
+ */
+export interface IOpenViewOptions {
+  /**
+   * 打开方式
+   * @author lxm
+   * @date 2023-08-14 01:40:27
+   * @type {string}
+   */
+  openMode?: string;
+
+  /**
+   * 不等待路由打开
+   * @author lxm
+   * @date 2023-07-28 02:23:13
+   * @type {boolean}
+   */
+  noWaitRoute?: boolean;
+
+  /**
+   * 数据集合
+   * @author lxm
+   * @date 2023-08-14 01:40:14
+   * @type {IData[]}
+   */
+  data?: IData[];
+
+  /**
+   * 原生js事件
+   * @author lxm
+   * @date 2023-08-14 04:22:06
+   * @type {MouseEvent}
+   */
+  event?: MouseEvent;
+}

package/src/interface/common/index.ts

@@ -28,3 +28,4 @@ export type {
   IAppViewConfigService,
   IViewConfig,
 } from './i-app-view-config-service/i-app-view-config-service';
+export type { IOpenViewOptions } from './i-open-view-options/i-open-view-options';

package/src/interface/controller/common/i-icon/i-icon.ts

@@ -21,4 +21,12 @@ export interface IIcon {
    * @type {string}
    */
   imagePath?: string;
+
+  /**
+   * html字符串
+   * @author lxm
+   * @date 2023-08-15 02:14:26
+   * @type {string}
+   */
+  htmlStr?: string;
 }

package/src/interface/controller/controller/control/i-grid.controller.ts

@@ -24,7 +24,7 @@ export interface IGridController
   newRow(): Promise<void>;
 
   /**
-   * 保存
+   * 保存单条数据
    *
    * @author zk
    * @date 2023-07-31 02:07:52
@@ -33,13 +33,21 @@ export interface IGridController
   save(data: ControlVO): Promise<void>;
 
   /**
-   * 切换行编辑状态
+   * 保存表格所有数据
    *
    * @author zk
-   * @date 2023-07-31 02:07:26
+   * @date 2023-07-31 02:07:52
    * @memberof IGridController
    */
-  toggleRowEdit(row?: IData): void;
+  saveAll(): Promise<void>;
+
+  /**
+   * 切换表格的行编辑开启关闭状态
+   * @author lxm
+   * @date 2023-08-16 10:18:14
+   * @param {IData} [rowData] 行数据
+   */
+  toggleRowEdit(): void;
 
   /**
    * 数据导出

package/src/interface/controller/controller/control/i-md-control.controller.ts

@@ -20,7 +20,15 @@ export interface MDCtrlLoadParams extends IDataAbilityParams {
   isLoadMore?: boolean;
 }
 
-export interface MDCtrlRemoveParams extends IDataAbilityParams {}
+export interface MDCtrlRemoveParams extends IDataAbilityParams {
+  /**
+   * 是否静默删除
+   * @author lxm
+   * @date 2023-08-17 06:04:23
+   * @type {boolean}
+   */
+  silent?: boolean;
+}
 
 /**
  * 多数据部件控制器

package/src/interface/controller/controller/control/i-tree.controller.ts

@@ -44,4 +44,12 @@ export interface ITreeController
     nodeData: ITreeNodeData,
     event: MouseEvent,
   ): Promise<void>;
+
+  /**
+   * 刷新父节点数据
+   * @author lxm
+   * @date 2023-08-18 01:49:59
+   * @param {ITreeNodeData} parentNode
+   */
+  refreshParent(parentData: ITreeNodeData | IData): void;
 }

package/src/interface/controller/event/argument/index.ts

@@ -6,3 +6,4 @@ export { CloseViewEvent } from './close-view.event';
 export { UIActionEvent } from './uiaction.event';
 export { ControlTriggerEvent } from './control-trigger.event';
 export { NavViewChangeEvent } from './nav-view-change.event';
+export { RowEditChangeEvent } from './row-edit-change.event';

package/src/interface/controller/event/argument/row-edit-change.event.ts

@@ -0,0 +1,20 @@
+import { IGridRowState } from '../../state';
+import { EventBase } from './base.event';
+
+/**
+ * 行编辑切换事件
+ * @author lxm
+ * @date 2023-03-26 02:07:11
+ * @export
+ * @interface RowEditChangeEvent
+ * @extends {EventBase}
+ */
+export interface RowEditChangeEvent extends EventBase {
+  /**
+   * 行状态对象
+   * @author lxm
+   * @date 2023-08-17 06:58:15
+   * @type {IGridRowState}
+   */
+  row: IGridRowState;
+}

package/src/interface/controller/event/control/i-grid.event.ts

@@ -1,4 +1,5 @@
-import { EventBase } from '../..';
+import { PartialWithObject } from '@ibiz-template/core';
+import { EventBase, RowEditChangeEvent } from '../..';
 import { IMDControlEvent } from './i-md-control.event';
 
 /**
@@ -21,4 +22,16 @@ export interface IGridEvent extends IMDControlEvent {
     event: EventBase;
     emitArgs: { data: IData[] };
   };
+
+  /**
+   * 表格行编辑切换事件
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onRowEditChange: {
+    event: RowEditChangeEvent;
+    emitArgs: PartialWithObject<RowEditChangeEvent, EventBase>;
+  };
 }