@oinone/kunlun-vue-admin-base 7.1.0 → 7.2.0

package/src/view/application-screen/gallery/AppsGalleryWidget.ts

@@ -3,7 +3,6 @@ import {
   Dialog,
   executeViewAction,
   FunctionMetadata,
-  GenericFunctionService,
   ModelCache,
   ModuleCache,
   type Pagination,
@@ -16,7 +15,6 @@ import {
   translateValueByKey,
   ViewCache
 } from '@oinone/kunlun-engine';
-import { Expression, type ExpressionRunParam } from '@oinone/kunlun-expression';
 import { type IModelField, ViewType } from '@oinone/kunlun-meta';
 import { Condition } from '@oinone/kunlun-request';
 import {
@@ -35,7 +33,6 @@ import { SPI } from '@oinone/kunlun-spi';
 import { appFinderSymbol } from '@oinone/kunlun-vue-admin-layout';
 import { OioNotification } from '@oinone/kunlun-vue-ui-antd';
 import { Widget, type WidgetSubjection } from '@oinone/kunlun-vue-widget';
-import { isNil } from 'lodash-es';
 import { BaseElementListViewWidget, BaseElementWidget } from '../../../basic';
 import { createRuntimeContextForWidget } from '../../../tags';
 import { onJumpCodeFuse, onJumpModelDesigner, onJumpUiDesignerHomePage } from '../../../util';
@@ -74,21 +71,6 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
 
   private bindAppHomepageDialogFormWidget!: FormWidget | undefined;
 
-  @Widget.Reactive()
-  private addFormViewData = {};
-
-  protected executeInvisibleExpress(invisible?: string | boolean) {
-    if (isNil(invisible)) {
-      return false;
-    }
-
-    if (typeof invisible === 'boolean') {
-      return invisible;
-    }
-
-    return !!Expression.run({ activeRecord: this.addFormViewData } as ExpressionRunParam, invisible, false);
-  }
-
   @Widget.Reactive()
   private moduleCategory = [];
 
@@ -113,38 +95,38 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
 
   @Widget.Reactive()
   protected get actionPermission(): ActionPermission {
-    const CreateAppAction = this.modelActions.find((a) => a.name === 'create');
-    const UpdateAppAction = this.modelActions.find((a) => a.name === 'update');
-    const UninstallAction = this.modelActions.find((a) => a.name === 'uninstall');
-    const InstallAction = this.modelActions.find((a) => a.name === 'install');
-    const BindHomepageAction = this.modelActions.find((a) => a.name === 'bindHomePage');
-    const DetailAction = this.modelActions.find((a) => a.name === 'apps_business_screen_detail');
+    const CreateAppAction = this.modelActions.find((a) => a.name === 'create' && !!a.actionType);
+    const UpdateAppAction = this.modelActions.find((a) => a.name === 'update' && !!a.actionType);
+    const UninstallAction = this.modelActions.find((a) => a.name === 'uninstall' && !!a.actionType);
+    const InstallAction = this.modelActions.find((a) => a.name === 'install' && !!a.actionType);
+    const BindHomepageAction = this.modelActions.find((a) => a.name === 'bindHomePage' && !!a.actionType);
+    const DetailAction = this.modelActions.find((a) => a.name === 'apps_business_screen_detail' && !!a.actionType);
 
-    const LikeAction = this.modelActions.find((a) => a.name === 'like');
-    const UnLikeAction = this.modelActions.find((a) => a.name === 'unLike');
+    const LikeAction = this.modelActions.find((a) => a.name === 'like' && !!a.actionType);
+    const UnLikeAction = this.modelActions.find((a) => a.name === 'unLike' && !!a.actionType);
 
     const ModelDesignerAction = this.modelActions.find(
-      (a) => a.name === 'homepage' && a.model === 'designer.DesignerModelDefinition'
+      (a) => a.name === 'homepage' && a.model === 'designer.DesignerModelDefinition' && !!a.actionType
     );
     const UiDesignerAction = this.modelActions.find(
-      (a) => a.name === 'homepage' && a.model === 'ui.designer.UiDesignerView'
+      (a) => a.name === 'homepage' && a.model === 'ui.designer.UiDesignerView' && !!a.actionType
     );
-    const PaasAction = this.modelActions.find((a) => a.name === 'PaasMenus_Menu_LowCodeMenu');
+    const PaasAction = this.modelActions.find((a) => a.name === 'PaasMenus_Menu_LowCodeMenu' && !!a.actionType);
 
     return {
-      hasCreateAppAction: !!CreateAppAction && !this.executeInvisibleExpress(CreateAppAction.invisible),
-      hasUpdateAppAction: !!UpdateAppAction && !this.executeInvisibleExpress(UpdateAppAction.invisible),
+      hasCreateAppAction: !!CreateAppAction,
+      hasUpdateAppAction: !!UpdateAppAction,
       hasUninstallAction: !!UninstallAction,
       hasInstallAction: !!InstallAction,
-      hasBindHomepageAction: !!BindHomepageAction && !this.executeInvisibleExpress(BindHomepageAction.invisible),
-      hasDetailAction: !!DetailAction && !this.executeInvisibleExpress(DetailAction.invisible),
+      hasBindHomepageAction: !!BindHomepageAction,
+      hasDetailAction: !!DetailAction,
 
-      hasLikeAction: !!LikeAction && !this.executeInvisibleExpress(LikeAction.invisible),
-      hasUnLikeAction: !!UnLikeAction && !this.executeInvisibleExpress(UnLikeAction.invisible),
+      hasLikeAction: !!LikeAction,
+      hasUnLikeAction: !!UnLikeAction,
 
-      hasModelDesignerAction: !!ModelDesignerAction && !this.executeInvisibleExpress(ModelDesignerAction.invisible),
-      hasUiDesignerAction: !!UiDesignerAction && !this.executeInvisibleExpress(UiDesignerAction.invisible),
-      hasPaasAction: !!PaasAction && !this.executeInvisibleExpress(PaasAction.invisible)
+      hasModelDesignerAction: !!ModelDesignerAction,
+      hasUiDesignerAction: !!UiDesignerAction,
+      hasPaasAction: !!PaasAction
     };
   }
 
@@ -153,21 +135,33 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
   protected get hasExportAction() {
     const actionNames = Object.keys(this.exportAction);
 
-    return actionNames.some(
-      (name) => !!this.exportAction[name] && !this.executeInvisibleExpress(this.exportAction[name].invisible)
-    );
+    return actionNames.some((name) => !!this.exportAction[name]);
   }
 
   @Widget.Reactive()
   protected get exportAction() {
     return {
-      exportModelAction: this.modelActions.find((a) => a.name === 'modelDesignerDialog') as RuntimeViewAction,
-      exportUiAction: this.modelActions.find((a) => a.name === 'uiDesignerDialog') as RuntimeViewAction,
-      exportWorkFlowAction: this.modelActions.find((a) => a.name === 'wfDesignerDialog') as RuntimeViewAction,
-      exportEipAction: this.modelActions.find((a) => a.name === 'eipDesignerDialog') as RuntimeViewAction,
-      exportDataAction: this.modelActions.find((a) => a.name === 'dataDesignerDialog') as RuntimeViewAction,
-      exportMicroFlowAction: this.modelActions.find((a) => a.name === 'mfDesignerDialog') as RuntimeViewAction,
-      exportPrintAction: this.modelActions.find((a) => a.name === 'printDesignerDialog') as RuntimeViewAction
+      exportModelAction: this.modelActions.find(
+        (a) => a.name === 'modelDesignerDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      exportUiAction: this.modelActions.find(
+        (a) => a.name === 'uiDesignerDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      exportWorkFlowAction: this.modelActions.find(
+        (a) => a.name === 'wfDesignerDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      exportEipAction: this.modelActions.find(
+        (a) => a.name === 'eipDesignerDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      exportDataAction: this.modelActions.find(
+        (a) => a.name === 'dataDesignerDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      exportMicroFlowAction: this.modelActions.find(
+        (a) => a.name === 'mfDesignerDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      exportPrintAction: this.modelActions.find(
+        (a) => a.name === 'printDesignerDialog' && !!a.actionType
+      ) as RuntimeViewAction
     };
   }
 
@@ -178,21 +172,33 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
   protected get hasImportAction() {
     const actionNames = Object.keys(this.importAction);
 
-    return actionNames.some(
-      (name) => !!this.importAction[name] && !this.executeInvisibleExpress(this.importAction[name].invisible)
-    );
+    return actionNames.some((name) => !!this.importAction[name]);
   }
 
   @Widget.Reactive()
   protected get importAction() {
     return {
-      importModelAction: this.modelActions.find((a) => a.name === 'modelDesignerImportDialog') as RuntimeViewAction,
-      importUiAction: this.modelActions.find((a) => a.name === 'uiDesignerImportDialog') as RuntimeViewAction,
-      importWorkFlowAction: this.modelActions.find((a) => a.name === 'wfDesignerImportDialog') as RuntimeViewAction,
-      importEipAction: this.modelActions.find((a) => a.name === 'eipDesignerImportDialog') as RuntimeViewAction,
-      importDataAction: this.modelActions.find((a) => a.name === 'dataDesignerImportDialog') as RuntimeViewAction,
-      importMicroFlowAction: this.modelActions.find((a) => a.name === 'mfDesignerImportDialog') as RuntimeViewAction,
-      importPrintAction: this.modelActions.find((a) => a.name === 'printDesignerImportDialog') as RuntimeViewAction
+      importModelAction: this.modelActions.find(
+        (a) => a.name === 'modelDesignerImportDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      importUiAction: this.modelActions.find(
+        (a) => a.name === 'uiDesignerImportDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      importWorkFlowAction: this.modelActions.find(
+        (a) => a.name === 'wfDesignerImportDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      importEipAction: this.modelActions.find(
+        (a) => a.name === 'eipDesignerImportDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      importDataAction: this.modelActions.find(
+        (a) => a.name === 'dataDesignerImportDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      importMicroFlowAction: this.modelActions.find(
+        (a) => a.name === 'mfDesignerImportDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      importPrintAction: this.modelActions.find(
+        (a) => a.name === 'printDesignerImportDialog' && !!a.actionType
+      ) as RuntimeViewAction
     };
   }
 
@@ -203,21 +209,33 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
   protected get hasSyncAction() {
     const actionNames = Object.keys(this.syncAction);
 
-    return actionNames.some(
-      (name) => !!this.syncAction[name] && !this.executeInvisibleExpress(this.syncAction[name].invisible)
-    );
+    return actionNames.some((name) => !!this.syncAction[name]);
   }
 
   @Widget.Reactive()
   protected get syncAction() {
     return {
-      syncModelAction: this.modelActions.find((a) => a.name === 'modelDesignerSyncDialog') as RuntimeViewAction,
-      syncUiAction: this.modelActions.find((a) => a.name === 'uiDesignerSyncDialog') as RuntimeViewAction,
-      syncWorkFlowAction: this.modelActions.find((a) => a.name === 'wfDesignerSyncDialog') as RuntimeViewAction,
-      syncEipAction: this.modelActions.find((a) => a.name === 'eipDesignerSyncDialog') as RuntimeViewAction,
-      syncDataAction: this.modelActions.find((a) => a.name === 'dataDesignerSyncDialog') as RuntimeViewAction,
-      syncMicroFlowAction: this.modelActions.find((a) => a.name === 'mfDesignerSyncDialog') as RuntimeViewAction,
-      syncPrintAction: this.modelActions.find((a) => a.name === 'printDesignerSyncDialog') as RuntimeViewAction
+      syncModelAction: this.modelActions.find(
+        (a) => a.name === 'modelDesignerSyncDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      syncUiAction: this.modelActions.find(
+        (a) => a.name === 'uiDesignerSyncDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      syncWorkFlowAction: this.modelActions.find(
+        (a) => a.name === 'wfDesignerSyncDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      syncEipAction: this.modelActions.find(
+        (a) => a.name === 'eipDesignerSyncDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      syncDataAction: this.modelActions.find(
+        (a) => a.name === 'dataDesignerSyncDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      syncMicroFlowAction: this.modelActions.find(
+        (a) => a.name === 'mfDesignerSyncDialog' && !!a.actionType
+      ) as RuntimeViewAction,
+      syncPrintAction: this.modelActions.find(
+        (a) => a.name === 'printDesignerSyncDialog' && !!a.actionType
+      ) as RuntimeViewAction
     };
   }
 
@@ -295,9 +313,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
             displayName: translateValueByKey('模型导入'),
             icon: 'oinone-a-moxingdaoru3x',
 
-            visible: (record) =>
-              !!this.importAction.importModelAction &&
-              !this.executeInvisibleExpress(this.importAction.importModelAction.invisible),
+            visible: (record) => !!this.importAction.importModelAction,
             exe: (record) => {
               executeViewAction(this.importAction.importModelAction!, undefined, undefined, {
                 module: record.module,
@@ -308,9 +324,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('界面导入'),
             icon: 'oinone-a-jiemiandaoru2x',
-            visible: (record) =>
-              !!this.importAction.importUiAction &&
-              !this.executeInvisibleExpress(this.importAction.importUiAction.invisible),
+            visible: (record) => !!this.importAction.importUiAction,
             exe: (record) => {
               executeViewAction(this.importAction.importUiAction!, undefined, undefined, {
                 module: record.module,
@@ -321,9 +335,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('流程导入'),
             icon: 'oinone-a-liuchengdaoru2x',
-            visible: (record) =>
-              !!this.importAction.importWorkFlowAction &&
-              !this.executeInvisibleExpress(this.importAction.importWorkFlowAction.invisible),
+            visible: (record) => !!this.importAction.importWorkFlowAction,
             exe: (record) => {
               executeViewAction(this.importAction.importWorkFlowAction!, undefined, undefined, {
                 module: record.module,
@@ -334,9 +346,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('微流导入'),
             icon: 'oinone-a-liuchengdaoru2x',
-            visible: (record) =>
-              !!this.importAction.importMicroFlowAction &&
-              !this.executeInvisibleExpress(this.importAction.importMicroFlowAction.invisible),
+            visible: (record) => !!this.importAction.importMicroFlowAction,
             exe: (record) => {
               executeViewAction(this.importAction.importMicroFlowAction!, undefined, undefined, {
                 module: record.module,
@@ -347,9 +357,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('集成导入'),
             icon: 'oinone-a-jichengdaoru2x',
-            visible: (record) =>
-              !!this.importAction.importEipAction &&
-              !this.executeInvisibleExpress(this.importAction.importEipAction.invisible),
+            visible: (record) => !!this.importAction.importEipAction,
             exe: (record) => {
               executeViewAction(this.importAction.importEipAction!, undefined, undefined, {
                 module: record.module,
@@ -360,9 +368,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('数据可视化导入'),
             icon: 'oinone-a-shujukeshihuadaoru2x',
-            visible: (record) =>
-              !!this.importAction.importDataAction &&
-              !this.executeInvisibleExpress(this.importAction.importDataAction.invisible),
+            visible: (record) => !!this.importAction.importDataAction,
             exe: (record) => {
               executeViewAction(this.importAction.importDataAction!, undefined, undefined, {
                 module: record.module,
@@ -373,9 +379,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('打印导入'),
             icon: 'oinone-a-jiemiandaoru2x',
-            visible: (record) =>
-              !!this.importAction.importPrintAction &&
-              !this.executeInvisibleExpress(this.importAction.importPrintAction.invisible),
+            visible: (record) => !!this.importAction.importPrintAction,
             exe: (record) => {
               executeViewAction(this.importAction.importPrintAction!, undefined, undefined, {
                 module: record.module,
@@ -394,9 +398,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('模型导出'),
             icon: 'oinone-a-moxingdaoru3x',
-            visible: (record) =>
-              !!this.exportAction.exportModelAction &&
-              !this.executeInvisibleExpress(this.exportAction.exportModelAction.invisible),
+            visible: (record) => !!this.exportAction.exportModelAction,
             exe: (record) => {
               executeViewAction(this.exportAction.exportModelAction!, undefined, undefined, {
                 module: record.module,
@@ -407,9 +409,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('界面导出'),
             icon: 'oinone-a-jiemiandaoru2x',
-            visible: (record) =>
-              !!this.exportAction.exportUiAction &&
-              !this.executeInvisibleExpress(this.exportAction.exportUiAction.invisible),
+            visible: (record) => !!this.exportAction.exportUiAction,
             exe: (record) => {
               executeViewAction(this.exportAction.exportUiAction!, undefined, undefined, {
                 module: record.module,
@@ -420,9 +420,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('流程导出'),
             icon: 'oinone-a-liuchengdaoru2x',
-            visible: (record) =>
-              !!this.exportAction.exportWorkFlowAction &&
-              !this.executeInvisibleExpress(this.exportAction.exportWorkFlowAction.invisible),
+            visible: (record) => !!this.exportAction.exportWorkFlowAction,
             exe: (record) => {
               executeViewAction(this.exportAction.exportWorkFlowAction!, undefined, undefined, {
                 module: record.module,
@@ -433,9 +431,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('微流导出'),
             icon: 'oinone-a-liuchengdaoru2x',
-            visible: (record) =>
-              !!this.exportAction.exportMicroFlowAction &&
-              !this.executeInvisibleExpress(this.exportAction.exportMicroFlowAction.invisible),
+            visible: (record) => !!this.exportAction.exportMicroFlowAction,
             exe: (record) => {
               executeViewAction(this.exportAction.exportMicroFlowAction!, undefined, undefined, {
                 module: record.module,
@@ -446,9 +442,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('集成导出'),
             icon: 'oinone-a-jichengdaoru2x',
-            visible: (record) =>
-              !!this.exportAction.exportEipAction &&
-              !this.executeInvisibleExpress(this.exportAction.exportEipAction.invisible),
+            visible: (record) => !!this.exportAction.exportEipAction,
             exe: (record) => {
               executeViewAction(this.exportAction.exportEipAction!, undefined, undefined, {
                 module: record.module,
@@ -459,9 +453,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('数据可视化导出'),
             icon: 'oinone-a-shujukeshihuadaoru2x',
-            visible: (record) =>
-              !!this.exportAction.exportDataAction &&
-              !this.executeInvisibleExpress(this.exportAction.exportDataAction.invisible),
+            visible: (record) => !!this.exportAction.exportDataAction,
             exe: (record) => {
               executeViewAction(this.exportAction.exportDataAction!, undefined, undefined, {
                 module: record.module,
@@ -472,9 +464,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('打印导出'),
             icon: 'oinone-a-jiemiandaoru2x',
-            visible: (record) =>
-              !!this.exportAction.exportPrintAction &&
-              !this.executeInvisibleExpress(this.exportAction.exportPrintAction.invisible),
+            visible: (record) => !!this.exportAction.exportPrintAction,
             exe: (record) => {
               executeViewAction(this.exportAction.exportPrintAction!, undefined, undefined, {
                 module: record.module,
@@ -493,9 +483,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('模型部署'),
             icon: 'oinone-a-moxingdaoru3x',
-            visible: (record) =>
-              !!this.syncAction.syncModelAction &&
-              !this.executeInvisibleExpress(this.syncAction.syncModelAction.invisible),
+            visible: (record) => !!this.syncAction.syncModelAction,
             exe: (record) => {
               executeViewAction(this.syncAction.syncModelAction!, undefined, undefined, {
                 module: record.module,
@@ -506,8 +494,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('界面部署'),
             icon: 'oinone-a-jiemiandaoru2x',
-            visible: (record) =>
-              !!this.syncAction.syncUiAction && !this.executeInvisibleExpress(this.syncAction.syncUiAction.invisible),
+            visible: (record) => !!this.syncAction.syncUiAction,
             exe: (record) => {
               executeViewAction(this.syncAction.syncUiAction!, undefined, undefined, {
                 module: record.module,
@@ -518,9 +505,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('流程部署'),
             icon: 'oinone-a-liuchengdaoru2x',
-            visible: (record) =>
-              !!this.syncAction.syncWorkFlowAction &&
-              !this.executeInvisibleExpress(this.syncAction.syncWorkFlowAction.invisible),
+            visible: (record) => !!this.syncAction.syncWorkFlowAction,
             exe: (record) => {
               executeViewAction(this.syncAction.syncWorkFlowAction!, undefined, undefined, {
                 module: record.module,
@@ -531,9 +516,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('微流部署'),
             icon: 'oinone-a-liuchengdaoru2x',
-            visible: (record) =>
-              !!this.syncAction.syncMicroFlowAction &&
-              !this.executeInvisibleExpress(this.syncAction.syncMicroFlowAction.invisible),
+            visible: (record) => !!this.syncAction.syncMicroFlowAction,
             exe: (record) => {
               executeViewAction(this.syncAction.syncMicroFlowAction!, undefined, undefined, {
                 module: record.module,
@@ -544,8 +527,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('集成部署'),
             icon: 'oinone-a-jichengdaoru2x',
-            visible: (record) =>
-              !!this.syncAction.syncEipAction && !this.executeInvisibleExpress(this.syncAction.syncEipAction.invisible),
+            visible: (record) => !!this.syncAction.syncEipAction,
             exe: (record) => {
               executeViewAction(this.syncAction.syncEipAction!, undefined, undefined, {
                 module: record.module,
@@ -556,9 +538,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('数据可视化部署'),
             icon: 'oinone-a-shujukeshihuadaoru2x',
-            visible: (record) =>
-              !!this.syncAction.syncDataAction &&
-              !this.executeInvisibleExpress(this.syncAction.syncDataAction.invisible),
+            visible: (record) => !!this.syncAction.syncDataAction,
             exe: (record) => {
               executeViewAction(this.syncAction.syncDataAction!, undefined, undefined, {
                 module: record.module,
@@ -569,9 +549,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
           {
             displayName: translateValueByKey('打印部署'),
             icon: 'oinone-a-jiemiandaoru2x',
-            visible: (record) =>
-              !!this.syncAction.syncPrintAction &&
-              !this.executeInvisibleExpress(this.syncAction.syncPrintAction.invisible),
+            visible: (record) => !!this.syncAction.syncPrintAction,
             exe: (record) => {
               executeViewAction(this.syncAction.syncPrintAction!, undefined, undefined, {
                 module: record.module,
@@ -719,7 +697,7 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
     );
     this.fetchTree((this.searchBody || {}) as any);
     result.content?.forEach((a: any) => {
-      a.stateDisplayName = AppStateDisplayNameENum[a.state] || '';
+      a.stateDisplayName = translateValueByKey(AppStateDisplayNameENum[a.state] || '');
     });
     return result;
   }
@@ -873,9 +851,6 @@ export class AppsGalleryWidget extends BaseElementListViewWidget {
     ViewCache.compile(EditAppModelModel, CreateAppForm, CreateAppFormXml);
     ViewCache.compile(EditAppModelModel, UpdateAppForm, UpdateAppFormXml);
     ViewCache.compile(EditAppModelModel, BindAppHomepageForm, BindAppHomepageFormXml);
-
-    this.addFormViewData =
-      (await GenericFunctionService.INSTANCE.simpleExecuteByFun(this.model.model, 'construct', {})) || {};
   }
 }
 

package/src/view/application-screen/gallery/Gallery.vue

@@ -304,8 +304,8 @@ export default defineComponent({
       translateValueByKey,
       moreActionItemNode,
 
-      appTag: `${genStaticPath('标签1_1651399484151.png')}`,
-      moduleTag: `${genStaticPath('标签2_1651399538680.png')}`
+      appTag: `${genStaticPath('tag1.png')}`,
+      moduleTag: `${genStaticPath('tag2.png')}`
     };
   }
 });

package/src/view/company-setting/CompanySetting.vue

@@ -4,17 +4,17 @@
       <!-- 企业信息 -->
       <div class="oio-group oio-default-group">
         <div class="oio-group-title-wrapper">
-          <div class="oio-group-title">{{ translateValueByKey('企业信息') }}</div>
+          <div class="oio-group-title">{{ $translate('企业信息') }}</div>
         </div>
 
         <oio-form>
-          <oio-form-item :label="translateValueByKey('企业名称')">
+          <oio-form-item :label="$translate('企业名称')">
             <oio-input v-model:value="companySetting.partnerName"></oio-input>
           </oio-form-item>
-          <oio-form-item :label="translateValueByKey('企业官网')">
+          <oio-form-item :label="$translate('企业官网')">
             <oio-input v-model:value="companySetting.officialWebsite"></oio-input>
           </oio-form-item>
-          <oio-form-item :label="translateValueByKey('企业slogan')">
+          <oio-form-item :label="$translate('企业slogan')">
             <oio-input v-model:value="companySetting.slogan"></oio-input>
           </oio-form-item>
         </oio-form>
@@ -23,11 +23,11 @@
       <!-- LOGO -->
       <div class="oio-group oio-default-group">
         <div class="oio-group-title-wrapper">
-          <div class="oio-group-title">{{ translateValueByKey('LOGO设置') }}</div>
+          <div class="oio-group-title">{{ $translate('LOGO设置') }}</div>
         </div>
         <!-- 业务应用导航栏logo -->
         <div>
-          <div class="title">{{ translateValueByKey('业务应用导航栏logo') }}</div>
+          <div class="title">{{ $translate('业务应用导航栏logo') }}</div>
           <div class="flex-s-c">
             <div class="margin-right">
               <div class="flex-row-start-center">
@@ -62,13 +62,13 @@
             </div>
           </div>
           <div class="tips">
-            {{ translateValueByKey('请上传jpg、png格式的图片，文件大小不超过5MB') }}
+            {{ $translate('请上传jpg、png格式的图片，文件大小不超过5MB') }}
           </div>
         </div>
 
         <!-- 浏览器logo -->
         <div class="margin-top">
-          <div class="title">{{ translateValueByKey('浏览器logo') }}</div>
+          <div class="title">{{ $translate('浏览器logo') }}</div>
           <upload-img
             limitSize="5"
             limit-file-extensions=".jpg,.png"
@@ -79,26 +79,28 @@
           >
           </upload-img>
           <div class="tips">
-            {{ translateValueByKey('请上传jpg、png格式的图片，文件大小不超过5MB') }}
+            {{ $translate('请上传jpg、png格式的图片，文件大小不超过5MB') }}
           </div>
         </div>
 
         <div class="flex-s-c margin-top" style="margin-top: var(--oio-margin)">
-          <oio-button class="margin-right" @click="onBack">{{ translateValueByKey('返回') }}</oio-button>
-          <oio-button type="primary" @click="onSaveCompanySetting">{{ translateValueByKey('发布') }}</oio-button>
+          <oio-button class="margin-right" @click="onBack">{{ $translate('返回') }}</oio-button>
+          <oio-button type="primary" @click="onSaveCompanySetting">{{ $translate('发布') }}</oio-button>
         </div>
       </div>
     </div>
   </div>
 </template>
 <script lang="ts" setup>
-import { translateValueByKey } from '@oinone/kunlun-engine';
 import { OioButton, OioForm, OioFormItem, OioInput, OioTooltipHelp } from '@oinone/kunlun-vue-ui-antd';
 import { defineProps, ref, watchEffect } from 'vue';
 import UploadImg from '../../components/upload/UploadImg.vue';
 
-const props =
-  defineProps<{ companySetting: Record<string, any>; onSaveCompanySetting: () => void; goBack: () => void }>();
+const props = defineProps<{
+  companySetting: Record<string, any>;
+  onSaveCompanySetting: () => void;
+  goBack: () => void;
+}>();
 
 // app finder logo
 const appSideLogoInfo = ref<Record<string, any>>({});

package/src/view/detail/DefaultDetail.vue

@@ -18,6 +18,10 @@ export default defineComponent({
     template: {
       type: Object as PropType<DslRenderDefinition>
     },
+    inline: {
+      type: Boolean,
+      default: undefined
+    },
     formData: {
       type: Object,
       default: () => ({})
@@ -28,15 +32,12 @@ export default defineComponent({
       DefaultForm,
       {
         ...PropRecordHelper.convert(OioFormProps, CastHelper.cast(this)),
-        ...PropRecordHelper.collectionBasicProps(
-          this.$attrs,
-          StringHelper.append([`${DEFAULT_PREFIX}-default-detail`], CastHelper.cast(this.template?.class)),
-          CastHelper.cast(this.template?.style)
-        ),
+        ...PropRecordHelper.collectionBasicProps(this.$attrs, [`${DEFAULT_PREFIX}-default-detail`]),
         wrapperClassName: StringHelper.append([`${DEFAULT_PREFIX}-default-detail-wrapper`], this.wrapperClassName).join(
           ' '
         ),
         template: this.template,
+        inline: this.inline,
         formData: this.formData
       },
       PropRecordHelper.collectionSlots(this.$slots, [

package/src/view/detail/DetailWidget.ts

@@ -1,6 +1,7 @@
 import { ViewType } from '@oinone/kunlun-meta';
+import { BooleanHelper } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
-import { isDetailViewState, type OioAnyViewState } from '@oinone/kunlun-vue-widget';
+import { isDetailViewState, type OioAnyViewState, Widget } from '@oinone/kunlun-vue-widget';
 import { BaseElementWidget, BaseFormWidget } from '../../basic';
 import { DETAIL_WIDGET } from '../../typing';
 import DefaultDetail from './DefaultDetail.vue';
@@ -18,9 +19,19 @@ export class DetailWidget extends BaseFormWidget {
     return this;
   }
 
+  @Widget.Reactive()
+  protected get disabledRelationQuery() {
+    return BooleanHelper.toBoolean(this.getDsl().disabledRelationQuery);
+  }
+
   protected $$initViewState(state: OioAnyViewState): void {
     if (isDetailViewState(state) && !state.detail) {
       state.detail = this.currentHandle;
+      if (this.inline) {
+        state.disabledRelationQuery = this.disabledRelationQuery;
+      } else if (this.globalState) {
+        this.globalState.disabledRelationQuery = this.disabledRelationQuery;
+      }
     }
   }
 }

package/src/view/gallery/GalleryWidget.ts

@@ -1,4 +1,4 @@
-import { type DslDefinition, DslDefinitionType } from '@oinone/kunlun-dsl';
+import { type DslDefinition, DslDefinitionType, ElementDslDefinition } from '@oinone/kunlun-dsl';
 import { getCurrentThemeSize } from '@oinone/kunlun-engine';
 import { ViewType } from '@oinone/kunlun-meta';
 import { BooleanHelper, NumberHelper, Optional } from '@oinone/kunlun-shared';
@@ -143,12 +143,12 @@ export class GalleryWidget extends BaseElementListViewWidget {
     return {
       dslNodeType: DslDefinitionType.ELEMENT,
       widget: 'ViewControl',
-      widgets: this.viewControlChildren
+      widgets: this.viewControlChildren.map((v) => ({ ...v, key: v.widget }))
     };
   }
 
   @Widget.Reactive()
-  protected get viewControlChildren(): DslDefinition[] {
+  protected get viewControlChildren(): ElementDslDefinition[] {
     const controls: { enabled: boolean; widget: string; props?: Record<string, unknown> }[] = [
       {
         enabled: this.sortable,