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

package/dist/types/src/field/form/html/expressionRichtext/ExpressionRichText.vue.d.ts

@@ -17,6 +17,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<string[]>;
         default: () => never[];
     };
+    readonly: {
+        type: BooleanConstructor;
+    };
 }, {
     editorStyle: import("vue").ComputedRef<CSSStyle>;
     editorId: string;
@@ -55,7 +58,11 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<string[]>;
         default: () => never[];
     };
+    readonly: {
+        type: BooleanConstructor;
+    };
 }>>, {
     richTextToolbarExcludeKeys: string[];
+    readonly: boolean;
 }>;
 export default _default;

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.3.1",
   "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.3.1",
+    "@oinone/kunlun-vue-router": "6.3.1",
+    "@oinone/kunlun-vue-ui": "6.3.1",
+    "@oinone/kunlun-vue-ui-antd": "6.3.1",
+    "@oinone/kunlun-vue-ui-common": "6.3.1",
+    "@oinone/kunlun-vue-ui-el": "6.3.1",
+    "@oinone/kunlun-vue-widget": "6.3.1",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",
@@ -29,20 +29,20 @@
     "smooth-signature": "1.0.15"
   },
   "devDependencies": {
-    "@oinone/kunlun-dsl": "~6.2.0",
-    "@oinone/kunlun-engine": "~6.2.0",
-    "@oinone/kunlun-environment": "~6.2.0",
-    "@oinone/kunlun-event": "~6.2.0",
-    "@oinone/kunlun-expression": "~6.2.0",
-    "@oinone/kunlun-meta": "~6.2.0",
-    "@oinone/kunlun-request": "~6.2.0",
-    "@oinone/kunlun-router": "~6.2.0",
-    "@oinone/kunlun-service": "~6.2.0",
-    "@oinone/kunlun-shared": "~6.2.0",
-    "@oinone/kunlun-spi": "~6.2.0",
-    "@oinone/kunlun-state": "~6.2.0",
-    "@oinone/kunlun-theme": "~6.2.0",
-    "@oinone/kunlun-vue-expression": "~6.2.0",
+    "@oinone/kunlun-dsl": "~6.3.0",
+    "@oinone/kunlun-engine": "~6.3.0",
+    "@oinone/kunlun-environment": "~6.3.0",
+    "@oinone/kunlun-event": "~6.3.0",
+    "@oinone/kunlun-expression": "~6.3.0",
+    "@oinone/kunlun-meta": "~6.3.0",
+    "@oinone/kunlun-request": "~6.3.0",
+    "@oinone/kunlun-router": "~6.3.0",
+    "@oinone/kunlun-service": "~6.3.0",
+    "@oinone/kunlun-shared": "~6.3.0",
+    "@oinone/kunlun-spi": "~6.3.0",
+    "@oinone/kunlun-state": "~6.3.0",
+    "@oinone/kunlun-theme": "~6.3.0",
+    "@oinone/kunlun-vue-expression": "~6.3.0",
     "@types/crypto-js": "4.1.1",
     "@types/file-saver": "2.0.7",
     "@types/lodash": "4.14.182",

package/src/basic/table/BaseTableWidget.ts

@@ -14,7 +14,8 @@ import {
   RuntimeO2MField,
   SubmitCacheManager,
   SubmitValue,
-  translateValueByKey
+  translateValueByKey,
+  RelationUpdateType
 } from '@oinone/kunlun-engine';
 import { Expression, ExpressionRunParam } from '@oinone/kunlun-expression';
 import { MessageHub } from '@oinone/kunlun-request';
@@ -340,13 +341,15 @@ export class BaseTableWidget<
       return false;
     }
     const data = await this.rowEditorClosedForSubmit(context);
+    const useDiffUpdate = [RelationUpdateType.diff, RelationUpdateType.batch].includes(this.relationUpdateType)
     if (this.inline) {
       if (res && data) {
-        if (this.createMode) {
+        if (this.createMode && useDiffUpdate) {
           this.createSubviewFieldWidget(context, data);
         } else {
           this.updateSubviewFieldWidget(context, data);
         }
+
       }
     } else if (data) {
       try {

package/src/field/eip/form/work-scope/service.ts

@@ -1,4 +1,5 @@
 import { http } from '@oinone/kunlun-service';
+import { SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
 
 export async function queryWorkScope() {
   const body = `
@@ -11,7 +12,7 @@ export async function queryWorkScope() {
     }
   }
   `;
-  const result = await http.mutate('base', body);
+  const result = await http.mutate(SYSTEM_MODULE_NAME.EIP, body);
   return result.data.eipConnGroupQuery.queryListByWrapper as unknown as any[];
 }
 
@@ -25,6 +26,7 @@ export async function queryOpenInterface() {
       }
     }
   }`;
-  const result = await http.mutate('base', body);
+  const result = await http.mutate(SYSTEM_MODULE_NAME.EIP, body);
   return result.data.eipOpenInterfaceQuery.queryListByWrapper as unknown as any[];
 }
+

package/src/field/form/html/expressionRichtext/ExpressionRichText.vue

@@ -14,17 +14,17 @@
   </div>
 </template>
 <script lang="ts">
-import { computed, onBeforeUnmount, PropType, ref, shallowRef, watch, defineComponent } from 'vue';
+import { computed, defineComponent, nextTick, onBeforeUnmount, onMounted, PropType, ref, shallowRef, watch } from 'vue';
 import { ZH_CN_CODE } from '@oinone/kunlun-vue-ui-common';
 import { translateValueByKey } from '@oinone/kunlun-engine';
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
-import { DomEditor, i18nChangeLanguage } from '@wangeditor/editor';
+import { i18nChangeLanguage } from '@wangeditor/editor';
 import {
-  IVariableContextItem,
-  ExpressionElementClass,
-  OioWangEditExpressionModalMenuConf,
   EXPRESSION_MODAL_CLASS_NAME,
-  EXPRESSION_MODAL_PANEL_CLASS_NAME
+  EXPRESSION_MODAL_PANEL_CLASS_NAME,
+  ExpressionElementClass,
+  IVariableContextItem,
+  OioWangEditExpressionModalMenuConf
 } from '@oinone/kunlun-vue-expression';
 import '@wangeditor/editor/dist/css/style.css';
 import { CSSStyle, uniqueKeyGenerator } from '@oinone/kunlun-shared';
@@ -47,6 +47,9 @@ export default defineComponent({
     richTextToolbarExcludeKeys: {
       type: Array as PropType<string[]>,
       default: () => []
+    },
+    readonly: {
+      type: Boolean
     }
   },
   setup(props) {
@@ -75,7 +78,7 @@ export default defineComponent({
     const editorConfig = computed(() => {
       return {
         placeholder: `${translateValueByKey('请输入内容')}...`,
-        EXTEND_CONF: { contextItems: props.contextItems }
+        EXTEND_CONF: { contextItems: props.contextItems },
       };
     });
 
@@ -142,6 +145,13 @@ export default defineComponent({
       });
     };
 
+    onMounted(async () => {
+      await nextTick();
+      if (props.readonly) {
+        editorRef.value.disable();
+      }
+    });
+
     // 组件销毁时，也及时销毁编辑器
     onBeforeUnmount(() => {
       editorRef.value.destroy?.();

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