@ibiz-template/runtime 0.4.3 → 0.4.5

package/out/utils/theme-util/theme-util.d.ts

@@ -0,0 +1,57 @@
+import { IAppUITheme } from '@ibiz/model-core';
+/**
+ * 主题工具类
+ *
+ * @author chitanda
+ * @date 2023-12-02 23:12:15
+ * @export
+ * @class ThemeUtil
+ */
+export declare class ThemeUtil {
+    /**
+     * 主题设置元素 html
+     *
+     * @author chitanda
+     * @date 2023-12-02 23:12:26
+     * @protected
+     * @type {HTMLElement}
+     */
+    protected html: HTMLElement;
+    /**
+     * 加载主题插件
+     *
+     * @author chitanda
+     * @date 2023-12-03 01:12:44
+     * @param {IAppUITheme} theme
+     * @return {*}  {Promise<void>}
+     */
+    loadTheme(theme: IAppUITheme): Promise<void>;
+    /**
+     * 设置额外修改的主题参数
+     *
+     * @author chitanda
+     * @date 2023-12-05 11:12:00
+     * @protected
+     * @param {IAppUITheme} theme
+     * @param {Record<string, string>} params
+     * @return {*}  {void}
+     */
+    protected setThemeParams(theme: IAppUITheme, params: Record<string, string>): void;
+    /**
+     * 设置主题
+     *
+     * @author chitanda
+     * @date 2023-12-02 23:12:37
+     * @param {string} tag
+     */
+    setTheme(tag: string): void;
+    /**
+     * 获取当前主题
+     *
+     * @author chitanda
+     * @date 2023-12-02 23:12:10
+     * @return {*}  {string}
+     */
+    getTheme(): string;
+}
+//# sourceMappingURL=theme-util.d.ts.map

package/out/utils/theme-util/theme-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"theme-util.d.ts","sourceRoot":"","sources":["../../../src/utils/theme-util/theme-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,SAAS;IACpB;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,WAAW,CAA4C;IAEvE;;;;;;;OAOG;IACG,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,IAAI;IAoBP;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAO3B;;;;;;OAMG;IACH,QAAQ,IAAI,MAAM;CAGnB"}

package/out/utils/theme-util/theme-util.js

@@ -0,0 +1,95 @@
+import { clone } from 'ramda';
+/**
+ * 主题工具类
+ *
+ * @author chitanda
+ * @date 2023-12-02 23:12:15
+ * @export
+ * @class ThemeUtil
+ */
+export class ThemeUtil {
+    constructor() {
+        /**
+         * 主题设置元素 html
+         *
+         * @author chitanda
+         * @date 2023-12-02 23:12:26
+         * @protected
+         * @type {HTMLElement}
+         */
+        this.html = document.getElementsByTagName('html')[0];
+    }
+    /**
+     * 加载主题插件
+     *
+     * @author chitanda
+     * @date 2023-12-03 01:12:44
+     * @param {IAppUITheme} theme
+     * @return {*}  {Promise<void>}
+     */
+    async loadTheme(theme) {
+        const data = clone(theme.themeParams || {});
+        const path = data['theme-package-path'];
+        delete data.appId;
+        delete data['theme-package-path'];
+        await ibiz.plugin.loadPlugin({
+            runtimeObject: true,
+            rtobjectName: theme.name,
+            rtobjectRepo: path,
+        });
+        this.setThemeParams(theme, data);
+        this.setTheme(theme.themeTag);
+    }
+    /**
+     * 设置额外修改的主题参数
+     *
+     * @author chitanda
+     * @date 2023-12-05 11:12:00
+     * @protected
+     * @param {IAppUITheme} theme
+     * @param {Record<string, string>} params
+     * @return {*}  {void}
+     */
+    setThemeParams(theme, params) {
+        const themeStyle = document.getElementById(theme.themeTag);
+        if (themeStyle) {
+            return;
+        }
+        let content = `:root.${theme.themeTag}{`;
+        for (const key in params) {
+            if (Object.prototype.hasOwnProperty.call(params, key)) {
+                const val = params[key];
+                content += `${key}: ${val}${val.endsWith(';') ? '' : ';'}`;
+            }
+        }
+        content += '}';
+        const script = document.createElement('style');
+        script.id = theme.themeTag;
+        script.type = 'text/css';
+        script.innerHTML = content;
+        document.head.appendChild(script);
+    }
+    /**
+     * 设置主题
+     *
+     * @author chitanda
+     * @date 2023-12-02 23:12:37
+     * @param {string} tag
+     */
+    setTheme(tag) {
+        const theme = this.getTheme();
+        this.html.classList.remove(theme);
+        this.html.setAttribute('theme', tag);
+        this.html.classList.add(tag);
+    }
+    /**
+     * 获取当前主题
+     *
+     * @author chitanda
+     * @date 2023-12-02 23:12:10
+     * @return {*}  {string}
+     */
+    getTheme() {
+        return this.html.getAttribute('theme');
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.4.0",
-    "@ibiz/model-core": "^0.0.22",
+    "@ibiz-template/core": "^0.4.5",
+    "@ibiz/model-core": "^0.0.24",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.4.0",
-    "@ibiz/model-core": "^0.0.22",
+    "@ibiz/model-core": "^0.0.24",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "ed51e5098f87bc6805cf39d4edc6aec1c2bbf7d0"
+  "gitHead": "28b2af793771fa7be9fac2e1c8396081f4002230"
 }

package/src/controller/control/exp-bar/tree-exp-bar.controller.ts

@@ -196,4 +196,22 @@ export class TreeExpBarController
     }
     await super.onRouterChange(info);
   }
