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

package/out/utils/verify/verify.js

@@ -0,0 +1,179 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { isNilOrEmpty, notNilEmpty } from 'qx-util';
+import { isNil } from 'ramda';
+/**
+ * 比较值
+ *
+ * @author lxm
+ * @date 2023-02-14 11:10:01
+ * @export
+ * @param {valueType} value 比较目标值(从源数据里取出来)
+ * @param {string} op
+ * @param {valueType} value2 比较条件值
+ * @returns {*}  {boolean}
+ */
+export function testCond(value, op, value2) {
+    // 值包含在给定的范围中
+    if (Object.is(op, 'IN')) {
+        return contains(value, value2);
+    }
+    // 值不包含在给定的范围中
+    if (Object.is(op, 'NOTIN')) {
+        return !contains(value, value2);
+    }
+    switch (op) {
+        // * 相等，不等操作，忽略类型
+        // 等于操作
+        case 'EQ':
+            return `${value}` === `${value2}`;
+        // 不等于操作
+        case 'NOTEQ':
+            return `${value}` !== `${value2}`;
+        // *比较操作，非数值，日期等可比较类型抛出异常
+        // 小于操作
+        case 'LT':
+            return compare(value, value2) < 0;
+        // 小于等于操作
+        case 'LTANDEQ':
+            return compare(value, value2) <= 0;
+        // 大于操作
+        case 'GT':
+            return compare(value, value2) > 0;
+        // 大于等于操作
+        case 'GTANDEQ':
+            return compare(value, value2) >= 0;
+        // * 空判断
+        // 值不为空
+        case 'ISNULL':
+            return isNilOrEmpty(value);
+        // 值为空
+        case 'ISNOTNULL':
+            return notNilEmpty(value);
+        // 判断是否是null或者undefined
+        case 'TESTNULL':
+            return isNil(value);
+        // * 范围判断
+        // 值包含在给定的范围中
+        case 'IN':
+            return contains(value, value2);
+        // 值包含在给定的范围中
+        case 'NOTIN':
+            return !contains(value, value2);
+        // * 文本包含
+        // 文本包含
+        case 'LIKE':
+            return strContain(value, value2);
+        // 文本左包含
+        case 'LEFTLIKE':
+            return strContain(value, value2, 'start');
+        // 文本右包含
+        case 'RIGHTLIKE':
+            return strContain(value, value2, 'end');
+        default:
+            // todo 自定义包含，位与操作，子数据（递归）
+            throw new RuntimeError(`值操作：${op}，暂未支持`);
+    }
+}
+/**
+ * 值比较，
+ * value 大于 value2 返回 1
+ * value 等于 value2 返回 0
+ * value 小于 value2 返回 -1
+ *
+ * @static
+ * @param {*} value
+ * @param {*} value2
+ * @returns {number}
+ * @memberof Verify
+ */
+export function compare(value, value2) {
+    const number1 = Number(value);
+    const number2 = Number(value2);
+    // 可转换为数值的，直接比较转换之后的数值
+    if (!Number.isNaN(number1) && !Number.isNaN(number2)) {
+        return compareNumber(number1, number2);
+    }
+    // 看是否可以转换为日期，能转换成有效日期的比较
+    const date1 = new Date(value).getTime();
+    const date2 = new Date(value2).getTime();
+    if (!Number.isNaN(date1) && !Number.isNaN(date2)) {
+        return compareNumber(date1, date2);
+    }
+    throw new RuntimeError(`${value} 和 ${value2} 无法比较大小`);
+}
+/**
+ * 数值比较
+ *
+ * @static
+ * @param {number} value
+ * @param {number} value2
+ * @returns {number}
+ * @memberof Verify
+ */
+export function compareNumber(value, value2) {
+    if (Number.isNaN(value)) {
+        value = 0;
+    }
+    if (Number.isNaN(value2)) {
+        value2 = 0;
+    }
+    if (value > value2) {
+        return 1;
+    }
+    if (value < value2) {
+        return -1;
+    }
+    return 0;
+}
+/**
+ * 范围比较，比较value是否在value2的范围内
+ *
+ * @static
+ * @param {*} value
+ * @param {*} value2
+ * @returns {boolean}
+ * @memberof Verify
+ */
+export function contains(value, value2) {
+    if (!value2 || typeof value2 !== 'string') {
+        throw new RuntimeError('范围比较的条件值不存或者不是字符串');
+    }
+    if (value) {
+        // 定义一数组
+        const arr = value2.split(',');
+        return arr.includes(`${value}`);
+    }
+    return false;
+}
+/**
+ * 文本包含，value里是否包含value2
+ *
+ * @author lxm
+ * @date 2023-02-14 01:56:27
+ * @export
+ * @param {valueType} value
+ * @param {valueType} value2
+ * @param {('start' | 'end')} [mode] 匹配模式，start: 以value2开头，end: value2结尾
+ * @returns {*}
+ */
+export function strContain(value, value2, mode) {
+    // 排除空值
+    if (!value || !value2) {
+        return false;
+    }
+    // 忽略大小写
+    const val = `${value}`.toUpperCase();
+    const val2 = `${value2}`.toUpperCase();
+    const index = val.indexOf(val2);
+    switch (mode) {
+        // 左包含
+        case 'start':
+            return index === 0;
+        // 右包含
+        case 'end':
+            return index + val2.length === val.length;
+        // 包含
+        default:
+            return index !== -1;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.0.3-beta.2",
+  "version": "0.0.3-beta.3",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.0.3-beta.2",
-    "@ibiz-template/model": "^0.0.3-beta.2",
+    "@ibiz-template/core": "^0.0.3-beta.3",
+    "@ibiz-template/model": "^0.0.3-beta.3",
     "@types/qs": "^6.9.7",
     "@types/systemjs": "^6.13.1",
     "async-validator": "^4.2.5",
@@ -48,5 +48,5 @@
     "qx-util": "^0.4.4",
     "ramda": "^0.28.0"
   },
-  "gitHead": "e1b8498581e0672ad4a39337ff06d9b0a0f9aa55"
+  "gitHead": "5db494cb73fa734ceb7d8988d63d886ddec2afee"
 }

