@oinone/kunlun-vue-admin-base 6.4.0 → 6.4.1

package/dist/types/src/components/oio-full-screen/OioFullScreen.vue.d.ts

@@ -6,6 +6,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     visible: import("vue").Ref<boolean>;
     icon: import("vue").ComputedRef<"oinone-fullscreen-exit-outlined" | "oinone-fullscreen-outlined">;
+    tooltipTitle: import("vue").ComputedRef<string>;
     onChange: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "change")[], "update:value" | "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {

package/dist/types/src/view/quick-fill/QuickFillWidget.d.ts

@@ -40,11 +40,13 @@ export declare class QuickFillWidget extends BaseElementWidget {
      * 确认提交,校验excel数据
      */
     onSure(headers: TableFieldOption[], rows: StandardString[][]): Promise<void>;
+    protected setRowValue(rowValue: Record<string, StandardString>, relationObjects: Record<string, ActiveRecord>, fieldName: string, cell: string): void;
     /**
      * 继续提交
      */
     onSubmit(): void;
     protected get fillValueFieldMapping(): [string, string][];
+    protected lastCells: Record<string, any> | undefined;
     /**
      * 将表格数据，填充到excel中
      */
@@ -69,8 +71,8 @@ export declare class QuickFillWidget extends BaseElementWidget {
     /**
      * 调接口校验excel数据
      */
-    validateExcelValue(headers: TableFieldOption[], values: string): Promise<QuickFillResponse>;
-    protected findModelField(fields: QuickFillField[], header: TableFieldOption): {
+    validateExcelValue(headers: TableFieldOption[], values: Record<string, StandardString>[], keepValues: Record<string, StandardString>[]): Promise<QuickFillResponse>;
+    protected findModelField(fields: QuickFillField[], data: string): {
         fieldWidget?: undefined;
         field?: undefined;
     } | {

package/dist/types/src/view/quick-fill/type.d.ts

@@ -9,4 +9,5 @@ export interface TableFieldOption {
     value: string;
     readonly: boolean;
     field: string;
+    originField: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.4.0",
+  "version": "6.4.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.4.0",
-    "@oinone/kunlun-vue-router": "6.4.0",
-    "@oinone/kunlun-vue-ui": "6.4.0",
-    "@oinone/kunlun-vue-ui-antd": "6.4.0",
-    "@oinone/kunlun-vue-ui-common": "6.4.0",
-    "@oinone/kunlun-vue-ui-el": "6.4.0",
-    "@oinone/kunlun-vue-widget": "6.4.0",
+    "@oinone/kunlun-vue-admin-layout": "6.4.1",
+    "@oinone/kunlun-vue-router": "6.4.1",
+    "@oinone/kunlun-vue-ui": "6.4.1",
+    "@oinone/kunlun-vue-ui-antd": "6.4.1",
+    "@oinone/kunlun-vue-ui-common": "6.4.1",
+    "@oinone/kunlun-vue-ui-el": "6.4.1",
+    "@oinone/kunlun-vue-widget": "6.4.1",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/basic/table/BaseTableWidget.ts

@@ -866,8 +866,9 @@ export class BaseTableWidget<
     }
     keyboardConfig.left = keyboardConfig.left || { key: 'Tab', shift: true, desc: '向左移动单元格' };
     keyboardConfig.right = keyboardConfig.right || { key: 'Tab', desc: '向右移动单元格' };
-    keyboardConfig.up = keyboardConfig.up || { key: 'Enter', ctrl: true, shift: true, desc: '向上移动单元格' };
-    keyboardConfig.down = keyboardConfig.down || { key: 'Enter', ctrl: true, desc: '向下移动单元格' };
+    // fixme @zbh 20251218 暂未实现
+    // keyboardConfig.up = keyboardConfig.up || { key: 'Enter', ctrl: true, shift: true, desc: '向上移动单元格' };
+    // keyboardConfig.down = keyboardConfig.down || { key: 'Enter', ctrl: true, desc: '向下移动单元格' };
     keyboardConfig.enter = keyboardConfig.enter || { key: 'Enter', desc: '提交数据' };
     keyboardConfig.cancel = keyboardConfig.cancel || { key: 'Esc', desc: '取消编辑' };
     return keyboardConfig;
@@ -1324,6 +1325,7 @@ export class BaseTableWidget<
           }))
         );
       } else {
+        (this.tableInstance?.getSortColumns() || []).forEach((v) => this.tableInstance?.clearSort(v.field));
         this.tableInstance?.sort([]);
       }
     });

