@oinone/kunlun-vue-admin-base 6.2.1 → 6.2.3

package/dist/types/src/action/server-actions/ServerActionWidget.d.ts

@@ -16,6 +16,7 @@ export declare class ServerActionWidget extends ActionWidget<RuntimeServerAction
     protected clickAction(): Promise<ClickResult>;
     protected formValidateProcess(e: HttpClientError): void;
     protected convertFormValidateResults(e: HttpClientError): FormValidateResult[];
+    protected notifyValidateResults(e: HttpClientError): void;
     protected submit(action: RuntimeServerAction): Promise<SubmitValue>;
     protected clickActionAfter(result: ClickResult): Promise<ClickResult>;
     protected clickActionAfterRefreshData(result: ClickResult, refreshParent?: boolean): Promise<ClickResult>;

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/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.1",
+  "version": "6.2.3",
   "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.1",
-    "@oinone/kunlun-vue-router": "6.2.1",
-    "@oinone/kunlun-vue-ui": "6.2.1",
-    "@oinone/kunlun-vue-ui-antd": "6.2.1",
-    "@oinone/kunlun-vue-ui-common": "6.2.1",
-    "@oinone/kunlun-vue-ui-el": "6.2.1",
-    "@oinone/kunlun-vue-widget": "6.2.1",
+    "@oinone/kunlun-vue-admin-layout": "6.2.3",
+    "@oinone/kunlun-vue-router": "6.2.3",
+    "@oinone/kunlun-vue-ui": "6.2.3",
+    "@oinone/kunlun-vue-ui-antd": "6.2.3",
+    "@oinone/kunlun-vue-ui-common": "6.2.3",
+    "@oinone/kunlun-vue-ui-el": "6.2.3",
+    "@oinone/kunlun-vue-widget": "6.2.3",
     "@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": "ad1e6c63539b7d6baf64cf209f100b1c0bcc2d53"
+  "gitHead": "2b4c0c7911626c105ca71c2d41e54af470e2e079"
 }

package/src/action/server-actions/ServerActionWidget.ts

@@ -23,7 +23,7 @@ import {
   UpdateOneWithRelationsService
 } from '@oinone/kunlun-engine';
 import { ActionContextType, ActionType, ModelFieldType, ViewType } from '@oinone/kunlun-meta';
-import { HttpClientError, SystemErrorCode } from '@oinone/kunlun-request';
+import { HttpClientError, MessageHub, RequestErrorInterceptor, SystemErrorCode } from '@oinone/kunlun-request';
 import { SPI } from '@oinone/kunlun-spi';
 import { BooleanHelper, CallChaining, debugConsole, OioNotification } from '@oinone/kunlun-vue-ui-antd';
 import { VueWidget, Widget, WidgetSubjection } from '@oinone/kunlun-vue-widget';
@@ -101,6 +101,7 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
 
   protected formValidateProcess(e: HttpClientError) {
     if (this.view?.type !== ViewType.Form) {
+      this.notifyValidateResults(e);
       return;
     }
     const { formValidateCallChaining } = this;
@@ -141,6 +142,21 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
     return results;
   }
 
