@ibiz-template/runtime 0.6.0-alpha.2 → 0.6.0-alpha.4

package/out/ui-action/provider/ui-action-provider-base.js

@@ -262,4 +262,26 @@ export class UIActionProviderBase {
             });
         }
     }
+    /**
+     * 处理打开视图配置自定义参数 modalOption
+     *
+     * @author zk
+     * @date 2024-02-01 01:02:28
+     * @param {IData} param
+     * @return {*}  {IData}
+     * @memberof FrontUIActionProvider
+     */
+    handleViewOptionParams(param) {
+        if (param.modaloption) {
+            try {
+                const modalOption = JSON.parse(param.modaloption);
+                delete param.modaloption;
+                return { modalOption };
+            }
+            catch (error) {
+                ibiz.log.error(`视图参数modalOption 解析失败：${error}`);
+            }
+        }
+        return {};
+    }
 }

package/out/utils/index.d.ts

@@ -2,7 +2,7 @@ export * from './error-handler';
 export { HandlebarsUtil } from './handlebars/handlebars';
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
-export { toLocalOpenWFRedirectView, openRedirectView, getDERedirectToView, } from './open-redirect-view/open-redirect-view';
+export { toLocalOpenWFRedirectView, openRedirectView, getDERedirectToView, parseViewProtocol, } from './open-redirect-view/open-redirect-view';
 export * from './verify';
 export { LayoutPanelUtil } from './layout-panel-util/layout-panel-util';
 export * from './wf-helper/wf-helper';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,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,EAChB,mBAAmB,GACpB,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,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,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,EAChB,mBAAmB,EACnB,iBAAiB,GAClB,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,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC"}

package/out/utils/index.js

@@ -2,7 +2,7 @@ export * from './error-handler';
 export { HandlebarsUtil } from './handlebars/handlebars';
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
-export { toLocalOpenWFRedirectView, openRedirectView, getDERedirectToView, } from './open-redirect-view/open-redirect-view';
+export { toLocalOpenWFRedirectView, openRedirectView, getDERedirectToView, parseViewProtocol, } from './open-redirect-view/open-redirect-view';
 export * from './verify';
 export { LayoutPanelUtil } from './layout-panel-util/layout-panel-util';
 export * from './wf-helper/wf-helper';

package/out/utils/nav-params/nav-params.js