+
+  /**
+   * 是否显示部件头部
+   * @author lxm
+   * @date 2023-08-02 07:54:18
+   * @protected
+   * @return {*}  {boolean}
+   */
+  protected calcControlHeaderVisible(): boolean {
+    const hasToolbar = !!this.toolbarController;
+    if (!hasToolbar && this.layoutPanel) {
+      const controller = this.layoutPanel.panelItems.control_toolbar;
+      if (controller) {
+        controller.state.visible = false;
+      }
+    }
+    return hasToolbar || !!(this.model.showTitleBar && this.model.title);
+  }
 }

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

@@ -187,17 +187,22 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
    * @author lxm
    * @date 2023-11-11 08:01:49
    */
-  create(): void {
+  create(index?: number): void {
     const context = this.context.clone();
     const params = { ...this.params };
     if (!this.state.items) {
       this.state.items = [];
     }
-    this.state.items!.push({
+    const item = {
       id: createUUID(),
       context,
       params,
-    });
+    };
+    if (index !== undefined) {
+      this.state.items!.splice(index, 0, item);
+    } else {
+      this.state.items!.push(item);
+    }
   }
 
   refresh(): void {

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

@@ -140,14 +140,18 @@ export class FormMDCtrlRepeaterController extends FormMDCtrlController {
    * @author lxm
    * @date 2023-11-22 04:50:19
    */
-  create(): void {
+  create(index?: number): void {
     if (this.isSingleData) {
       this.setValue({});
     } else {
       // 多数据，拷贝数组再添加新对象
       let tempValue = this.value as IData[] | null;
       tempValue = tempValue ? [...tempValue] : [];
-      tempValue.push({});
+      if (index !== undefined) {
+        tempValue.splice(index, 0, {});
+      } else {
+        tempValue.push({});
+      }
       this.setValue(tempValue);
     }
   }

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

@@ -1144,4 +1144,21 @@ export class GridController
     const index = this.findRowStateIndex(data);
     return index !== -1 ? this.state.rows[index] : undefined;
   }
+
+  /**
+   * 行单击事件
+   *
+   * @author lxm
+   * @date 2022-08-18 22:08:16
+   * @param {IData} data 选中的单条数据
+   */
+  async onRowClick(data: IData): Promise<void> {
+    // 表格行单击时，只选中点击行
+    this.setSelection([data]);
+
+    // 激活事件
+    if (this.state.mdctrlActiveMode === 1) {
+      await this.setActive(data);
+    }
+  }
 }

package/src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts

@@ -207,6 +207,20 @@ export class GridFieldEditColumnController
    * @param {string[]} names 变更属性名称
    */
   async dataChangeNotify(row: GridRowState, names: string[]): Promise<void> {
+    // 重置项，变更时自己的值置空
+    const { resetItemNames } = this.editItem;
+    let isReset = false;
+    if (resetItemNames && resetItemNames.length > 0) {
+      resetItemNames.forEach((resetItemName: string) => {
+        if (names.includes(resetItemName)) {
+          isReset = true;
+        }
+      });
+    }
+    if (isReset) {
+      this.setRowValue(row, null);
+    }
+
     // 计算禁用状态
     this.calcColumnDisabled(row);
 

package/src/controller/control/toolbar/toolbar.controllerr.ts

@@ -174,6 +174,9 @@ export class ToolbarController<
         this.model,
         (item: IDEToolbarItem) => {
           const itemState = this.state.buttonsState[item.id!] as IButtonState;
+          if (!itemState) {
+            return;
+          }
           // 计算项显示逻辑
           if (itemState.visible) {
             const dynaVisible = this.scheduler!.triggerItemVisible(

package/src/controller/control/tree/tree.controller.ts

@@ -36,6 +36,14 @@ export class TreeController
    */
   contextMenus: { [p: string]: ContextMenuController } = {};
 
+  /**
+   * 是否启用快速搜索
+   * @author lxm
+   * @date 2023-12-04 03:33:32
+   * @type {boolean}
+   */
+  enableQuickSearch: boolean = false;
+
   protected initState(): void {
     super.initState();
     // 根节点初始化
@@ -43,6 +51,7 @@ export class TreeController
     this.state.expandedKeys = [];
     this.state.navigational = false;
     this.state.size = 0;
+    this.state.query = '';
   }
 
   protected async onCreated(): Promise<void> {
@@ -50,6 +59,34 @@ export class TreeController
 
     this.state.expandedKeys = [...this.state.defaultExpandedKeys];
 
+    // 快速搜索
+    if (this.model.detreeNodes?.[0].enableQuickSearch) {
+      this.enableQuickSearch = true;
+    }
+
+    // 计算快速搜索占位符
+    if (this.dataEntity) {
+      const searchFields = this.dataEntity.appDEFields?.filter(field => {
+        return field.enableQuickSearch;
+      });
+      const placeHolders: string[] = [];
+      searchFields?.forEach(searchField => {
+        if (searchField?.lnlanguageRes && searchField.lnlanguageRes.lanResTag) {
+          placeHolders.push(
+            ibiz.i18n.t(
+              searchField.lnlanguageRes.lanResTag,
+              searchField.logicName,
+            ),
+          );
+        } else if (searchField?.logicName) {
+          placeHolders.push(searchField.logicName);
+        }
+      });
+      if (placeHolders.length > 0) {
+        this.state.placeHolder = placeHolders.join('、');
+      }
+    }
+
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
 
@@ -99,6 +136,14 @@ export class TreeController
     return nodes;
   }
 
+  async getFetchParams(extraParams?: IParams): Promise<IParams> {
+    const params = await super.getFetchParams(extraParams);
+    if (this.state.query) {
+      params.query = this.state.query;
+    }
+    return params;
+  }
+
   /**
    * 加载子节点数据
    *

package/src/controller/control/tree/tree.service.ts

@@ -301,7 +301,7 @@ export class TreeService extends MDControlService<IDETree> {
     const { resultContext, resultParams } = calcNavParams(
       {
         deName,
-        navFilter: navFilter ? `n_${navFilter}_eq` : undefined,
+        navFilter: navFilter ? `n_${navFilter.toLowerCase()}_eq` : undefined,
         pickupDEFName,
         navParams,
         navContexts,

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

@@ -5,6 +5,7 @@ import {
   LayoutPanelUtil,
   HandlebarsUtil,
   RawValueUtil,
+  ThemeUtil,
 } from '../../utils';
 import {
   DefaultErrorHandler,
@@ -28,6 +29,14 @@ export class GlobalUtil {
    */
   readonly layoutPanel = new LayoutPanelUtil();
 
+  /**
+   * 主题设置工具
+   *
+   * @author chitanda
+   * @date 2023-12-02 23:12:27
+   */
+  readonly theme = new ThemeUtil();
+
   /**
    * 文本工具
    *

package/src/interface/common/i-plugin-factory/i-plugin-factory.ts

@@ -11,14 +11,13 @@ import { IPluginItem } from '../i-plugin-item/i-plugin-item';
  */
 export interface IPluginFactory {
   /**
-   * 设置开发插件，用于本地调试
+   * 设置本地开发忽略远程加载插件
    *
    * @author chitanda
-   * @date 2022-11-02 21:11:01
-   * @param {string} name
-   * @param {() => Promise<unknown>} fn
+   * @date 2023-12-04 17:12:40
+   * @param {(string | RegExp)} rule
    */
-  setDevPlugin(name: string, fn: () => Promise<unknown>): void;
+  setDevIgnore(rule: string | RegExp): void;
   /**
    * 加载插件
    *

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

@@ -45,6 +45,22 @@ export interface ITreeState extends IMDControlState {
    * @type {boolean}
    */
   navigational: boolean;
+
+  /**
+   * 查询条件
+   * @author lxm
+   * @date 2023-08-02 07:38:49
+   * @type {string}
+   */
+  query: string;
+
+  /**
+   * 快速搜索占位符
+   *
+   * @type {string}
+   * @memberof IExpBarControlState
+   */
+  placeHolder: string;
 }
 
 /**

package/src/model/utils/util.ts

@@ -3,6 +3,7 @@ import {
   IAppView,
   IAppViewRef,
   IControl,
+  IControlRender,
   IModelObject,
   IPanel,
   ISysPFPlugin,
@@ -151,7 +152,9 @@ export function getPFPlugin(id: string, appId?: string): ISysPFPlugin {
  * @param {IControl} control
  * @return {*}  {(IPanel | undefined)}
  */
-export function getControlPanel(control: IControl): IPanel | undefined {
+export function getControlPanel(control: {
+  controlRenders?: IControlRender[];
+}): IPanel | undefined {
   let layoutPanel: IPanel | undefined;
   if (control.controlRenders) {
     const panelRender = control.controlRenders.find(

package/src/platform/provider/platform-provider-base.ts

@@ -33,6 +33,7 @@ export abstract class PlatformProviderBase implements IPlatformProvider {
     const response = await ibiz.net.request(url, {
       method: 'get',
       responseType: 'blob',
+      baseURL: '',
     });
     if (response.status !== 200) {
       throw new RuntimeError('下载文件失败');

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -178,9 +178,15 @@ export class DynamicCodeListCache {
     }
     // 数据属性
     if (dataAppDEFieldId && data[dataAppDEFieldId]) {
-      result.data = ScriptFactory.execSingleLine(
-        data[dataAppDEFieldId],
-      ) as IData;
+      try {
+        result.data = ScriptFactory.execSingleLine(
+          data[dataAppDEFieldId],
+        ) as IData;
+      } catch (error) {
+        ibiz.log.error(
+          '动态代码表数据属性返回值不为对象格式的字符串，无法转换！',
+        );
+      }
     }
     return result;
   }

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

@@ -101,10 +101,10 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     args: IUILogicParams,
   ): IUIActionResult {
     const { scriptCode } = action as IUIAction;
-    const { context, params, data, event } = args;
+    const { context, params, data, event, view } = args;
     if (scriptCode) {
       const result = ScriptFactory.execScriptFn(
-        { context, params, data, el: event?.target },
+        { context, params, data, el: event?.target, view },
         scriptCode,
       ) as IUIActionResult | undefined;
       return result || {};

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

@@ -3,6 +3,7 @@ import { BackendUIActionProvider } from './backend-ui-action-provider';
 import { SysUIActionProvider } from './sys-ui-action-provider';
 import { FrontUIActionProvider } from './front-ui-action-provider';
 import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
+import { UIActionProviderBase } from './ui-action-provider-base';
 
 /**
  * 预置默认的界面行为适配器
@@ -36,4 +37,5 @@ export {
   SysUIActionProvider,
   BackendUIActionProvider,
   WFWithdrawUIActionProvider,
+  UIActionProviderBase,
 };

package/src/utils/index.ts

@@ -12,5 +12,6 @@ export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
+export { ThemeUtil } from './theme-util/theme-util';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
 export { handleAllSettled } from './promise/promise';

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

@@ -0,0 +1,102 @@
+import { IAppUITheme, ISysPFPlugin } from '@ibiz/model-core';
+import { clone } from 'ramda';
+
+/**
+ * 主题工具类
+ *
+ * @author chitanda
+ * @date 2023-12-02 23:12:15
+ * @export
+ * @class ThemeUtil
+ */
+export class ThemeUtil {
+  /**
+   * 主题设置元素 html
+   *
+   * @author chitanda
+   * @date 2023-12-02 23:12:26
+   * @protected
+   * @type {HTMLElement}
+   */
+  protected html: HTMLElement = document.getElementsByTagName('html')[0];
+
+  /**
+   * 加载主题插件
+   *
+   * @author chitanda
+   * @date 2023-12-03 01:12:44
+   * @param {IAppUITheme} theme
+   * @return {*}  {Promise<void>}
+   */
+  async loadTheme(theme: IAppUITheme): Promise<void> {
+    const data = clone(theme.themeParams || {});
+    const path = data['theme-package-path'];
+    delete data.appId;
+    delete data['theme-package-path'];
+    await ibiz.plugin.loadPlugin({
+      runtimeObject: true,
+      rtobjectName: theme.name,
+      rtobjectRepo: path,
+    } as unknown as ISysPFPlugin);
+    this.setThemeParams(theme, data);
+    this.setTheme(theme.themeTag!);
+  }
+
+  /**
+   * 设置额外修改的主题参数
+   *
+   * @author chitanda
+   * @date 2023-12-05 11:12:00
+   * @protected
+   * @param {IAppUITheme} theme
+   * @param {Record<string, string>} params
+   * @return {*}  {void}
+   */
+  protected setThemeParams(
+    theme: IAppUITheme,
+    params: Record<string, string>,
+  ): void {
+    const themeStyle = document.getElementById(theme.themeTag!);
+    if (themeStyle) {
+      return;
+    }
+    let content = `:root.${theme.themeTag!}{`;
+    for (const key in params) {
+      if (Object.prototype.hasOwnProperty.call(params, key)) {
+        const val = params[key];
+        content += `${key}: ${val}${val.endsWith(';') ? '' : ';'}`;
+      }
+    }
+    content += '}';
+    const script = document.createElement('style');
+    script.id = theme.themeTag!;
+    script.type = 'text/css';
+    script.innerHTML = content;
+    document.head.appendChild(script);
+  }
+
+  /**
+   * 设置主题
+   *
+   * @author chitanda
+   * @date 2023-12-02 23:12:37
+   * @param {string} tag
+   */
+  setTheme(tag: string): void {
+    const theme = this.getTheme();
+    this.html.classList.remove(theme);
+    this.html.setAttribute('theme', tag);
+    this.html.classList.add(tag);
+  }
+
+  /**
+   * 获取当前主题
+   *
+   * @author chitanda
+   * @date 2023-12-02 23:12:10
+   * @return {*}  {string}
+   */
+  getTheme(): string {
+    return this.html.getAttribute('theme')!;
+  }
+}