@oinone/kunlun-vue-admin-base 6.3.0 → 6.3.2

package/dist/types/src/file/excel/typing/index.d.ts

@@ -7,7 +7,9 @@ export interface ExcelExportTask extends IdModel {
     workbookDefinition?: ExcelWorkDefinition;
     conditionWrapper?: QueryWrapper;
     exportMethod?: ExcelExportMethodEnum;
-    selectedFields?: IModelField[];
+    selectedFields?: (IModelField & {
+        optionLabel?: string;
+    })[];
     requestId?: string;
     sync?: boolean;
 }

package/dist/types/src/view/search/SearchWidget.d.ts

@@ -40,4 +40,5 @@ export declare class SearchWidget extends BaseSearchWidget {
     protected onSelectSearchPrefer(value: UserSearchPrefer): void;
     protected onUnselectSearchPrefer(): Promise<void>;
     protected $$mounted(): void;
+    protected childrenInvisibleProcess(): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.3.0",
+  "version": "6.3.2",
   "main": "index.ts",
   "scripts": {
     "prebuild": "rimraf dist",
@@ -14,13 +14,13 @@
     "doc": "typedoc --out docs src/index.ts"
   },
   "dependencies": {
-    "@oinone/kunlun-vue-admin-layout": "6.3.0",
-    "@oinone/kunlun-vue-router": "6.3.0",
-    "@oinone/kunlun-vue-ui": "6.3.0",
-    "@oinone/kunlun-vue-ui-antd": "6.3.0",
-    "@oinone/kunlun-vue-ui-common": "6.3.0",
-    "@oinone/kunlun-vue-ui-el": "6.3.0",
-    "@oinone/kunlun-vue-widget": "6.3.0",
+    "@oinone/kunlun-vue-admin-layout": "6.3.2",
+    "@oinone/kunlun-vue-router": "6.3.2",
+    "@oinone/kunlun-vue-ui": "6.3.2",
+    "@oinone/kunlun-vue-ui-antd": "6.3.2",
+    "@oinone/kunlun-vue-ui-common": "6.3.2",
+    "@oinone/kunlun-vue-ui-el": "6.3.2",
+    "@oinone/kunlun-vue-widget": "6.3.2",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/field/transfer/ExportFieldTransfer.ts

@@ -30,7 +30,8 @@ export class ExportFieldTransfer extends FormTransferFieldWidget {
         return {
           ...target,
           displayName: f.label || target.displayName,
-          invisible: f.invisible
+          invisible: f.invisible,
+          optionLabel: f.template?.optionLabel
         };
       })
       .filter((v) => !!v && BooleanHelper.isFalse(v.invisible));
@@ -50,7 +51,8 @@ export class ExportFieldTransfer extends FormTransferFieldWidget {
         }
         return {
           ...o,
-          displayName: target.label || o.displayName
+          displayName: target.label || o.displayName,
+          optionLabel: target.template?.optionLabel
         };
       })
     );

package/src/file/excel/action/ExportWorkbookActionWidget.ts

@@ -1,4 +1,10 @@
-import { RuntimeContext, RuntimeServerAction, SubmitValue } from '@oinone/kunlun-engine';
+import {
+  ModelCache,
+  RuntimeContext,
+  RuntimeRelationField,
+  RuntimeServerAction,
+  SubmitValue
+} from '@oinone/kunlun-engine';
 import { ModelDefaultActionName } from '@oinone/kunlun-meta';
 import { Condition, getSessionPath, GQL } from '@oinone/kunlun-request';
 import { DEFAULT_TRUE_CONDITION } from '@oinone/kunlun-service';
@@ -25,7 +31,7 @@ export class ExportWorkbookActionWidget extends AbstractTaskAction<ExcelExportTa
     return BooleanHelper.isTrue(this.metadataRuntimeContext.viewAction?.template?.sync);
   }
 