@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash-es';
+import { isEmpty, isNil } from 'lodash-es';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 /**
  * 把对象格式的导航参数转换成数组格式的导航参数
@@ -102,7 +102,7 @@ export function convertNavDataByArray(naviDatas, ...origins) {
                     // 去掉${}，适配平台模型转小写取值
                     key.slice(2, -1).toLowerCase());
                     if (find) {
-                        valueStr = valueStr.replace(key, `${value}`);
+                        valueStr = valueStr.replace(key, `${isNil(value) ? '' : value}`);
                     }
                 });
                 result[naviData.key.toLowerCase()] = valueStr;

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

@@ -1,5 +1,22 @@
 import { IAppDERedirectView, IAppDataEntity, IAppRedirectView } from '@ibiz/model-core';
 import { IModalData, IOpenViewOptions } from '../../interface';
+/**
+ * 解析view://协议的字符串
+ * @author lxm
+ * @date 2024-02-06 09:26:20
+ * @export
+ * @param {string} urlStr
+ * @return {*}  {{
+ *   context: IParams;
+ *   params: IParams;
+ *   viewId: string;
+ * }}
+ */
+export declare function parseViewProtocol(urlStr: string): {
+    context: IParams;
+    params: IParams;
+    viewId: string;
+};
 type ToViewParams = {
     context: IContext;
     params: IParams;

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,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;;;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;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAoDvB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,CAAC,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CA4I3E;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,CA+BrB;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,CAiDjB"}
+{"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,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAiCA;AAED,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;;;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;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAoDvB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,CAAC,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAyH3E;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,CA+BrB;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,CAiDjB"}

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

@@ -4,6 +4,53 @@ import qs from 'qs';
 import { OpenAppViewCommand } from '../../command';
 import { convertNavData } from '../nav-params/nav-params';
 import { calcDeCodeNameById, findFieldById } from '../../model';
+/**
+ * 解析view://协议的字符串
+ * @author lxm
+ * @date 2024-02-06 09:26:20
+ * @export
+ * @param {string} urlStr
+ * @return {*}  {{
+ *   context: IParams;
+ *   params: IParams;
+ *   viewId: string;
+ * }}
+ */
+export function parseViewProtocol(urlStr) {
+    const url = new URL(urlStr);
+    const context = {};
+    const params = {};
+    let viewId = '';
+    if (url.searchParams.size > 0) {
+        const navCtx = url.searchParams.get('srfnavctx');
+        if (navCtx) {
+            try {
+                Object.assign(context, JSON.parse(navCtx));
+            }
+            catch (error) {
+                ibiz.log.error(`重定向[${urlStr}] 中 srfnavctx 参数解析失败`, error);
+            }
+            url.searchParams.delete('srfnavctx');
+        }
+        url.searchParams.forEach((value, _key) => {
+            params[_key] = value;
+        });
+    }
+    const rdTagItems = url.pathname.replace('//', '').split('/');
+    // 当只有一个时，为视图标识。当有两个时，第二个是视图标识
+    const [appOrViewTag, viewTag] = rdTagItems;
+    if (viewTag) {
+        viewId = viewTag;
+    }
+    else {
+        viewId = appOrViewTag;
+    }
+    return {
+        context,
+        params,
+        viewId,
+    };
+}
 /**
  * 打开重定向视图
  *
@@ -154,31 +201,10 @@ export async function getDERedirectToView(appView, context, params = {}, opts =
     let viewId = '';
     // view://协议开头处理,值示例: view://{app}/{viewcodename}?srfnavctx={"work_item":"6c797b6a6dfbd8f38652fe3ea3220fc1","project":"ee11e5a96002f4f3937ddba025ec7d44"}&srfwftag={wftag}
     if (rdTag.startsWith('view://')) {
-        const url = new URL(rdTag);
-        if (url.searchParams.size > 0) {
-            const navCtx = url.searchParams.get('srfnavctx');
-            if (navCtx) {
-                try {
-                    Object.assign(context, JSON.parse(navCtx));
-                }
-                catch (error) {
-                    ibiz.log.error(`重定向[${rdTag}] 中 srfnavctx 参数解析失败`, error);
-                }
-                url.searchParams.delete('srfnavctx');
-            }
-            url.searchParams.forEach((value, _key) => {
-                params[_key] = value;
-            });
-        }
-        const rdTagItems = url.pathname.replace('//', '').split('/');
-        // 当只有一个时，为视图标识。当有两个时，第二个是视图标识
-        const [appOrViewTag, viewTag] = rdTagItems;
-        if (viewTag) {
-            viewId = viewTag;
-        }
-        else {
-            viewId = appOrViewTag;
-        }
+        const result = parseViewProtocol(rdTag);
+        Object.assign(context, result.context);
+        Object.assign(params, result.params);
+        viewId = result.viewId;
     }
     else {
         // !!!工作流临时补充特殊处理标识, 避免补充了工作流流程匹配不上, 再从默认tag匹配!!!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.6.0-alpha.2",
+  "version": "0.6.0-alpha.4",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -21,6 +21,9 @@
     "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:run": "vitest run",
     "publish:next": "npm run build && npm publish --access public --tag=next --registry=https://registry.npmjs.org/",
     "publish:dev": "npm run build && npm publish --access public --tag=dev --registry=https://registry.npmjs.org/",
     "publish:alpha": "npm run build && npm publish --access public --tag=alpha --registry=https://registry.npmjs.org/",
@@ -29,8 +32,11 @@
   },
   "author": "chitanda",
   "license": "MIT",
+  "dependencies": {
+    "animejs": "^3.2.2"
+  },
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.7-alpha.10",
+    "@ibiz-template/core": "^0.6.0-alpha.4",
     "@ibiz/model-core": "^0.1.11",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
@@ -61,8 +67,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "dependencies": {
-    "animejs": "^3.2.2"
-  },
-  "gitHead": "f12ee6bf410373ab9446f755828f6c7f1e68c2c7"
+  "gitHead": "7eb997a859a84a17580e503519163e0980f8c5ca"
 }

package/src/controller/common/editor/editor.controller.ts

@@ -167,6 +167,18 @@ export class EditorController<T extends IEditor = IEditor>
         this.style.height = `${height}px`;
       }
     }
+    if (this.model.cssStyle) {
+      // 解析字符串形式的cssStyle为对象
+      const stylesObject: IData = {};
+      const stylesArray = this.model.cssStyle.split(';').filter(Boolean);
+      stylesArray.forEach(style => {
+        const [key, value] = style.split(':');
+        if (key && value) {
+          stylesObject[key.trim()] = value.trim();
+        }
+        Object.assign(this.style, stylesObject);
+      });
+    }
     // 值项过滤掉自身
     if (this.model.editorItems) {
       this.model.editorItems = this.model.editorItems.filter(

package/src/controller/control/caption-bar/caption-bar.controller.ts

@@ -31,6 +31,9 @@ export class CaptionBarController
       this.state.caption = `${this.view.model.caption}${
         dataInfo ? `-${dataInfo}` : ''
       }`;
+      if (this.view.modal.mode === 'ROUTE') {
+        ibiz.util.setBrowserTitle(this.state.caption);
+      }
     });
   }
 }

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

@@ -361,6 +361,7 @@ export class GridController<
         );
       }
     }
+    this.calcColumnFixed();
   }
 
   async afterLoad(
@@ -733,6 +734,7 @@ export class GridController<
               caption: column.caption!,
               hidden: !!column.hideDefault || !!column.hiddenDataItem,
               uaColumn: column.columnType === 'UAGRIDCOLUMN',
+              adaptive: column.widthUnit === 'STAR',
             });
           }
         },
@@ -754,7 +756,11 @@ export class GridController<
     );
     const allNum = showColumns.length;
     const { frozenFirstColumn, frozenLastColumn } = this.model;
+    this.hasAdaptiveColumn = false;
     showColumns.forEach((column, index) => {
+      if (column.adaptive) {
+        this.hasAdaptiveColumn = true;
+      }
       if (column.uaColumn) {
         column.fixed = index + 1 <= Math.floor(allNum / 2) ? 'left' : 'right';
       } else if (frozenFirstColumn && index < frozenFirstColumn) {
@@ -1308,6 +1314,7 @@ export class GridController<
    */
   setColumnVisible(columnState: IColumnState): void {
     columnState.hidden = !columnState.hidden;
+    this.calcColumnFixed();
     this.saveColumnStates();
   }
 
@@ -1326,6 +1333,7 @@ export class GridController<
     }
     if (data.columnstates) {
       this.state.columnStates = data.columnstates;
+      this.calcColumnFixed();
     } else {
       this.initColumnStates();
     }