+  protected notifyValidateResults(e: HttpClientError): void {
+    const error = e.errors?.[0];
+    if (!error) {
+      return;
+    }
+    if (error.extensions?.errorCode !== SystemErrorCode.FORM_VALIDATE_ERROR) {
+      return;
+    }
+    for (const messageItem of error.extensions?.messages || []) {
+      if (RequestErrorInterceptor.ignoredFormValidateMessage(messageItem)) {
+        MessageHub.error(messageItem.message);
+      }
+    }
+  }
+
   protected async submit(action: RuntimeServerAction): Promise<SubmitValue> {
     let records: ActiveRecords | undefined;
     let relationRecords: SubmitRelationValue[] | undefined;

package/src/field/detail/common/DetailCommonField.vue

@@ -58,11 +58,17 @@ export default defineComponent({
         origin: 'default',
         default: ({ realValue }) => {
           return [
-            createVNode('div', {
-              class: 'detail-common-field-value',
-              title: realValue,
-              innerHTML: realValue.replace(/\r?\n/g, '<br/>')
-            })
+            createVNode(
+              'div',
+              {
+                class: 'detail-common-field-value',
+                title: realValue,
+                style: {
+                  whiteSpace: 'pre-line'
+                }
+              },
+              realValue
+            )
           ];
         }
       },

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

@@ -26,7 +26,7 @@ export class FormHtmlRichTextFieldWidget extends FormStringFieldWidget {
   protected get richTextToolbarExcludeKeys(): string[] | null {
     const { richTextToolbarExcludeKeys } = this.getDsl() as { richTextToolbarExcludeKeys?: string };
     if (!richTextToolbarExcludeKeys) {
-      return null;
+      return [];
     }
 
     return richTextToolbarExcludeKeys.split(',').map((v) => v.trim());

package/src/field/table/text/TableTextFieldWidget.ts

@@ -18,10 +18,13 @@ export class TableTextFieldWidget extends TableStringFieldWidget {
     const value = this.compute(context);
 
     return [
-      createVNode('span', {
-        // innerHTML: value ? value.replace(/\r?\n/g, '<br/>') : ''
-        innerHTML: value
-      })
+      createVNode(
+        'span',
+        {
+          class: 'table-text-field-value'
+        },
+        value
+      )
     ];
   }
 }

package/src/permission/system-permission/style/permission.scss

@@ -56,15 +56,16 @@
     align-items: center;
   }
 
-  .ant-tree-treenode {
-    width: 100%;
+  .ant-tree-list-holder-inner {
+    display: block !important;
   }
 
   .ant-tree-checkbox {
     margin-top: 12px;
   }
 
-  .ant-tree-treenode-selected {
+  .permission-menu .ant-tree-treenode-selected,
+  .permission-menu .ant-tree-treenode:hover {
     background: var(--oio-menu-selected-background-color);
     border-radius: 4px;
     .ant-tree-title {
@@ -72,7 +73,7 @@
     }
   }
 
-  .ant-tree .ant-tree-node-content-wrapper:hover {
+  .oio-tree.ant-tree .ant-tree-node-content-wrapper:hover {
     background-color: transparent;
   }
 
@@ -116,7 +117,7 @@
     margin-bottom: 10px;
   }
 
-  .oio-tabs{
+  .oio-tabs {
     .oio-tab-content {
       padding: 0;
     }
@@ -486,11 +487,11 @@
 }
 
 .permission-dialog-content {
-  .oio-modal{
+  .oio-modal {
     .ant-modal-body {
       padding: 0 0 var(--oio-margin-md) 0;
       position: relative;
-  
+
       .oio-tabs.ant-tabs-top .ant-tabs-nav .ant-tabs-tab {
         padding: calc(var(--oio-padding) / 2);
         border-top: none;
@@ -498,7 +499,7 @@
           border-bottom: none;
         }
       }
-  
+
       .permission-mode-switch {
         position: absolute;
         right: var(--oio-margin);
@@ -511,22 +512,27 @@
           }
         }
       }
-  
+
+      .ant-spin-container {
+        width: 100%;
+        overflow-x: hidden;
+      }
+
       .oio-tree {
         max-height: 55vh;
         overflow-y: scroll;
       }
-  
+
       .data-permission-tab {
         &-label {
           font-weight: bold;
           font-size: 16px;
         }
-  
+
         .oio-tab {
           padding: var(--oio-padding) 0 var(--oio-padding) 0;
         }
-  
+
         .data-permission-rsql,
         .data-permission-operator {
           color: var(--oio-text-color-secondary);

package/src/spi-register/message-hub.ts

@@ -29,9 +29,9 @@ let titleCache: Record<string, string> | undefined;
 function getNotificationTitle(type: string): string {
   if (!titleCache) {
     titleCache = {};
-    for (const item of typeof NotificationType) {
-      const key = `kunlun.common.${type}`;
-      titleCache[type] = translateValueByKey(getValue(zh_CN, key) as string);
+    for (const item in NotificationType) {
+      const key = `kunlun.common.${item}`;
+      titleCache[item] = translateValueByKey(getValue(zh_CN, key) as string);
     }
   }
   return titleCache[type] as string;

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()