@ibiz-template/runtime 0.4.3-dev.1 → 0.4.4

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.js

@@ -0,0 +1,13 @@
+import { ScriptFactory } from '../../../utils';
+import { UILogicNode } from '../ui-logic-node';
+export class RawJSCodeNode extends UILogicNode {
+    async exec(ctx) {
+        console.log(ctx);
+        ScriptFactory.execScriptFn({
+            view: ctx.view,
+            context: ctx.context,
+            params: ctx.viewParam,
+            uiLogic: ctx.params,
+        }, this.model.code || '', { isAsync: false });
+    }
+}

package/out/ui-logic/ui-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAkBL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IAoFvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAmBL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IAuFvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

package/out/ui-logic/ui-logic.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PFPluginNode, PrepareJSParamNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
+import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PFPluginNode, PrepareJSParamNode, RawJSCodeNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -103,6 +103,9 @@ export class UILogic {
                 case 'PFPLUGIN': // 前端插件调用
                     logicNode = new PFPluginNode(node);
                     break;
+                case 'RAWJSCODE':
+                    logicNode = new RawJSCodeNode(node);
+                    break;
                 default:
                     throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
             }

package/out/utils/index.d.ts

@@ -9,6 +9,7 @@ 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';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC"}

package/out/utils/index.js

@@ -9,5 +9,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/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,EAAmB,MAAM,iBAAiB,CAAC;AASvE,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;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IA4C9D;;;;;;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,EAAmB,MAAM,iBAAiB,CAAC;AASvE,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;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAkD9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}

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