package/src/components/oio-full-screen/OioFullScreen.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="default-view-control-item default-view-control-full-screen">
-    <oio-tooltip v-model:visible="visible" placement="bm" :title="$translate('全屏')">
+    <oio-tooltip v-model:visible="visible" placement="bm" :title="tooltipTitle">
       <oio-icon size="16" :icon="icon" @click="onChange" />
     </oio-tooltip>
   </div>
 </template>
 
 <script lang="ts">
+import { translateValueByKey } from '@oinone/kunlun-engine';
 import { OioIcon, OioTooltip } from '@oinone/kunlun-vue-ui-antd';
 import { computed, defineComponent, ref } from 'vue';
 
@@ -29,6 +30,13 @@ export default defineComponent({
       return props.value ? 'oinone-fullscreen-exit-outlined' : 'oinone-fullscreen-outlined';
     });
 
+    const tooltipTitle = computed(() => {
+      if (props.value) {
+        return translateValueByKey('取消全屏');
+      }
+      return translateValueByKey('全屏');
+    });
+
     const onChange = () => {
       visible.value = false;
       emit('update:value', !props.value);
@@ -38,6 +46,7 @@ export default defineComponent({
     return {
       visible,
       icon,
+      tooltipTitle,
       onChange
     };
   }

package/src/permission/system-permission/components/GroupList.vue

@@ -25,7 +25,7 @@
           }}</oio-button>
           <a-divider type="vertical" />
           <a-popconfirm
-            v-if="item.dataSource !== 'SYSTEM' && hasDeleteGroupAction"
+            v-if="item.source === 'MANUAL' && hasDeleteGroupAction"
             placement="topLeft"
             :ok-text="$translate('确定')"
             :cancel-text="$translate('取消')"

package/src/permission/system-permission/components/PermissionDialog.vue

@@ -72,7 +72,7 @@
               <div>
                 {{ title }}
                 <span style="position: absolute; right: 0; color: var(--oio-icon-color)">
-                  >{{ data.menuName }}/{{ data.displayValue }}</span
+                  {{ data.menuName }}/{{ data.displayValue }}</span
                 >
               </div>
             </template>
@@ -146,9 +146,9 @@ import {
 } from '@oinone/kunlun-vue-ui-antd';
 import { computed, defineEmits, defineProps, ref, watch, withDefaults } from 'vue';
 import { IPermission } from '../../permission/type';
+import { ActionPermissionNode, AnyPermissionNode } from '../../types';
 import { queryActionsByMenu, queryGroupData } from '../service';
 import { useStore } from '../store';