-  protected generatorGQLByTask(task: ExcelExportTask, condition: string | Condition): Promise<string> {
+  protected async generatorGQLByTask(task: ExcelExportTask, condition: string | Condition): Promise<string> {
     let queryData = '{}';
     let rsql = condition;
     if (condition instanceof Condition) {
@@ -43,6 +49,11 @@ export class ExportWorkbookActionWidget extends AbstractTaskAction<ExcelExportTa
       : undefined;
 
     const modelName = this.model.name || 'excelExportTask';
+    const excelExportTaskModel = await ModelCache.get('file.ExcelExportTask');
+    const selectedFieldsField = excelExportTaskModel?.modelFields.find(
+      (v) => v.data === 'selectedFields'
+    ) as RuntimeRelationField;
+    const hasOptionLabel = selectedFieldsField.references === 'file.ExcelModelField';
     return GQL.mutation(`${modelName}Mutation`, 'createExportTask')
       .buildRequest((builder) => {
         builder.buildObjectParameter('data', (builder) => {
@@ -65,8 +76,11 @@ export class ExportWorkbookActionWidget extends AbstractTaskAction<ExcelExportTa
           }
           if (selectedFields?.length) {
             builder.buildArrayParameter('selectedFields', selectedFields, (builder, value) => {
-              builder.stringParameter('field', value.field);
+              builder.stringParameter('field', value.data);
               builder.stringParameter('displayName', value.displayName);
+              if (hasOptionLabel) {
+                builder.stringParameter('optionLabel', value.optionLabel);
+              }
             });
           }
         });
@@ -115,7 +129,7 @@ export class ExportWorkbookActionWidget extends AbstractTaskAction<ExcelExportTa
           workbookDefinition: {
             id: workbookId
           }
-        };
+        } as ExcelExportTask;
         break;
       }
       case ExcelExportMethodEnum.SELECT_TEMPLATE_FIELD: {

package/src/file/excel/typing/index.ts

@@ -9,7 +9,7 @@ export interface ExcelExportTask extends IdModel {
   workbookDefinition?: ExcelWorkDefinition;
   conditionWrapper?: QueryWrapper;
   exportMethod?: ExcelExportMethodEnum;
-  selectedFields?: IModelField[];
+  selectedFields?: (IModelField & { optionLabel?: string })[];
   requestId?: string;
   sync?: boolean;
 }

package/src/view/search/DefaultSearch.vue

@@ -260,39 +260,43 @@ export default defineComponent({
 
           const finalExpandSize = props.invisibleSearch ? props.foldSize + 1 : props.foldSize;
           appendFieldDslDefinition(fields, widgets, finalExpandSize, props.foldSize, props.cateFields);
-          hasExpandButton = fields.length > finalExpandSize;
-          if (hasExpandButton) {
-            fields = fields.slice(0, finalExpandSize);
-          }
-
-          if (!props.invisibleSearch) {
-            const searchActionBar: VNode[] = createSearchBar(false, {
-              hasExpandButton,
-              showSearchPrefer: props.showSearchPrefer,
-              onSearch,
-              onReset,
-              onExpand,
-              translate: props.translate,
-              preferProps: {
-                selected: props.selectedPrefer,
-                options: props.searchPreferOptions,
-                onLoad: props.onLoadSearchPreferOptions,
-                onCreate: props.onCreateSearchPrefer,
-                onUpdate: props.onUpdateSearchPrefer,
-                onRemove: props.onRemoveSearchPrefer,
-                onSelect: props.onSelectSearchPrefer,
-                onUnselect: props.onUnselectSearchPrefer
-              }
-            });
-            invisible = !fields.length;
+          if (fields.length) {
+            hasExpandButton = fields.length > finalExpandSize;
+            if (hasExpandButton) {
+              fields = fields.slice(0, finalExpandSize);
+            }
+            if (!props.invisibleSearch) {
+              const searchActionBar: VNode[] = createSearchBar(false, {
+                hasExpandButton,
+                showSearchPrefer: props.showSearchPrefer,
+                onSearch,
+                onReset,
+                onExpand,
+                translate: props.translate,
+                preferProps: {
+                  selected: props.selectedPrefer,
+                  options: props.searchPreferOptions,
+                  onLoad: props.onLoadSearchPreferOptions,
+                  onCreate: props.onCreateSearchPrefer,
+                  onUpdate: props.onUpdateSearchPrefer,
+                  onRemove: props.onRemoveSearchPrefer,
+                  onSelect: props.onSelectSearchPrefer,
+                  onUnselect: props.onUnselectSearchPrefer
+                }
+              });
+              invisible = !fields.length;
 
-            const searchBarCol = createSearchBarCol(
-              searchActionBar,
-              (props.foldSize - fields.length) * (DEFAULT_COLS / (props.foldSize + 1)),
-              invisible,
-              props.foldSize
-            );
-            fields.push(searchBarCol);
+              const searchBarCol = createSearchBarCol(
+                searchActionBar,
+                (props.foldSize - fields.length) * (DEFAULT_COLS / (props.foldSize + 1)),
+                invisible,
+                props.foldSize
+              );
+              fields.push(searchBarCol);
+            }
+          } else {
+            hasExpandButton = false;
+            fields = widgets;
           }
           defaultChildren.push(
             withDirectives(

package/src/view/search/SearchWidget.ts

@@ -9,9 +9,10 @@ import { getRouterInstance } from '@oinone/kunlun-router';
 import { BooleanHelper, NumberHelper } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { OioMessage } from '@oinone/kunlun-vue-ui-antd';
-import { Widget } from '@oinone/kunlun-vue-widget';
+import { isAllInvisible, Widget } from '@oinone/kunlun-vue-widget';
 import { toString } from 'lodash-es';
 import { BaseElementWidget, BaseSearchWidget } from '../../basic';
+import { DefaultRowWidget } from '../../container';
 import { UserPreferService } from '../../service';
 import { SEARCH_WIDGET, UserSearchPrefer, UserSearchPreferField } from '../../typing';
 import DefaultSearch from './DefaultSearch.vue';
@@ -244,4 +245,16 @@ export class SearchWidget extends BaseSearchWidget {
     super.$$mounted();
     this.isExpand = BooleanHelper.toBoolean(this.urlParameters.expand) || false;
   }
+
+  protected childrenInvisibleProcess(): boolean {
+    if (this.disabledExpand && !this.invisibleSearch) {
+      const children = this.getChildren();
+      const lastChild = children[children.length - 1];
+      if (children.length === 2 && lastChild instanceof DefaultRowWidget) {
+        return isAllInvisible(children.slice(0, children.length - 1));
+      }
+      return isAllInvisible(children);
+    }
+    return super.childrenInvisibleProcess();
+  }
 }