@ibiz-template/runtime 0.0.3-beta.3 → 0.0.3-beta.4

package/src/controller/editor/autocomplete.ts

@@ -0,0 +1,138 @@
+import { IHttpResponse } from '@ibiz-template/core';
+import {
+  AutoCompleteEditorModel,
+  DefectModelError,
+} from '@ibiz-template/model';
+import { EditorController } from '.';
+import { DEACModeUtil } from '../utils';
+
+/**
+ * 自动完成编辑器控制器
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2022-08-25 10:57:58
+ */
+export class AutoCompleteEditorController extends EditorController<AutoCompleteEditorModel> {
+  /**
+   * 占位
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2022-08-25 14:33:14
+   */
+  public placeHolder = '请选择数据';
+
+  /**
+   *值项
+   */
+  public valueItem = '';
+
+  /**
+   * 主键属性名称
+   */
+  public keyName: string = '';
+
+  /**
+   * 主文本属性名称
+   */
+  public textName: string = '';
+
+  /**
+   * 实体codeName
+   */
+  public serviceName: string = '';
+
+  /**
+   * 数据集codeName
+   */
+  public interfaceName: string = '';
+
+  /**
+   * 自填模式sort排序
+   */
+  public sort: string | undefined = '';
+
+  protected async onInit(): Promise<void> {
+    super.onInit();
+    this.valueItem = this.model.valueItemName?.toLowerCase() || '';
+    this.keyName = this.model.appDataEntity?.keyName || '';
+    this.textName = this.model.appDataEntity?.textName || '';
+    this.getAcParams();
+    this.sort = this.getAcSort();
+  }
+
+  /**
+   * 获取Ac参数
+   */
+  public getAcParams() {
+    const appDe = this.model.source.getPSAppDataEntity?.();
+    const dataSet = this.model.source.getPSAppDEDataSet?.();
+    if (appDe && dataSet) {
+      this.serviceName = appDe.codeName;
+      this.interfaceName = dataSet.codeName;
+    }
+    if (this.model.deACMode) {
+      this.textName = this.model.deACMode.textFieldName || this.textName;
+      this.keyName = this.model.deACMode.valueFieldName || this.keyName;
+    }
+  }
+
+  /**
+   * 获取自填模式sort排序
+   */
+  public getAcSort() {
+    if (this.model.deACMode) {
+      const { sortField, sortDir } = this.model.deACMode;
+      if (sortField && sortDir) {
+        return `${sortField},${sortDir}`;
+      }
+    }
+    return undefined;
+  }
+
+  /**
+   * 加载实体数据集数据
+   *
+   * @param {string} query 模糊匹配字符串
+   * @param {IData} data 表单数据
+   * @returns {*}  {Promise<IHttpResponse<IData[]>>}
+   * @memberof PickerEditorController
+   */
+  public async getServiceData(
+    query: string,
+    data: IData,
+  ): Promise<IHttpResponse<IData[]>> {
+    const { context, params } = this.handlePublicParams(
+      data,
+      this.context,
+      this.params,
+    );
+    if (this.sort && !Object.is(this.sort, '')) {
+      Object.assign(params, { sort: this.sort });
+    }
+    Object.assign(params, { query, size: 1000 });
+    if (this.serviceName && this.interfaceName) {
+      const deService = await this.app.es.getService(this.serviceName);
+      const res = await deService.exec(this.interfaceName, context, params);
+      return res as IHttpResponse<IData[]>;
+    }
+    throw new DefectModelError(this.model.source, '请配置实体和实体数据集');
+  }
+
+  /**
+   * 计算回填数据
+   *
+   * @author lxm
+   * @date 2022-10-24 16:10:24
+   * @param {IData} data 选中数据
+   * @returns {*}  {Promise<Array<{ name: string; value: any }>>}
+   */
+  async calcFillDataItems(
+    data: IData,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ): Promise<Array<{ name: string; value: any }>> {
+    if (this.model.deACMode) {
+      return DEACModeUtil.calcFillDataItems(data, this.model.deACMode);
+    }
+    return [];
+  }
+}

package/src/controller/editor/check-box.ts

@@ -0,0 +1,11 @@
+import { CheckBoxModel } from '@ibiz-template/model';
+import { EditorController } from '.';
+
+/**
+ * 选项框编辑器控制器
+ *
+ * @export
+ * @class CheckBoxEditorController
+ * @extends {EditorController}
+ */
+export class CheckBoxEditorController extends EditorController<CheckBoxModel> {}