package/src/controller/constant/control/index.ts

@@ -1,2 +1,3 @@
 export * from './form/form-notify-state';
 export * from './grid/grid-notify-state';
+export * from './panel/panel-notify-state';

package/src/controller/constant/control/panel/panel-notify-state.ts

@@ -0,0 +1,6 @@
+/* eslint-disable no-shadow */
+export enum PanelNotifyState {
+  LOAD = 'LOAD',
+  DRAFT = 'DRAFT',
+  SAVE = 'SAVE',
+}

package/src/controller/control/control.ts

@@ -1,5 +1,6 @@
 import { IBizContext } from '@ibiz-template/core';
 import { ControlModel } from '@ibiz-template/model';
+import { Application } from '../../application';
 import { ControlNerve } from '../neuron';
 import { ControlState } from '../state';
 
@@ -65,6 +66,12 @@ export class ControlController<T extends ControlModel = ControlModel> {
    */
   nerve!: ControlNerve;
 
+  /**
+   * 单一应用对象
+   *
+   */
+  app: Application;
+
   /**
    * Creates an instance of ControlController.
    *
@@ -79,6 +86,7 @@ export class ControlController<T extends ControlModel = ControlModel> {
     this.context = context;
     this.params = params;
     this.nerve = this.createNerve();
+    this.app = ibiz.hub.getApp(model.modelService.app);
   }
 
   /**

package/src/controller/control/dataview.ts

@@ -0,0 +1,333 @@
+import { DataViewModel } from '@ibiz-template/model';
+import { RuntimeError } from '@ibiz-template/core';
+import { clone } from 'ramda';
+import { DataViewNerve } from '../neuron';
+import { DataViewState } from '../state';
+import { CodeListItem, ControlVO, DataViewService, Srfuf } from '../../service';
+import { MDController, MDItemController } from './md';
+import { IControlProvider } from '../interface';
+
+/**
+ * 卡片控制器
+ *
+ * @author chitanda
+ * @date 2022-08-01 18:08:13
+ * @export
+ * @class DataViewController
+ * @extends {MDController<DataViewModel>}
+ */
+export class DataViewController extends MDController<DataViewModel> {
+  state = new DataViewState();
+
+  declare nerve: DataViewNerve;
+
+  protected createNerve(): DataViewNerve {
+    return new DataViewNerve(this);
+  }
+
+  /**
+   * 卡片部件服务
+   *
+   */
+  declare service: DataViewService;
+
+  /**
+   * 是否默认禁用排序
+   *
+   */
+  get noSort(): boolean {
+    return this.model.source.noSort;
+  }
+
+  /**
+   * 排序查询条件
+   *
+   */
+  sortQuery?: string;
+
+  /**
+   * 面板部件适配器
+   *
+   * @type {IControlProvider}
+   */
+  layoutPanelProvider?: IControlProvider;
+
+  /**
+   * 加载的数据是否附加在items之后
+   *
+   * @type {boolean}
+   */
+  isAddBehind: boolean = false;
+
+  protected async onInit(): Promise<void> {
+    super.onInit();
+    this.state.size = this.model.size;
+    this.state.singleSelect = this.model.source.singleSelect;
+    this.service = new DataViewService(this.model);
+    await this.service.init(this.context);
+
+    // 绑定排序参数，beforeLoad事件
+    this.nerve.self.evt.on('beforeLoad', () => {
+      return this.sortQuery ? { sort: this.sortQuery } : {};
+    });
+
+    // 设置默认排序
+    const { defaultSortField, defaultSortDir } = this.model;
+    if (defaultSortField && defaultSortDir) {
+      this.setSort(defaultSortField, defaultSortDir);
+    }
+
+    // 初始化面板适配器
+    if (this.model.layoutPanel) {
+      this.layoutPanelProvider = await ibiz.register.control.get(
+        this.model.layoutPanel,
+      );
+    }
+  }
+
+  /**
+   * 设置排序
+   *
+   * @author lxm
+   * @date 2022-09-28 13:09:44
+   * @param {string} key 排序字段
+   * @param {string} order 排序顺序
+   */
+  setSort(key: string, order: 'asc' | 'desc') {
+    this.sortQuery = `${key},${order}`;
+  }
+
+  /**
+   * 加载更多数据
+   *
+   */
+  async loadMore(e: MouseEvent) {
+    e.stopPropagation();
+    if (this.state.total > this.state.items.length) {
+      this.state.curPage += 1;
+      this.isAddBehind = true;
+      this.load();
+    }
+  }
+
+  /**
+   * 部件加载数据行为
+   *
+   */
+  async load(): Promise<IData[]> {
+    const items = await super.load();
+    this.isAddBehind = false;
+    return items;
+  }
+
+  /**
+   * 部件加载后处理
+   *
+   */
+  async afterLoad(items: ControlVO[]): Promise<ControlVO[]> {
+    // 决定传入父的afterLoad是否为附加items后的数组
+    let resItems: ControlVO[] = [];
+    if (this.isAddBehind) {
+      this.state.items.push(...items);
+      resItems = this.state.items;
+    } else {
+      resItems = items;
+    }
+    await super.afterLoad(resItems);
+    // 处理分组
+    if (this.model.enableGroup) {
+      await this.handleGroup(this.state.items);
+    }
+    // 生成多数据rows对象
+    this.state.rows = this.state.items.map(item => {
+      const row = new MDItemController(item, this);
+      return row;
+    });
+    return this.state.items;
+  }
+
+  /**
+   * 分组方法
+   *
+   */
+  async handleGroup(items: ControlVO[]) {
+    if (Object.is(this.model.groupMode, 'AUTO')) {
+      await this.drawGroup(items);
+    } else if (Object.is(this.model.groupMode, 'CODELIST')) {
+      await this.drawCodeListGroup(items);
+    }
+  }
+
+  /**
+   * 处理自动分组
+   *
+   */
+  public async drawGroup(items: ControlVO[]) {
+    if (!this.model.groupAppField) {
+      ibiz.log.warn('未配置分组属性');
+      return;
+    }
+    const data = [...items];
+    let groups: string[] = [];
+    data.forEach((item: ControlVO) => {
+      if (
+        Object.prototype.hasOwnProperty.call(item, this.model.groupAppField!)
+      ) {
+        groups.push(item[this.model.groupAppField!]);
+      }
+    });
+    groups = [...new Set(groups)];
+    if (groups.length === 0) {
+      ibiz.log.warn('分组数据无效');
+    }
+    const groupTree: IData[] = [];
+    groups.forEach((group: string) => {
+      const children: ControlVO[] = [];
+      data.forEach((item: ControlVO) => {
+        if (Object.is(group, item[this.model.groupAppField!])) {
+          children.push(item);
+        }
+      });
+      group = group || '其他';
+      const tree = {
+        group,
+        children,
+      };
+      groupTree.push(tree);
+    });
+    this.state.groupData = groupTree;
+  }
+
+  /**
+   * 处理分组代码表
+   *
+   */
+  async drawCodeListGroup(items: ControlVO[]) {
+    if (!this.model.groupAppField) {
+      ibiz.log.warn('未配置分组属性');
+      return;
+    }
+    let groups: CodeListItem[] = [];
+    const data = [...items];
+
+    if (this.model.groupCodeList) {
+      const dataItems = await this.app.codeList.get(
+        this.model.groupCodeList.codeName,
+        this.context,
+        this.params,
+      );
+      groups = clone(dataItems) as CodeListItem[];
+    }
+    if (groups.length === 0) {
+      ibiz.log.warn('分组数据无效');
+    }
+    const groupTree: IData[] = [];
+    groups.forEach((group: CodeListItem) => {
+      const children: ControlVO[] = [];
+      data.forEach((item: ControlVO) => {
+        if (Object.is(group.value, item[this.model.groupAppField!])) {
+          children.push(item);
+        }
+      });
+      const tree = {
+        group: group.text,
+        codeListItem: group,
+        children,
+      };
+      groupTree.push(tree);
+    });
+    // 其他
+    const otherChildren: ControlVO[] = [];
+    data.forEach((item: ControlVO) => {
+      const i = groups.findIndex((_group: CodeListItem) =>
+        Object.is(_group.value, item[this.model.groupAppField!]),
+      );
+      if (i < 0) {
+        otherChildren.push(item);
+      }
+    });
+    const otherTree = {
+      group: '其他',
+      children: otherChildren,
+    };
+    if (otherChildren && otherChildren.length > 0) {
+      groupTree.push(otherTree);
+    }
+    this.state.groupData = groupTree;
+  }
+
+  /**
+   * 后台删除结束后界面删除逻辑
+   *
+   */
+  afterRemove(data: IData): void {
+    super.afterRemove(data);
+    // 删除this.state.rows里的表格行数据
+    const index = this.state.rows.findIndex(
+      item => item.data.srfkey === data.srfkey,
+    );
+    this.state.rows[index].destroy();
+    this.state.rows.splice(index, 1);
+  }
+
+  /**
+   * 保存
+   *
+   */
+  async save(data: ControlVO): Promise<void> {
+    const rowController = this.state.rows.find(
+      item => item.data.srfkey === data.srfkey,
+    );
+    if (!rowController) {
+      throw new RuntimeError('行数据不存在');
+    }
+    await this.startLoading();
+    let res;
+    const isCreate = data.srfuf === Srfuf.CREATE;
+    try {
+      res = isCreate
+        ? await this.service.create(
+            { [this.model.appEntity.deName]: data.srfkey, ...this.context },
+            data,
+          )
+        : await this.service.update(
+            { [this.model.appEntity.deName]: data.srfkey, ...this.context },
+            data,
+          );
+    } finally {
+      await this.endLoading();
+    }
+    // 后续处理
+    const index = this.state.items.findIndex(
+      item => item.srfkey === data.srfkey,
+    );
+    this.state.items.splice(index, 1, res.data);
+    rowController.data = res.data;
+    ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
+    await this.nerve.self.evt.asyncEmit('afterSave', [res.data], isCreate);
+  }
+
+  /**
+   * 单击事件
+   * @param {ControlVO} item
+   * @return {*}
+   * @author: zhujiamin
+   */
+  async handleClick(item: ControlVO) {
+    if (this.mdCtrlActiveMode === 1) {
+      await this.nerve.self.evt.asyncEmit('dataActive', item);
+    }
+  }
+
+  /**
+   * 双击事件
+   * @param {ControlVO} item
+   * @return {*}
+   * @author: zhujiamin
+   */
+  async handleDblClick(item: ControlVO) {
+    if (this.mdCtrlActiveMode === 2) {
+      await this.nerve.self.evt.asyncEmit('dataActive', item);
+    }
+  }
+}

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

@@ -145,6 +145,28 @@ export class EditFormController extends FormController<EditFormModel> {
     this.force();
   }
 
+  /**
+   * 执行返回行为
+   *
+   * @author lxm
+   * @date 2022-09-01 09:09:36
+   * @returns {*}
+   */
+  async goBack() {
+    await this.startLoading();
+    let res;
+    try {
+      res = await this.service.goBack(this.context, this.data);
+    } finally {
+      await this.endLoading();
+    }
+    // 合并后台返回数据
+    if (res.data) {
+      this.data.mergeOrigin(res.data);
+    }
+    this.force();
+  }
+
   /**
    * 表单项更新
    *

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

@@ -1,9 +1,10 @@
 import { isOverlap } from '@ibiz-template/core';
 import { FormDetailModel } from '@ibiz-template/model';
-import { IBizVerify } from '../../../service';
 import { FormNotifyState } from '../../constant';
 import { FormController, FormContainerController } from '.';
 import { FormDetailState } from '../../state';
+import { calcLayoutContentStyle } from '../../utils';
+import { verifyFormGroupLogic } from '../../../utils';
 
 export class FormDetailController<T extends FormDetailModel = FormDetailModel> {
   /**
@@ -72,19 +73,21 @@ export class FormDetailController<T extends FormDetailModel = FormDetailModel> {
 
   protected async onInit(): Promise<void> {
     // 初始化布局参数
-    if (this.model.width) {
-      this.state.layoutController.width = this.model.width;
+    const { width, height, sysCssName, detailType } = this.model;
+    // 初始化布局参数
+    if (width) {
+      this.state.layoutController.width = width;
     }
-    if (this.model.height) {
-      this.state.layoutController.height = this.model.height;
+    if (height) {
+      this.state.layoutController.height = height;
     }
-
     // 给col添加各自类型的类名
-    this.state.layoutController.extraClass = `ibiz-form-col__${this.model.source.detailType.toLowerCase()} `;
-    if (this.model.source.getPSSysCss()) {
-      this.state.layoutController.extraClass +=
-        this.model.source.getPSSysCss()!.cssName;
+    this.state.layoutController.extraClass = `ibiz-form-col__${detailType.toLowerCase()} `;
+    if (sysCssName) {
+      this.state.layoutController.extraClass = sysCssName;
     }
+
+    // 设置layout的visible关联自身的visible
     Object.defineProperty(this.state.layoutController, 'visible', {
       configurable: true,
       enumerable: true,
@@ -92,6 +95,13 @@ export class FormDetailController<T extends FormDetailModel = FormDetailModel> {
         return this.state.visible;
       },
     });
+
+    if (this.model.source.getPSLayoutPos()) {
+      // 设置自身内容样式
+      this.state.layoutController.contentStyle = calcLayoutContentStyle(
+        this.model.source.getPSLayoutPos()!,
+      );
+    }
   }
 
   /**
@@ -150,21 +160,25 @@ export class FormDetailController<T extends FormDetailModel = FormDetailModel> {
       const relatedNames = logic.getRelatedDetailNames() || [];
       // name是动态逻辑涉及到的时或state存在时
       if (state || isOverlap(relatedNames, names)) {
-        const ok = IBizVerify.verifyGroupLogic(this.form.data, logic);
-        switch (logic.logicCat) {
-          // 动态空输入，不满足则必填
-          case 'ITEMBLANK':
-            this.state.required = !ok;
-            break;
-          // 动态启用，满足则启用
-          case 'ITEMENABLE':
-            this.state.disabled = !ok;
-            break;
-          // 动态显示，满足则显示
-          case 'PANELVISIBLE':
-            this.state.visible = ok;
-            break;
-          default:
+        try {
+          const ok = verifyFormGroupLogic(this.form.data, logic);
+          switch (logic.logicCat) {
+            // 动态空输入，不满足则必填
+            case 'ITEMBLANK':
+              this.state.required = !ok;
+              break;
+            // 动态启用，满足则启用
+            case 'ITEMENABLE':
+              this.state.disabled = !ok;
+              break;
+            // 动态显示，满足则显示
+            case 'PANELVISIBLE':
+              this.state.visible = ok;
+              break;
+            default:
+          }
+        } catch (error) {
+          ibiz.log.error(error);
         }
       }
     });