@oinone/kunlun-vue-admin-base 6.2.13 → 6.2.15

package/dist/types/src/field/transfer/FormTransferFieldWidget.d.ts

@@ -24,7 +24,7 @@ export declare class FormTransferFieldWidget extends FormM2MFieldSelectWidget {
     submit(submitValue: SubmitValue): Promise<Record<string, unknown> | undefined>;
     protected queryPage<T = Record<string, unknown>>(option: IQueryPageOption, variables?: ObjectValue, context?: ObjectValue): Promise<QueryPageResult<T>>;
     protected generatorFullOptions(content: any): ActiveRecord[];
-    protected originOptions: never[];
+    protected originOptions: ActiveRecord[];
     protected insertOptions(options: any, back?: boolean): void;
     protected backfillSelectedValues(): void;
     protected get leftColumns(): any;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.2.13",
+  "version": "6.2.15",
   "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.2.13",
-    "@oinone/kunlun-vue-router": "6.2.13",
-    "@oinone/kunlun-vue-ui": "6.2.13",
-    "@oinone/kunlun-vue-ui-antd": "6.2.13",
-    "@oinone/kunlun-vue-ui-common": "6.2.13",
-    "@oinone/kunlun-vue-ui-el": "6.2.13",
-    "@oinone/kunlun-vue-widget": "6.2.13",
+    "@oinone/kunlun-vue-admin-layout": "6.2.15",
+    "@oinone/kunlun-vue-router": "6.2.15",
+    "@oinone/kunlun-vue-ui": "6.2.15",
+    "@oinone/kunlun-vue-ui-antd": "6.2.15",
+    "@oinone/kunlun-vue-ui-common": "6.2.15",
+    "@oinone/kunlun-vue-ui-el": "6.2.15",
+    "@oinone/kunlun-vue-widget": "6.2.15",
     "@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/field/transfer/FormTransferFieldWidget.ts

@@ -218,7 +218,7 @@ export class FormTransferFieldWidget extends FormM2MFieldSelectWidget {
     return options;
   }
 
-  protected originOptions = [];
+  protected originOptions: ActiveRecord[] = [];
 
   protected insertOptions(options, back = false) {
     if (!options?.length) {
@@ -233,7 +233,7 @@ export class FormTransferFieldWidget extends FormM2MFieldSelectWidget {
     });
     this.options = this.generatorFullOptions(finalOptions);
     if (!back) {
-      this.originOptions = options;
+      this.originOptions = this.generatorFullOptions(options);
     }
   }
 

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;
 }