package/src/controller/editor/code-list-editor.ts

@@ -21,7 +21,11 @@ export class CodeListEditorController<
    * @Date: 2022-08-25 15:46:27
    */
   public async loadCodeList(data: IData): Promise<readonly CodeListItem[]> {
-    const { context, params } = this.handlePublicParams(data);
+    const { context, params } = this.handlePublicParams(
+      data,
+      this.context,
+      this.params,
+    );
     if (this.model.codeList) {
       let dataItems: readonly CodeListItem[] = [];
       const { codeName } = this.model.codeList;

package/src/controller/editor/editor.ts

@@ -126,30 +126,24 @@ export class EditorController<T extends EditorModel = EditorModel> {
    * @author: zhujiamin
    * @Date: 2022-08-25 15:44:14
    */
-  public handlePublicParams(data: IData) {
+  public handlePublicParams(
+    data: IData,
+    context: IBizContext,
+    params: IParams,
+  ) {
     const { navigateContexts, navigateParams } = this.model;
     let selfContext = {};
     if (navigateContexts && data) {
-      selfContext = convertNavData(
-        navigateContexts!,
-        this.context,
-        this.params,
-        data,
-      );
+      selfContext = convertNavData(navigateContexts!, context, params, data);
     }
-    const context = new IBizContext(selfContext, this.context);
+    const _context = new IBizContext(selfContext, context);
 
     let selfParams = {};
     if (navigateParams && data) {
-      selfParams = convertNavData(
-        navigateParams!,
-        this.context,
-        this.params,
-        data,
-      );
+      selfParams = convertNavData(navigateParams!, context, params, data);
     }
-    const params: IParams = { ...this.params, ...selfParams };
-    return { context, params };
+    const _params: IParams = { ...params, ...selfParams };
+    return { context: _context, params: _params };
   }
 
   // 字符串转number

package/src/controller/editor/index.ts

@@ -13,3 +13,7 @@ export { StepperEditorController } from './stepper';
 export { RateEditorController } from './rate';
 export { SliderEditorController } from './slider';
 export { SwitchEditorController } from './switch';
+export { ListBoxEditorController } from './list-box';
+export { ListBoxPickerEditorController } from './list-box-picker';
+export { AutoCompleteEditorController } from './autocomplete';
+export { CheckBoxEditorController } from './check-box';

package/src/controller/editor/list-box-picker.ts

@@ -0,0 +1,78 @@
+import { IHttpResponse } from '@ibiz-template/core';
+import {
+  DefectModelError,
+  ListBoxPickerEditorModel,
+} from '@ibiz-template/model';
+import { EditorController } from './editor';
+
+/**
+ * 列表框picker编辑器控制器
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2022-08-25 10:57:58
+ */
+export class ListBoxPickerEditorController extends EditorController<ListBoxPickerEditorModel> {
+  /**
+   * 主键属性名称
+   */
+  public keyName: string = '';
+
+  /**
+   * 主文本属性名称
+   */
+  public textName: string = '';
+
+  /**
+   * 实体codeName
+   */
+  public serviceName: string = '';
+
+  /**
+   * 数据集codeName
+   */
+  public interfaceName: string = '';
+
+  protected async onInit(): Promise<void> {
+    super.onInit();
+    if (this.model.source.editorType === 'LISTBOXPICKUP') {
+      this.keyName = this.model.appDataEntity?.keyName || '';
+      this.textName = this.model.appDataEntity?.textName || '';
+      this.getAcParams();
+    }
+  }
+
+  /**
+   * 获取Ac参数
+   */
+  public getAcParams() {
+    const appDe = this.model.source.getPSAppDataEntity();
+    const dataSet = this.model.source.getPSAppDEDataSet();
+    if (appDe && dataSet) {
+      this.serviceName = appDe.codeName;
+      this.interfaceName = dataSet.codeName;
+    }
+  }
+
+  /**
+   * 加载实体数据集数据
+   *
+   * @param {string} query 模糊匹配字符串
+   * @param {IData} data 表单数据
+   * @returns {*}  {Promise<IHttpResponse<IData[]>>}
+   * @memberof PickerEditorController
+   */
+  public async getServiceData(data: IData): Promise<IHttpResponse<IData[]>> {
+    const { context, params } = this.handlePublicParams(
+      data,
+      this.context,
+      this.params,
+    );
+    Object.assign(params, { size: 1000 });
+    if (this.serviceName && this.interfaceName) {
+      const deService = await this.app.es.getService(this.serviceName);
+      const res = await deService.exec(this.interfaceName, context, params);
+      return res as IHttpResponse<IData[]>;
+    }
+    throw new DefectModelError(this.model.source, '请配置实体和实体数据集');
+  }
+}

package/src/controller/editor/list-box.ts

@@ -0,0 +1,10 @@
+import { ListBoxEditorModel } from '@ibiz-template/model';
+import { CodeListEditorController } from './code-list-editor';
+
+/**
+ * 列表框编辑器控制器
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2022-08-25 10:57:58
+ */
+export class ListBoxEditorController extends CodeListEditorController<ListBoxEditorModel> {}

package/src/controller/editor/picker.ts

@@ -70,9 +70,14 @@ export class PickerEditorController extends EditorController<PickerEditorModel>
    */
   public noAC: boolean = false;
 
+  /**
+   * 不支持按钮（根据编辑器类型得）
+   */
+  public noButton: boolean = false;
+
   protected async onInit(): Promise<void> {
     super.onInit();
-    this.initNOAC();
+    this.initParams();
     this.valueItem = this.model.valueItemName?.toLowerCase() || '';
     this.keyName = this.model.appDataEntity?.keyName || '';
     this.textName = this.model.appDataEntity?.textName || '';
@@ -83,14 +88,18 @@ export class PickerEditorController extends EditorController<PickerEditorModel>
   }
 
   /**
-   * 初始化noAc
+   * 初始化noAc和noButton
    */
-  public initNOAC() {
+  public initParams() {
     switch (this.model.editorType) {
       case 'PICKEREX_NOAC':
         this.noAC = true;
         break;
+      case 'PICKEREX_NOBUTTON':
+        this.noButton = true;
+        break;
       default:
+        this.noButton = false;
         this.noAC = false;
     }
   }
@@ -117,8 +126,8 @@ export class PickerEditorController extends EditorController<PickerEditorModel>
    * 获取Ac参数
    */
   public getAcParams() {
-    const appDe = this.model.source.getPSAppDataEntity();
-    const dataSet = this.model.source.getPSAppDEDataSet();
+    const appDe = this.model.source.getPSAppDataEntity?.();
+    const dataSet = this.model.source.getPSAppDEDataSet?.();
     if (appDe && dataSet) {
       this.serviceName = appDe.codeName;
       this.interfaceName = dataSet.codeName;
@@ -154,11 +163,17 @@ export class PickerEditorController extends EditorController<PickerEditorModel>
     query: string,
     data: IData,
   ): Promise<IHttpResponse<IData[]>> {
-    const { context, params } = this.handlePublicParams(data);
+    // 附加编辑器视图参数
+    const tempParams = { ...this.params, query, size: 1000 };
     if (this.sort && !Object.is(this.sort, '')) {
-      Object.assign(params, { sort: this.sort });
+      Object.assign(tempParams, { sort: this.sort });
     }
-    Object.assign(params, { query, size: 1000 });
+
+    const { context, params } = this.handlePublicParams(
+      data,
+      this.context,
+      tempParams,
+    );
     if (this.serviceName && this.interfaceName) {
       const deService = await this.app.es.getService(this.serviceName);
       const res = await deService.exec(this.interfaceName, context, params);
@@ -179,7 +194,11 @@ export class PickerEditorController extends EditorController<PickerEditorModel>
     data: IData,
     selectedData?: string,
   ): Promise<IData[] | undefined> {
-    const { context, params } = this.handlePublicParams(data);
+    const { context, params } = this.handlePublicParams(
+      data,
+      this.context,
+      this.params,
+    );
     if (selectedData) {
       params.selectedData = selectedData;
     }
@@ -197,7 +216,11 @@ export class PickerEditorController extends EditorController<PickerEditorModel>
    * 打开数据链接视图
    */
   public async openLinkView(data: IData): Promise<IData[] | undefined> {
-    const { context, params } = this.handlePublicParams(data);
+    const { context, params } = this.handlePublicParams(
+      data,
+      this.context,
+      this.params,
+    );
     context.srfkey = data[this.valueItem];
     if (!this.linkView) {
       throw new DefectModelError(this.model.source, '请配置数据链接视图');

package/src/controller/interface/register/i-view-register.ts

@@ -1,4 +1,4 @@
-import { IPSAppView } from '@ibiz-template/model';
+import { ViewModel } from '@ibiz-template/model';
 import { IRegister } from '../../../interface';
 import { IViewProvider } from '../provider';
 
@@ -20,5 +20,5 @@ export interface IViewRegister extends IRegister<IViewProvider> {
    * @param {ControlModel} model 部件模型
    * @returns {*}  {(IViewProvider)}
    */
-  get(model: IPSAppView): Promise<IViewProvider>;
+  get(model: ViewModel): Promise<IViewProvider>;
 }

package/src/controller/neuron/nerve/view/grid-exp-view-nerve.ts

@@ -59,6 +59,10 @@ export class GridExpViewNerve extends MDViewNerve<
       this.grid.evt.on('destroyed', () => {
         this.grid = undefined as never;
       });
+      this.grid.evt.on(
+        'beforeLoad',
+        this.controller.onBeforeLoad.bind(this.controller),
+      );
       this.grid.evt.on(
         'dataActive',
         this.controller.onDataActive.bind(this.controller),

package/src/controller/neuron/nerve/view/kanban-view-nerve.ts

@@ -46,6 +46,10 @@ export class KanbanViewNerve<
         'beforeLoad',
         this.controller.onBeforeLoad.bind(this.controller),
       );
+      this.kanban.evt.on(
+        'beforeLoad',
+        this.controller.onBeforeLoad.bind(this.controller),
+      );
       this.kanban.evt.on(
         'dataActive',
         this.controller.onDataActive.bind(this.controller),

package/src/controller/neuron/nerve/view/list-exp-view-nerve.ts

@@ -58,6 +58,10 @@ export class ListExpViewNerve extends MDViewNerve<
       this.list.evt.on('destroyed', () => {
         this.list = undefined as never;
       });
+      this.list.evt.on(
+        'beforeLoad',
+        this.controller.onBeforeLoad.bind(this.controller),
+      );
       this.list.evt.on(
         'dataActive',
         this.controller.onDataActive.bind(this.controller),

package/src/controller/register/control-register.ts

@@ -18,6 +18,11 @@ export class ControlRegister
   implements IControlRegister
 {
   async get(model: ControlModel): Promise<IControlProvider> {
+    await ibiz.plugin.loadPredefinedPlugin(
+      `CONTROL_${model.source.controlType}_${
+        model.source.controlStyle || 'DEFAULT'
+      }`,
+    );
     // 先找插件标识和类型
     if (model.source.getPSSysPFPlugin()) {
       await ibiz.plugin.loadPlugin(model.source.getPSSysPFPlugin()!);

package/src/controller/register/editor-register.ts

@@ -18,6 +18,12 @@ export class EditorRegister
   implements IEditorRegister
 {
   async get(model: EditorModel): Promise<IEditorProvider> {
+    // 加载预置的编辑器插件
+    await ibiz.plugin.loadPredefinedPlugin(
+      `EDITOR_${model.source.editorType}_${
+        model.source.editorStyle || 'DEFAULT'
+      }`,
+    );
     // 先找插件标识和类型
     if (model.source.getPSSysPFPlugin()) {
       await ibiz.plugin.loadPlugin(model.source.getPSSysPFPlugin()!);

package/src/controller/register/view-register.ts

@@ -1,4 +1,4 @@
-import { IPSAppView, UnsupportedModelError } from '@ibiz-template/model';
+import { UnsupportedModelError, ViewModel } from '@ibiz-template/model';
 import { RegisterBase } from '../../register';
 import { IViewRegister, IViewProvider } from '../interface';
 
@@ -16,23 +16,23 @@ export class ViewRegister
   extends RegisterBase<IViewProvider>
   implements IViewRegister
 {
-  async get(model: IPSAppView): Promise<IViewProvider> {
-    // 不加载拿不到viewType等
-    if (!model.isFill) {
-      await model.fill(true);
-    }
+  async get(model: ViewModel): Promise<IViewProvider> {
+    await ibiz.plugin.loadPredefinedPlugin(
+      `VIEW_${model.source.viewType}_${model.source.viewStyle || 'DEFAULT'}`,
+    );
     // 先找插件标识和类型
-    if (model.getPSSysPFPlugin()) {
-      await ibiz.plugin.loadPlugin(model.getPSSysPFPlugin()!);
-      const { pluginType, pluginCode } = model.getPSSysPFPlugin()!;
+    const { source } = model;
+    if (source.getPSSysPFPlugin()) {
+      await ibiz.plugin.loadPlugin(source.getPSSysPFPlugin()!);
+      const { pluginType, pluginCode } = source.getPSSysPFPlugin()!;
       const key = `${pluginType}_${pluginCode}`;
       if (this.providers.has(key)) {
         return this.providers.get(key)!;
       }
-      ibiz.log.error(`找不到插件标识[${key}]对应的适配器`, model);
+      ibiz.log.error(`找不到插件标识[${key}]对应的适配器`, source);
     }
     // 再找视图类型和视图样式
-    const { viewType, viewStyle } = model;
+    const { viewType, viewStyle } = source;
     if (viewStyle && viewStyle !== 'DEFAULT') {
       const key = `${viewType}_${viewStyle}`;
       if (this.providers.has(key)) {
@@ -40,14 +40,14 @@ export class ViewRegister
       }
       ibiz.log.error(
         `找不到视图类型：[${viewType}]的视图样式：[${viewStyle}]对应的适配器`,
-        model,
+        source,
       );
     }
     // 最后找视图类型
     if (this.providers.has(viewType)) {
       return this.providers.get(viewType)!;
     }
-    ibiz.log.error(`找不到视图类型[${viewType}]对应的适配器`, model);
-    throw new UnsupportedModelError(model, `暂未实现`);
+    ibiz.log.error(`找不到视图类型[${viewType}]对应的适配器`, source);
+    throw new UnsupportedModelError(source, `暂未实现`);
   }
 }

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

@@ -28,4 +28,13 @@ export class FormState extends ControlState {
    * @type {ControlVO}
    */
   data: ControlVO = new ControlVO();
+
+  /**
+   * 是否正在处理中(动态控制，值规则，表单项更新等逻辑中)
+   * @author lxm
+   * @date 2023-03-06 09:07:20
+   * @type {boolean}
+   * @memberof FormController
+   */
+  processing: boolean = false;
 }

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

@@ -18,36 +18,6 @@ export class MDViewController<
 > extends ViewController<T> {
   state = new MDViewState();
 
-  /**
-   * 是否显示搜索表单
-   *
-   * @deprecated
-   * @author lxm
-   * @date 2022-08-28 20:08:10
-   * @type {boolean}
-   */
-  showSearchForm: boolean = false;
-
-  /**
-   * 快速搜索字符串
-   *
-   * @deprecated
-   * @author lxm
-   * @date 2022-08-31 11:08:45
-   * @type {string}
-   */
-  query: string = '';
-
-  /**
-   * 选中的数据
-   *
-   * @deprecated
-   * @author lxm
-   * @date 2022-08-28 18:08:34
-   * @type {IData[]}
-   */
-  selectedData: IData[] = [];
-
   declare nerve: MDViewNerve;
 
   protected createNerve(): MDViewNerve {
@@ -206,7 +176,7 @@ export class MDViewController<
    * @returns {*}  {IParams}
    */
   onBeforeLoad(): IParams {
-    const params: IParams = { query: this.state.query };
+    const params: IParams = { query: this.state.query.trim() };
     // 有搜索表单的整合相关参数
     if (this.nerve.searchForm) {
       const addParams = this.nerve.searchForm.call.getParams();

package/src/controller/view/pickup-grid-view.ts

@@ -26,7 +26,7 @@ export class PickupGridViewController extends GridViewController {
    */
   onSelectionChange(data: IData[]) {
     super.onSelectionChange(data);
-    this.nerve.self.evt.asyncEmit('selectionChange', this.selectedData);
+    this.nerve.self.evt.asyncEmit('selectionChange', this.state.selectedData);
   }
 
   /**

package/src/de-logic/de-logic-context.ts

@@ -0,0 +1,28 @@
+/**
+ * 实体逻辑执行上下文
+ *
+ * @author lxm
+ * @date 2023-03-09 07:38:38
+ * @export
+ * @class DELogicContext
+ */
+export class DELogicContext {
+  /**
+   * 实体逻辑参数
+   *
+   * @description 实体逻辑参数初始化时设置
+   * @author lxm
+   * @date 2023-02-08 17:02:38
+   * @type {Record<string, IData>}
+   */
+  params: Record<string, IData> = {};
+
+  /**
+   * UI逻辑执行返回值
+   *
+   * @author lxm
+   * @date 2023-02-09 21:02:40
+   * @type {unknown}
+   */
+  result: unknown = null;
+}

package/src/de-logic/de-logic-link/de-logic-link-cond/de-logic-link-cond.ts

@@ -0,0 +1,9 @@
+/**
+ * 界面逻辑连接条件
+ *
+ * @author lxm
+ * @date 2023-02-10 15:02:28
+ * @export
+ * @class DELogicLinkCond
+ */
+export abstract class DELogicLinkCond {}