@@ -1349,6 +1357,7 @@ export class GridController<
       // 移除元素从旧位置，将元素插入到新位置
       this.state.columnStates.splice(oldIndex, 1);
       this.state.columnStates.splice(newIndex, 0, columnState);
+      this.calcColumnFixed();
       // 存本地缓存
       this.saveColumnStates();
     }

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -92,6 +92,12 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @returns {*}  {Promise<void>}
    */
   async init(): Promise<void> {
+    const hasVisibleLogic = !!this.model.panelItemGroupLogics?.find(
+      logic => logic.logicCat === 'PANELVISIBLE',
+    );
+    if (hasVisibleLogic) {
+      this.state.visible = false;
+    }
     await this.onInit();
   }
 

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

@@ -129,7 +129,12 @@ export class ToolbarController<
       },
       { childrenFields: ['detoolbarItems'] },
     );
-    await this.calcButtonState();
+
+    if (!this.state.manualCalcButtonState) {
+      await this.calcButtonState();
+    } else {
+      await this.state.buttonsState.init();
+    }
   }
 
   /**

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

@@ -403,8 +403,8 @@ export class TreeController<
       }
     }
 
-    // 单选时，单击才会触发选中逻辑
-    if (this.state.singleSelect) {
+    // 单选时，单击才会触发选中逻辑,禁止选择的时候不触发
+    if (this.state.singleSelect && !nodeData._disableSelect) {
       // 选中相关处理
       const { selectedData } = this.state;
       // 选中里没有则添加，有则删除

package/src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.ts

@@ -419,17 +419,7 @@ export class TreeGridExNodeColumnController
     event: MouseEvent,
   ): Promise<void> {
     const actionId = detail.uiactionId;
-    await UIActionUtil.execAndResolved(
-      actionId!,
-      {
-        context: this.context,
-        params: this.params,
-        data: [row.data],
-        view: this.treeGrid.view,
-        event,
-      },
-      detail.appId,
-    );
+    await this.treeGrid.doUIAction(actionId!, row.data, event, detail.appId);
   }
 
   /**

package/src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts

@@ -5,7 +5,6 @@ import {
   IUIActionGroup,
   IUIActionGroupDetail,
 } from '@ibiz/model-core';
-import { UIActionUtil } from '../../../../../ui-action';
 import { ButtonContainerState, UIActionButtonState } from '../../../../utils';
 import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-column.controller';
 import { ITreeGridExRowState } from '../../../../../interface';
@@ -128,17 +127,7 @@ export class TreeGridExUAColumnController extends TreeGridExColumnController<IDE
     event: MouseEvent,
   ): Promise<void> {
     const actionId = detail.uiactionId;
-    await UIActionUtil.execAndResolved(
-      actionId!,
-      {
-        context: this.context,
-        params: this.params,
-        data: [row.data],
-        view: this.treeGrid.view,
-        event,
-      },
-      detail.appId,
-    );
+    await this.treeGrid.doUIAction(actionId!, row.data, event, detail.appId);
   }
 
   gridStateNotify(row: TreeGridExRowState, state: TreeGridExNotifyState): void {

package/src/controller/utils/button-state/button-container.state.ts

@@ -65,5 +65,13 @@ export class ButtonContainerState implements IButtonContainerState {
     );
   }
 
+  async init(): Promise<void> {
+    await Promise.all(
+      this.children.map(child => {
+        return child.init();
+      }),
+    );
+  }
+
   [p: string]: any;
 }

package/src/controller/utils/button-state/ui-action-button.state.ts

@@ -88,7 +88,7 @@ export class UIActionButtonState implements IButtonState {
    * @protected
    * @return {*}
    */
