@oinone/kunlun-vue-admin-base 6.2.0 → 6.2.2

package/dist/types/src/field/form/float/Plat.vue.d.ts

@@ -47,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     layout: {
-        type: PropType<import("@oinone/kunlun-vue-ui-common").FormLayout>;
+        type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
     };
     label: {
         type: (BooleanConstructor | StringConstructor)[];
@@ -141,7 +141,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     layout: {
-        type: PropType<import("@oinone/kunlun-vue-ui-common").FormLayout>;
+        type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
     };
     label: {
         type: (BooleanConstructor | StringConstructor)[];

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

@@ -1,105 +1,61 @@
 import { PropType } from 'vue';
 import { IVariableContextItem } from '@oinone/kunlun-vue-expression';
 import '@wangeditor/editor/dist/css/style.css';
-declare const _default: {
-    components: {
-        Editor: import("vue").DefineComponent<{
-            mode: {
-                type: StringConstructor;
-                default: string;
-            };
-            defaultContent: {
-                type: PropType<import("@wangeditor/editor").SlateDescendant[]>;
-                default: never[];
-            };
-            defaultHtml: {
-                type: StringConstructor;
-                default: string;
-            };
-            defaultConfig: {
-                type: PropType<Partial<import("@wangeditor/editor").IEditorConfig>>;
-                default: {};
-            };
-            modelValue: {
-                type: StringConstructor;
-                default: string;
-            };
-        }, {
-            box: import("vue").Ref<null>;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-            mode?: unknown;
-            defaultContent?: unknown;
-            defaultHtml?: unknown;
-            defaultConfig?: unknown;
-            modelValue?: unknown;
-        } & {
-            mode: string;
-            defaultContent: import("@wangeditor/editor").SlateDescendant[];
-            defaultHtml: string;
-            defaultConfig: Partial<import("@wangeditor/editor").IEditorConfig>;
-            modelValue: string;
-        }>, {
-            mode: string;
-            defaultContent: import("@wangeditor/editor").SlateDescendant[];
-            defaultHtml: string;
-            defaultConfig: Partial<import("@wangeditor/editor").IEditorConfig>;
-            modelValue: string;
-        }>;
-        Toolbar: import("vue").DefineComponent<{
-            editor: {
-                type: PropType<import("@wangeditor/editor").IDomEditor>;
-            };
-            mode: {
-                type: StringConstructor;
-                default: string;
-            };
-            defaultConfig: {
-                type: PropType<Partial<import("@wangeditor/editor").IToolbarConfig>>;
-                default: {};
-            };
-        }, {
-            selector: import("vue").Ref<null>;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-            editor?: unknown;
-            mode?: unknown;
-            defaultConfig?: unknown;
-        } & {
-            mode: string;
-            defaultConfig: Partial<import("@wangeditor/editor").IToolbarConfig>;
-        } & {
-            editor?: import("@wangeditor/editor").IDomEditor | undefined;
-        }>, {
-            mode: string;
-            defaultConfig: Partial<import("@wangeditor/editor").IToolbarConfig>;
-        }>;
+import { CSSStyle } from '@oinone/kunlun-shared';
+declare const _default: import("vue").DefineComponent<{
+    contextItems: PropType<IVariableContextItem[]>;
+    change: {
+        type: FunctionConstructor;
     };
-    props: {
-        contextItems: PropType<IVariableContextItem[]>;
-        change: FunctionConstructor;
-        value: StringConstructor;
+    value: {
+        type: StringConstructor;
     };
-    setup(props: any): {
-        editorId: string;
-        mode: string;
-        defaultHtml: import("vue").Ref<string>;
-        toolbarConfig: {
-            insertKeys: {
-                index: number;
-                keys: string[];
-            };
-            excludeKeys: string[];
-            modalAppendToBody: boolean;
+    height: {
+        type: StringConstructor;
+    };
+    richTextToolbarExcludeKeys: {
+        type: PropType<string[]>;
+        default: () => never[];
+    };
+}, {
+    editorStyle: import("vue").ComputedRef<CSSStyle>;
+    editorId: string;
+    mode: string;
+    defaultHtml: import("vue").Ref<string>;
+    toolbarConfig: import("vue").ComputedRef<{
+        insertKeys: {
+            index: number;
+            keys: string[];
+        };
+        excludeKeys: string[];
+        modalAppendToBody: boolean;
+    }>;
+    editorConfig: import("vue").ComputedRef<{
+        placeholder: string;
+        EXTEND_CONF: {
+            contextItems: IVariableContextItem[] | undefined;
         };
-        editorConfig: import("vue").ComputedRef<{
-            placeholder: string;
-            EXTEND_CONF: {
-                contextItems: any;
-            };
-        }>;
-        editorRef: import("vue").ShallowRef<any>;
-        handleCreated: (editor: any) => void;
-        handleDestroyed: (editor: any) => void;
-        handleChange: (editor: any) => void;
+    }>;
+    editorRef: import("vue").ShallowRef<any>;
+    handleCreated: (editor: any) => void;
+    handleDestroyed: (editor: any) => void;
+    handleChange: (editor: any) => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    contextItems: PropType<IVariableContextItem[]>;
+    change: {
+        type: FunctionConstructor;
+    };
+    value: {
+        type: StringConstructor;
+    };
+    height: {
+        type: StringConstructor;
+    };
+    richTextToolbarExcludeKeys: {
+        type: PropType<string[]>;
+        default: () => never[];
     };
-};
+}>>, {
+    richTextToolbarExcludeKeys: string[];
+}>;
 export default _default;

package/dist/types/src/field/form/html/richtext/FormHtmlRichTextFieldWidget.d.ts

@@ -2,6 +2,13 @@ import { ValidatorInfo } from '../../../../typing';
 import { FormStringFieldWidget } from '../../string';
 export declare class FormHtmlRichTextFieldWidget extends FormStringFieldWidget {
     initialize(props: any): this;
+    /**
+     * 富文本工具栏排除的key
+     *
+     * @example
+     * richTextToolbarExcludeKeys="fullScreen,uploadImage"
+     */
+    protected get richTextToolbarExcludeKeys(): string[] | null;
     protected get encode(): boolean | undefined;
     protected get height(): string | undefined;
     validator(): Promise<ValidatorInfo>;

package/dist/types/src/field/form/html/richtext/RichText.vue.d.ts

@@ -16,6 +16,7 @@ declare const _default: import("vue").DefineComponent<Readonly<{
     maxLength?: any;
     encode?: any;
     height?: any;
+    richTextToolbarExcludeKeys?: any;
 }>, {
     handleCreated: (editor: any) => void;
     handleChange: (editor: any) => void;
@@ -24,7 +25,7 @@ declare const _default: import("vue").DefineComponent<Readonly<{
     defaultHtml: import("vue").Ref<string>;
     editorRef: import("vue").ShallowRef<any>;
     editorNodeRef: any;
-    toolbarConfig: Partial<IToolbarConfig>;
+    toolbarConfig: import("vue").ComputedRef<Partial<IToolbarConfig>>;
     editorConfig: import("vue").ComputedRef<{
         placeholder: any;
         readOnly: boolean | undefined;
@@ -102,6 +103,7 @@ declare const _default: import("vue").DefineComponent<Readonly<{
     maxLength?: any;
     encode?: any;
     height?: any;
+    richTextToolbarExcludeKeys?: any;
 }>>>, {
     readonly value?: any;
     readonly field?: any;
@@ -115,5 +117,6 @@ declare const _default: import("vue").DefineComponent<Readonly<{
     readonly maxLength?: any;
     readonly encode?: any;
     readonly height?: any;
+    readonly richTextToolbarExcludeKeys?: any;
 }>;
 export default _default;

package/dist/types/src/view/table/TableWidget.d.ts

@@ -18,7 +18,10 @@ export declare class TableWidget<Props extends TableWidgetProps = TableWidgetPro
     protected get checkbox(): boolean;
     protected get lineHeight(): number | undefined;
     protected get minLineHeight(): number | undefined;
-    protected get autoLineHeight(): boolean | undefined;
+    /**
+     * 表格行高是否自适应，默认开启
+     */
+    protected get autoLineHeight(): boolean;
     protected get enableSequence(): boolean;
     protected get defaultPageSize(): number;
     protected get activeCount(): number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.2.0",
+  "version": "6.2.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.2.0",
-    "@oinone/kunlun-vue-router": "6.2.0",
-    "@oinone/kunlun-vue-ui": "6.2.0",
-    "@oinone/kunlun-vue-ui-antd": "6.2.0",
-    "@oinone/kunlun-vue-ui-common": "6.2.0",
-    "@oinone/kunlun-vue-ui-el": "6.2.0",
-    "@oinone/kunlun-vue-widget": "6.2.0",
+    "@oinone/kunlun-vue-admin-layout": "6.2.2",
+    "@oinone/kunlun-vue-router": "6.2.2",
+    "@oinone/kunlun-vue-ui": "6.2.2",
+    "@oinone/kunlun-vue-ui-antd": "6.2.2",
+    "@oinone/kunlun-vue-ui-common": "6.2.2",
+    "@oinone/kunlun-vue-ui-el": "6.2.2",
+    "@oinone/kunlun-vue-widget": "6.2.2",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",
@@ -61,5 +61,5 @@
     "element-plus": ">=2.2.17",
     "vue": ">=3.2.40"
   },
-  "gitHead": "b65bbf1d649da1017810c5608473d5daa1a41f94"
+  "gitHead": "2b4c0c7911626c105ca71c2d41e54af470e2e079"
 }

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

@@ -9,16 +9,16 @@
       @onCreated="handleCreated"
       @onDestroyed="handleDestroyed"
       @onChange="handleChange"
-      style="height: 500px; overflow-y: hidden"
+      :style="editorStyle"
     />
   </div>
 </template>
 <script lang="ts">
-import { computed, onBeforeUnmount, PropType, ref, shallowRef, watch } from 'vue';
+import { computed, onBeforeUnmount, PropType, ref, shallowRef, watch, defineComponent } 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 { i18nChangeLanguage } from '@wangeditor/editor';
+import { DomEditor, i18nChangeLanguage } from '@wangeditor/editor';
 import {
   IVariableContextItem,
   ExpressionElementClass,
@@ -27,16 +27,27 @@ import {
   EXPRESSION_MODAL_PANEL_CLASS_NAME
 } from '@oinone/kunlun-vue-expression';
 import '@wangeditor/editor/dist/css/style.css';
-import { uniqueKeyGenerator } from '@oinone/kunlun-shared';
+import { CSSStyle, uniqueKeyGenerator } from '@oinone/kunlun-shared';
 
 const EDITOR_DEFAULT_HTML = '<p><br></p>';
 const EDITOR_EXP_MODAL_CLASS = 'exp-modal-in-body';
-export default {
+export default defineComponent({
   components: { Editor, Toolbar },
   props: {
     contextItems: Array as PropType<IVariableContextItem[]>,
-    change: Function,
-    value: String
+    change: {
+      type: Function
+    },
+    value: {
+      type: String
+    },
+    height: {
+      type: String
+    },
+    richTextToolbarExcludeKeys: {
+      type: Array as PropType<string[]>,
+      default: () => []
+    }
   },
   setup(props) {
     const editorId = `${ExpressionElementClass}-${Math.random().toString().slice(-5)}`; //【注意】编辑器 id ，要全局唯一
@@ -50,21 +61,31 @@ export default {
       i18nChangeLanguage('en');
     }
 
-    const toolbarConfig = {
-      insertKeys: {
-        index: 28, //
-        keys: [OioWangEditExpressionModalMenuConf.key]
-      },
-      // FIXME: 全屏显示有些bug
-      excludeKeys: ['fullScreen', 'uploadImage', 'insertVideo'],
-      modalAppendToBody: true
-    };
+    const toolbarConfig = computed(() => {
+      return {
+        insertKeys: {
+          index: 28, //
+          keys: [OioWangEditExpressionModalMenuConf.key]
+        },
+        excludeKeys: [...(props.richTextToolbarExcludeKeys || []), 'fullScreen', 'uploadImage', 'insertVideo'],
+        modalAppendToBody: true
+      };
+    });
+
     const editorConfig = computed(() => {
       return {
         placeholder: `${translateValueByKey('请输入内容')}...`,
         EXTEND_CONF: { contextItems: props.contextItems }
       };
     });
+
+    const editorStyle = computed(() => {
+      const style = {} as CSSStyle;
+      style.height = props.height || '400px';
+      style.overflowY = 'hidden';
+      return style;
+    });
+
     watch(
       () => props.contextItems,
       (newVal) => {
@@ -137,6 +158,7 @@ export default {
     };
 
     return {
+      editorStyle,
       editorId,
       mode: 'simple',
       defaultHtml,
@@ -148,7 +170,7 @@ export default {
       handleChange
     };
   }
-};
+});
 </script>
 <style lang="scss">
 .exp-modal-in-body.w-e-modal {

package/src/field/form/html/richtext/FormHtmlRichTextFieldWidget.ts

@@ -16,6 +16,22 @@ export class FormHtmlRichTextFieldWidget extends FormStringFieldWidget {
     return this;
   }
 
+  /**
+   * 富文本工具栏排除的key
+   *
+   * @example
+   * richTextToolbarExcludeKeys="fullScreen,uploadImage"
+   */
+  @Widget.Reactive()
+  protected get richTextToolbarExcludeKeys(): string[] | null {
+    const { richTextToolbarExcludeKeys } = this.getDsl() as { richTextToolbarExcludeKeys?: string };
+    if (!richTextToolbarExcludeKeys) {
+      return null;
+    }
+
+    return richTextToolbarExcludeKeys.split(',').map((v) => v.trim());
+  }
+
   @Widget.Reactive()
   protected get encode() {
     const _encode = this.getDsl().encode;

package/src/field/form/html/richtext/RichText.vue

@@ -118,7 +118,8 @@ export default defineComponent({
     'disabled',
     'maxLength',
     'encode',
-    'height'
+    'height',
+    'richTextToolbarExcludeKeys'
   ],
   setup(props) {
     const editorId = `${DEFAULT_PREFIX}-richtext-${Math.random().toString().slice(-5)}`; // 【注意】编辑器 id ，要全局唯一
@@ -137,13 +138,17 @@ export default defineComponent({
       return { 'form-rich-text-disabled': innerDisabled.value, 'form-rich-text-readonly': innerReadonly.value };
     });
 
-    const toolbarConfig: Partial<IToolbarConfig> = {
-      // 插入哪些菜单
-      insertKeys: {
-        index: 0, // 自定义插入的位置
-        keys: ['uploadAttachment'] // “上传附件”菜单
-      }
-    };
+    const toolbarConfig = computed<Partial<IToolbarConfig>>(() => {
+      return {
+        // 插入哪些菜单
+        insertKeys: {
+          index: 0, // 自定义插入的位置
+          keys: ['uploadAttachment'] // “上传附件”菜单
+        },
+        excludeKeys: props.richTextToolbarExcludeKeys
+      };
+    });
+
     const editorConfig = computed(() => {
       return {
         placeholder: props.placeholder || `${translateValueByKey('请输入内容')}...`,

package/src/view/table/DefaultTable.vue

@@ -515,10 +515,14 @@ export default defineComponent({
 
         rows.forEach((row, index) => {
           const height = row.clientHeight;
+          row.style.height = 'auto';
 
           const leftFixedRow = leftFixedRows[index];
           const rightFixedRow = rightFixedRows[index];
 
+          leftFixedRow && (leftFixedRow.style.height = 'auto');
+          rightFixedRow && (rightFixedRow.style.height = 'auto');
+
           const maxHeight = Math.max(
             height || 0,
             leftFixedRow?.clientHeight || 0,
@@ -589,8 +593,6 @@ export default defineComponent({
         if (v && v.length) {
           nextTick(() => {
             calcTableColumnHeight();
-
-            stop();
           });
         }
       },

package/src/view/table/TableWidget.ts

@@ -114,11 +114,12 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
     return undefined;
   }
 
+  /**
+   * 表格行高是否自适应，默认开启
+   */
   @Widget.Reactive()
-  protected get autoLineHeight(): boolean | undefined {
-    const autoLineHeight = Optional.ofNullable(this.getDsl().autoLineHeight)
-      .map(BooleanHelper.toBoolean)
-      .orElse(undefined);
+  protected get autoLineHeight(): boolean {
+    const autoLineHeight = Optional.ofNullable(this.getDsl().autoLineHeight).map(BooleanHelper.toBoolean).orElse(true);
 
     if (typeof autoLineHeight === 'boolean') {
       return autoLineHeight;
@@ -128,7 +129,7 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
       return this.tableConfig.autoLineHeight;
     }
 
-    return undefined;
+    return true;
   }
 
   @Widget.Reactive()