-import { ActionPermissionNode, AnyPermissionNode } from '../../types';
 import DataPermission from './data-permission/data-permission.vue';
 
 interface ActionTreeItem {

package/src/permission/system-permission/service/index.ts

@@ -58,7 +58,6 @@ export const queryRoleList = async (
           name
           description
           source
-          permissionDataSource
           createDate
           writeDate
         }
@@ -91,11 +90,10 @@ export const queryGroups = async (options: { nodeType: string; resourceId: strin
 				id
 				name
 				type
-				dataSource
+				source
 				active
 				displayName
 				comment
-				menuName
 				roles {
 					code
 					name
@@ -109,11 +107,10 @@ export const queryGroups = async (options: { nodeType: string; resourceId: strin
 				id
 				name
 				type
-				dataSource
+				source
 				active
 				displayName
 				comment
-				menuName
 				roles {
 					code
 					name

package/src/view/quick-fill/Excel.vue

@@ -149,15 +149,17 @@ const tableHeaderValues = ref<TableFieldOption[]>([]);
 
 // 表头下拉选项
 const selectOptions = computed(() => {
-  const options: TableFieldOption[] = [...props.fields];
-  options.unshift({
-    label: '不粘贴',
-    key: NON_CUT,
-    value: NON_CUT,
-    readonly: true,
-    field: NON_CUT
-  });
-  return options;
+  return [
+    {
+      label: '不粘贴',
+      key: NON_CUT,
+      value: NON_CUT,
+      readonly: true,
+      field: NON_CUT,
+      originField: NON_CUT
+    },
+    ...props.fields
+  ];
 });
 
 // ======== 状态 =========
@@ -777,13 +779,16 @@ defineExpose({
   getTableHeaderValues() {
     const fields: TableFieldOption[] = [];
     for (const tableHeaderValue of tableHeaderValues.value) {
-      const { value } = tableHeaderValue;
+      const { value, originField } = tableHeaderValue;
       if (value === NON_CUT) {
         fields.push(tableHeaderValue);
       } else {
         const target = props.fields.find((v) => v.field === value);
         if (target) {
-          fields.push(target);
+          fields.push({
+            ...target,
+            originField
+          });
         }
       }
     }

package/src/view/quick-fill/QuickFill.vue

@@ -153,7 +153,8 @@ export default defineComponent({
           key: fieldName,
           value: fieldName,
           readonly: field.readonly === true,
-          field: fieldName
+          field: fieldName,
+          originField: fieldName
         };
       });
       if (type.value === QuickFillType.create) {

package/src/view/quick-fill/QuickFillWidget.ts

@@ -203,6 +203,7 @@ export class QuickFillWidget extends BaseElementWidget {
   @Widget.Method()
   public async onSure(headers: TableFieldOption[], rows: StandardString[][]) {
     const values = [] as Record<string, StandardString>[];
+    const keepValues = [] as Record<string, StandardString>[];
 
     /**
      * 将excel数据转换成提交的数据格式
@@ -212,34 +213,40 @@ export class QuickFillWidget extends BaseElementWidget {
     rows.forEach((row, rowIndex) => {
       const rowValue = {} as Record<string, StandardString>;
       const relationObjects: Record<string, ActiveRecord> = {};
+      const keepRowValue = {} as Record<string, StandardString>;
+      const keepRelationObjects: Record<string, ActiveRecord> = {};
 
       row.forEach((cell, columnIndex) => {
         if (!cell) {
           return;
         }
-        const fieldName = headers[columnIndex]?.field;
-        if (!fieldName) {
+        const header = headers[columnIndex];
+        if (!header) {
           return;
         }
-        const [name1, name2] = fieldName.split('#');
-        if (name2) {
-          let target = relationObjects[name1];
-          if (!target) {
-            target = {};
-            relationObjects[name1] = target;
-          }
-          target[name2] = cell;
-        } else {
-          rowValue[fieldName] = cell;
+        const { value, originField } = header;
+        if (value !== NON_CUT) {
+          this.setRowValue(rowValue, relationObjects, value, cell);
         }
+        this.setRowValue(
+          keepRowValue,
+          keepRelationObjects,
+          originField,
+          this.lastCells?.[`${rowIndex + 1}-${columnIndex + 1}`]
+        );
       });
 
       Object.entries(relationObjects).forEach(([key, value]) => {
         rowValue[key] = JSON.stringify(value);
       });
 
+      Object.entries(keepRelationObjects).forEach(([key, value]) => {
+        keepRowValue[key] = JSON.stringify(value);
+      });
+
       if (Object.keys(rowValue).length > 0) {
         values.push(rowValue);
+        keepValues.push(keepRowValue);
       }
     });
 
@@ -247,7 +254,7 @@ export class QuickFillWidget extends BaseElementWidget {
      *  values -> 可回填的数据
      *  failures -> 错误信息
      */
-    const { values: resultValues, failures } = await this.validateExcelValue(headers, JSON.stringify(values));
+    const { values: resultValues, failures } = await this.validateExcelValue(headers, values, keepValues);
 
     const data = resultValues ? JSON.parse(resultValues) : [];
 
@@ -267,6 +274,25 @@ export class QuickFillWidget extends BaseElementWidget {
     }
   }
 
+  protected setRowValue(
+    rowValue: Record<string, StandardString>,
+    relationObjects: Record<string, ActiveRecord>,
+    fieldName: string,
+    cell: string
+  ) {
+    const [name1, name2] = fieldName.split('#');
+    if (name2) {
+      let target = relationObjects[name1];
+      if (!target) {
+        target = {};
+        relationObjects[name1] = target;
+      }
+      target[name2] = cell;
+    } else {
+      rowValue[fieldName] = cell;
+    }
+  }
+
   /**
    * 继续提交
    */
@@ -280,6 +306,8 @@ export class QuickFillWidget extends BaseElementWidget {
     return fullAddressFieldMapping;
   }
 
+  protected lastCells: Record<string, any> | undefined;
+
   /**
    * 将表格数据，填充到excel中
    */
@@ -287,6 +315,7 @@ export class QuickFillWidget extends BaseElementWidget {
   public fillValueByDataSource(): { cells?: Record<string, unknown>; rowCount?: number } {
     // 处理空数据情况
     if (!this.dataSource?.length) {
+      this.lastCells = undefined;
       return {
         rowCount: 0
       };
@@ -324,6 +353,7 @@ export class QuickFillWidget extends BaseElementWidget {
       });
     });
 
+    this.lastCells = { ...cells };
     return { cells, rowCount: this.dataSource.length };
   }
 
@@ -493,14 +523,23 @@ export class QuickFillWidget extends BaseElementWidget {
   /**
    * 调接口校验excel数据
    */
-  public async validateExcelValue(headers: TableFieldOption[], values: string) {
+  public async validateExcelValue(
+    headers: TableFieldOption[],
+    values: Record<string, StandardString>[],
+    keepValues: Record<string, StandardString>[]
+  ) {
     const fields: QuickFillField[] = [];
-    const validHeaders: TableFieldOption[] = headers.filter((v) => v.value !== NON_CUT);
-    const keepHeaders: TableFieldOption[] = headers.filter(
-      (v) => v.value === NON_CUT && v.field && !validHeaders.find((vv) => vv.value === v.field)
-    );
+    const validHeaders: TableFieldOption[] = [];
+    const keepHeaders: Record<string, boolean> = {};
+    for (const header of headers) {
+      const { value, originField } = header;
+      if (value !== NON_CUT) {
+        validHeaders.push(header);
+      }
+      keepHeaders[originField] = true;
+    }
     for (const header of validHeaders) {
-      const { fieldWidget, field: modelField } = this.findModelField(fields, header);
+      const { fieldWidget, field: modelField } = this.findModelField(fields, header.value);
       if (!modelField) {
         continue;
       }
@@ -514,26 +553,49 @@ export class QuickFillWidget extends BaseElementWidget {
       } else {
         fields.push({ field: modelField.data, required });
       }
+      delete keepHeaders[header.value];
     }
-    for (const header of keepHeaders) {
-      const { field: modelField } = this.findModelField(fields, header);
-      if (!modelField) {
-        continue;
+    if (this.type === QuickFillType.create) {
+      for (const [field] of Object.entries(keepHeaders)) {
+        const { field: modelField } = this.findModelField(fields, field);
+        if (!modelField) {
+          continue;
+        }
+        for (const value of values) {
+          delete value[modelField.data];
+        }
       }
-      if (isRelationField(modelField)) {
-        fields.push({
-          field: modelField.data,
-          validate: false,
-          labelFields: modelField.referencesModel.labelFields
-        });
-      } else {
-        fields.push({ field: modelField.data, validate: false });
+    } else if (this.type === QuickFillType.update) {
+      for (const [field] of Object.entries(keepHeaders)) {
+        const { field: modelField } = this.findModelField(fields, field);
+        if (!modelField) {
+          continue;
+        }
+        if (isRelationField(modelField)) {
+          fields.push({
+            field: modelField.data,
+            validate: false,
+            labelFields: modelField.referencesModel.labelFields
+          });
+        } else {
+          fields.push({ field: modelField.data, validate: false });
+        }
+        for (let i = 0; i < values.length; i++) {
+          const value = values[i];
+          const keepValue = keepValues[i];
+          const t = keepValue?.[modelField.data];
+          if (t) {
+            value[modelField.data] = t;
+          } else {
+            delete value[modelField.data];
+          }
+        }
       }
     }
     const gqlStr = await buildSingleItemParam(quickFillFields, {
       model: this.model.model,
       fields,
-      values
+      values: JSON.stringify(values)
     });
 
     const body = `{
@@ -558,14 +620,7 @@ export class QuickFillWidget extends BaseElementWidget {
     return rst.data.quickFillingQuery.loadData as unknown as QuickFillResponse;
   }
 
-  protected findModelField(fields: QuickFillField[], header: TableFieldOption) {
-    const { value, field } = header;
-    let data: string;
-    if (value === NON_CUT) {
-      data = field;
-    } else {
-      data = value;
-    }
+  protected findModelField(fields: QuickFillField[], data: string) {
     let fieldWidget: BaseFieldWidget | undefined;
     const [name1, name2] = data.split('#');
     if (name2) {

package/src/view/quick-fill/type.ts

@@ -11,4 +11,5 @@ export interface TableFieldOption {
   value: string;
   readonly: boolean;
   field: string;
+  originField: string;
 }

package/src/view/view/style/index.scss

@@ -105,6 +105,7 @@ $treeMinWidth: 324px;
     }
   }
 }
+
 .oio-full-screen-view {
   position: fixed;
   top: 0;
@@ -123,6 +124,7 @@ $treeMinWidth: 324px;
   .ant-modal-close-x {
     top: -4px;
   }
+
   .ant-modal-confirm-body {
     display: flex;
     gap: var(--oio-row-gap);
@@ -143,6 +145,7 @@ $treeMinWidth: 324px;
       padding: var(--oio-padding) var(--oio-padding) var(--oio-padding) 0;
       border-bottom: 1px solid var(--oio-border-color);
     }
+
     & > .action-bar {
       height: auto;
       padding: var(--oio-padding);
@@ -152,6 +155,7 @@ $treeMinWidth: 324px;
     & > .oio-default-form {
       padding: var(--oio-padding);
     }
+
     & > .default-gallery {
       padding: var(--oio-padding);
     }
@@ -170,48 +174,63 @@ $treeMinWidth: 324px;
         border: none;
         box-shadow: none;
       }
+
       .oio-group-title-wrapper {
         padding: 0;
       }
 
       .oio-group-content {
         padding: var(--oio-padding) 0 0 0;
+
         .oio-group {
           padding: 0 var(--oio-padding);
         }
       }
+
+      &.oio-group-title-hidden {
+        & > .oio-group-content {
+          padding: var(--oio-padding);
+        }
+      }
     }
   }
 
   // 表格
   &.oio-default-table-view {
     .oio-default-view-container {
-      .oio-group {
-        &:last-child {
-          .oio-group-content {
-            padding-top: 0;
+      & > .oio-group {
+        & > .oio-group-content {
+          padding: var(--oio-padding) 0 0 0;
 
-            & > .oio-row {
-              row-gap: 0 !important;
-            }
+          & > .oio-row {
+            row-gap: 0 !important;
           }
         }
+
+        &:last-child > .oio-group-content {
+          padding-top: 0;
+        }
       }
+
       .oio-default-search {
         padding: 0 var(--oio-padding) var(--oio-padding) 0;
         border-bottom: 1px solid var(--oio-border-color);
+
         .oio-cate-search.oio-tabs.ant-tabs-top .ant-tabs-nav .ant-tabs-tab {
           padding-top: 0;
         }
+
         .ant-tabs-nav-wrap,
         .oio-cate-search-second {
           padding-left: var(--oio-padding);
         }
       }
+
       .action-bar:not(.action-bar-inline) {
         padding: var(--oio-padding) var(--oio-padding) 0 var(--oio-padding);
         height: auto;
       }
+
       .default-table {
         padding: var(--oio-padding);
       }
@@ -219,6 +238,7 @@ $treeMinWidth: 324px;
       .default-tree-table {
         padding: var(--oio-padding) 0 0 var(--oio-padding);
         position: relative;
+
         &::after {
           content: '';
           position: absolute;
@@ -243,6 +263,7 @@ $treeMinWidth: 324px;
   // 树视图
   &.oio-default-tree-view {
     padding: var(--oio-padding);
+
     .oio-default-view-container .oio-group .oio-group-content {
       padding: 0;
     }