@@ -115,7 +115,6 @@ export class ScriptFunction {
      * @param {IParams} param
      */
     fillDefaultParams(key, param) {
-        const view = param.view;
         switch (key) {
             case 'util': // 工具类
                 param.util = {
@@ -135,27 +134,34 @@ export class ScriptFunction {
             case 'app': // 应用级的控制器
                 param.app = ibiz.hub.controller;
                 break;
-            case 'parent': // 父容器控制器
-                param.parent = view === null || view === void 0 ? void 0 : view.parentView;
-                break;
-            case 'topView': // 顶级视图控制器
-                param.topView = view === null || view === void 0 ? void 0 : view.getTopView();
-                break;
-            case 'parentView': // 父级视图控制器
-                param.parentView = view === null || view === void 0 ? void 0 : view.parentView;
-                break;
-            case 'topViewSession': // 顶级视图共享数据对象
-                param.topViewSession = view === null || view === void 0 ? void 0 : view.getTopView().session;
-                break;
-            case 'viewSession': // 当前视图共享数据对象
-                param.viewSession = view === null || view === void 0 ? void 0 : view.session;
-                break;
             case 'appSession': // 全局共享数据对象
                 param.appSession = ibiz.hub.controller.session;
                 break;
             default:
                 break;
         }
+        const view = param.view;
+        if (view) {
+            switch (key) {
+                case 'parent': // 父容器控制器
+                    param.parent = view.parentView;
+                    break;
+                case 'topView': // 顶级视图控制器
+                    param.topView = view.getTopView();
+                    break;
+                case 'parentView': // 父级视图控制器
+                    param.parentView = view.parentView;
+                    break;
+                case 'topViewSession': // 顶级视图共享数据对象
+                    param.topViewSession = view.getTopView().session;
+                    break;
+                case 'viewSession': // 当前视图共享数据对象
+                    param.viewSession = view.session;
+                    break;
+                default:
+                    break;
+            }
+        }
     }
     /**
      * 执行脚本代码

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

@@ -0,0 +1,46 @@
+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-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;AAE7D;;;;;;;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;IAUlD;;;;;;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,61 @@
+/**
+ * 主题工具类
+ *
+ * @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 = theme.themeParams || {};
+        await ibiz.plugin.loadPlugin({
+            runtimeObject: true,
+            rtobjectName: theme.name,
+            rtobjectRepo: data['theme-package-path'],
+        });
+        this.setTheme(theme.themeTag);
+    }
+    /**
+     * 设置主题
+     *
+     * @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-dev.1",
+  "version": "0.4.4",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.4.0",
-    "@ibiz/model-core": "^0.0.22",
+    "@ibiz/model-core": "^0.0.23",
     "@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.23",
     "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": "2a8d1bf53f9d3ac19722a0fc2da1da1cccf634f0"
+  "gitHead": "283c09417c873f27c58087f33a93466940c1b002"
 }

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

@@ -436,8 +436,12 @@ export class MDControlController<
     if (!dataImport) {
       throw new RuntimeError('无导入模型！');
     }
+    let importName = 'DataImport';
+    if (dataImport.enableCustomized) {
+      importName = 'DataImport2';
+    }
     const modal = ibiz.overlay.createModal(
-      'DataImport',
+      importName,
       {
         dismiss: () => modal.dismiss(),
         appDataEntity,

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

@@ -240,7 +240,10 @@ export class ChartOptionsGenerator {
         min: chartAxis.minValue,
         position,
         axisLabel: {
-          formatter: (value: string): string => {
+          formatter: (value: string | number): string => {
+            if (typeof value === 'number') {
+              value = value.toString();
+            }
             if (dataShowMode === 1) {
               if (value.length > 4) {
                 return `${value.slice(0, 4).split('').join('\n')}\n...`;

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,12 @@ export class GridFieldEditColumnController
    * @param {string[]} names 变更属性名称
    */
   async dataChangeNotify(row: GridRowState, names: string[]): Promise<void> {
+    // 重置项，变更时自己的值置空
+    const { resetItemName } = this.editItem;
+    if (resetItemName && names.includes(resetItemName)) {
+      this.setRowValue(row, null);
+    }
+
     // 计算禁用状态
     this.calcColumnDisabled(row);
 

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/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/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 || {};
@@ -203,9 +203,13 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     const appDEDataImport = appDataEntity.appDEDataImports?.find(
       dataImport => dataImport.id === action.appDEDataImportId,
     );
+    let importName = 'DataImport';
+    if (appDEDataImport && appDEDataImport.enableCustomized) {
+      importName = 'DataImport2';
+    }
     if (appDEDataImport) {
       const modal = ibiz.overlay.createModal(
-        'DataImport',
+        importName,
         {
           dismiss: () => modal.dismiss(),
           appDataEntity,

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

@@ -1,4 +1,4 @@
-import { IUILogicContext, IUILogicParams } from '../interface';
+import { IUILogicContext, IUILogicParams, IViewController } from '../interface';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 
 /**
@@ -18,6 +18,18 @@ export class UILogicContext implements IUILogicContext {
    */
   lastReturn: unknown;
 
+  /**
+   * 视图控制器
+   *
+   * @author chitanda
+   * @date 2023-12-01 11:12:48
+   * @readonly
+   * @type {IViewController}
+   */
+  get view(): IViewController {
+    return this.parameters.view;
+  }
+
   /**
    * 上下文
    */

package/src/ui-logic/ui-logic-node/index.ts

@@ -18,3 +18,4 @@ export { DataSetNode } from './data-set-node/data-set-node';
 export { ThrowExceptionNode } from './throw-exception-node/throw-exception-node';
 export { ViewCtrlFireEventNode } from './view-ctrl-fire-event-node/view-ctrl-fire-event-node';
 export { ExecuteDELogicNode } from './execute-de-logic-node/execute-de-logic-node';
+export { RawJSCodeNode } from './raw-js-code-node/raw-js-code-node';

package/src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts

@@ -0,0 +1,22 @@
+import { IDEUIRawCodeLogic } from '@ibiz/model-core';
+import { ScriptFactory } from '../../../utils';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+
+export class RawJSCodeNode extends UILogicNode {
+  declare model: IDEUIRawCodeLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    console.log(ctx);
+    ScriptFactory.execScriptFn(
+      {
+        view: ctx.view,
+        context: ctx.context,
+        params: ctx.viewParam,
+        uiLogic: ctx.params,
+      },
+      this.model.code || '',
+      { isAsync: false },
+    );
+  }
+}