-  protected async init(): Promise<void> {
+  async init(): Promise<void> {
     if (!this.uiActionId) {
       this.isInit = true;
       return;
@@ -114,6 +114,11 @@ export class UIActionButtonState implements IButtonState {
       this.visible = false;
     }
 
+    if ([2, 6].includes(noPrivDisplayMode!) && this.dataAccessAction) {
+      // 有权限标识且无权限隐藏的，先隐藏
+      this.visible = false;
+    }
+
     // 数据目标不为空，和一些要数据的预置界面行为，没数据的时候禁用
     if (
       (actionTarget && actionTarget !== 'NONE') ||

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

@@ -84,9 +84,21 @@ export class ViewEngineBase implements IViewEngine {
    * @param {IViewController} view 视图控制器
    */
   constructor(protected view: IViewController) {
+    this.init();
     this.initViewState();
   }
 
+  /**
+   * 引擎内部初始化
+   *
+   * @author chitanda
+   * @date 2024-02-05 22:02:12
+   * @protected
+   */
+  protected init(): void {
+    // 引擎初始化
+  }
+
   async onCreated(): Promise<void> {
     const { childNames } = this.view;
     childNames.push('captionbar', 'toolbar');

package/src/interface/controller/common/button-state/i-button-container.state.ts

@@ -50,5 +50,13 @@ export interface IButtonContainerState {
    */
   update(data?: IData, appDeId?: string): Promise<void>;
 
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2024-02-05 06:36:18
+   * @return {*}  {Promise<void>}
+   */
+  init(): Promise<void>;
+
   [p: string]: any;
 }

package/src/interface/controller/common/button-state/i-button.state.ts

@@ -55,4 +55,12 @@ export interface IButtonState {
    * @return {*}  {Promise<void>}
    */
   update(data?: IData, appDeId?: string): Promise<void>;
+
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2024-02-05 06:37:06
+   * @return {*}  {Promise<void>}
+   */
+  init(): Promise<void>;
 }

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

@@ -190,6 +190,14 @@ export interface IColumnState {
    * @type {('left' | 'right')}
    */
   fixed?: 'left' | 'right';
+
+  /**
+   * 是否是自适应列
+   * @author lxm
+   * @date 2024-02-05 01:51:07
+   * @type {boolean}
+   */
+  adaptive?: boolean;
 }
 
 /**

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

@@ -26,6 +26,14 @@ export interface IToolbarState extends IControlState {
    * @type {ExtraButtons}
    */
   extraButtons: IExtraButtons;
+
+  /**
+   * 手动计算按钮状态（工具栏自身默认不计算）
+   * @author lxm
+   * @date 2024-02-05 06:02:49
+   * @type {boolean}
+   */
+  manualCalcButtonState: boolean;
 }
 
 /**

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

@@ -188,6 +188,14 @@ export interface ITreeNodeData {
    */
   _textHtml?: string;
 
+  /**
+   * 是否禁止选择
+   * @author lxm
+   * @date 2024-02-07 09:28:14
+   * @type {boolean}
+   */
+  _disableSelect?: boolean;
+
   /**
    * 作为实体数据时的主键
    * @author lxm

package/src/service/vo/tree-node-data/tree-node-data.ts

@@ -42,6 +42,8 @@ export abstract class TreeNodeData implements ITreeNodeData {
 
   _textHtml?: string;
 
+  _disableSelect?: boolean;
+
   constructor(
     model: IDETreeNode,
     parentNodeData: ITreeNodeData | undefined,
@@ -50,6 +52,7 @@ export abstract class TreeNodeData implements ITreeNodeData {
     this._leaf = opts.leaf === true;
     this._parent = parentNodeData;
     this._nodeType = model.treeNodeType!;
+    this._disableSelect = model.disableSelect === true;
 
     // 所有节点都要继承父的上下文，如果父存在则复制父的资源上下文，否则返回空对象。
     if (this._parent) {

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

@@ -38,12 +38,14 @@ export class BackendUIActionProvider extends UIActionProviderBase {
     // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
     const frontPSAppView = action.frontAppViewId;
     if (frontPSAppView) {
+      //  解析自定义 视图 option 参数
+      const options = this.handleViewOptionParams(resultParams);
       const res: IModalData | undefined = await ibiz.commands.execute(
         OpenAppViewCommand.TAG,
         frontPSAppView,
         resultContext,
         resultParams,
-        { event },
+        { event, ...options },
       );
       if (!res?.ok) {
         actionResult.cancel = true;

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

@@ -88,28 +88,6 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     return actionResult;
   }
 
-  /**
-   * 处理打开视图配置自定义参数 modalOption
-   *
-   * @author zk
-   * @date 2024-02-01 01:02:28
-   * @param {IData} param
-   * @return {*}  {IData}
-   * @memberof FrontUIActionProvider
-   */
-  handleViewOptionParams(param: IData): IData {
-    if (param.modaloption) {
-      try {
-        const modalOption = JSON.parse(param.modaloption);
-        delete param.modaloption;
-        return { modalOption };
-      } catch (error) {
-        ibiz.log.error(`视图参数modalOption 解析失败：${error}`);
-      }
-    }
-    return {};
-  }
-
   /**
    * 处理模式：用户自定义
    * @author lxm

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

@@ -362,4 +362,26 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
       }) as string;
     }
   }
+
+  /**
+   * 处理打开视图配置自定义参数 modalOption
+   *
+   * @author zk
+   * @date 2024-02-01 01:02:28
+   * @param {IData} param
+   * @return {*}  {IData}
+   * @memberof FrontUIActionProvider
+   */
+  handleViewOptionParams(param: IData): IData {
+    if (param.modaloption) {
+      try {
+        const modalOption = JSON.parse(param.modaloption);
+        delete param.modaloption;
+        return { modalOption };
+      } catch (error) {
+        ibiz.log.error(`视图参数modalOption 解析失败：${error}`);
+      }
+    }
+    return {};
+  }
 }

package/src/utils/index.ts

@@ -6,6 +6,7 @@ export {
   toLocalOpenWFRedirectView,
   openRedirectView,
   getDERedirectToView,
+  parseViewProtocol,
 } from './open-redirect-view/open-redirect-view';
 export * from './verify';
 export { LayoutPanelUtil } from './layout-panel-util/layout-panel-util';

package/src/utils/nav-params/nav-params.ts

@@ -1,5 +1,5 @@
 import { INavigateParam } from '@ibiz/model-core';
-import { isEmpty } from 'lodash-es';
+import { isEmpty, isNil } from 'lodash-es';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 
 /**
@@ -122,7 +122,7 @@ export function convertNavDataByArray(
             key.slice(2, -1).toLowerCase(),
           );
           if (find) {
-            valueStr = valueStr.replace(key, `${value}`);
+            valueStr = valueStr.replace(key, `${isNil(value) ? '' : value}`);
           }
         });
         result[naviData.key!.toLowerCase()] = valueStr;