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

package/dist/oinone-kunlun-vue-admin-base.esm.js

@@ -17101,8 +17101,9 @@ class BaseTableWidget extends BaseElementListViewWidget {
         }
         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;
@@ -17466,7 +17467,7 @@ class BaseTableWidget extends BaseElementListViewWidget {
         super.onSortChange(sortList);
         this.multipleFieldSort = (((_a = this.sortList) === null || _a === void 0 ? void 0 : _a.length) || 0) >= 2;
         nextTick(() => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             if ((_a = this.sortList) === null || _a === void 0 ? void 0 : _a.length) {
                 (((_b = this.tableInstance) === null || _b === void 0 ? void 0 : _b.getSortColumns()) || [])
                     .filter((v) => { var _a; return !((_a = this.sortList) === null || _a === void 0 ? void 0 : _a.find((vv) => vv.sortField === v.field)); })
@@ -17477,7 +17478,8 @@ class BaseTableWidget extends BaseElementListViewWidget {
                 })));
             }
             else {
-                (_d = this.tableInstance) === null || _d === void 0 ? void 0 : _d.sort([]);
+                (((_d = this.tableInstance) === null || _d === void 0 ? void 0 : _d.getSortColumns()) || []).forEach((v) => { var _a; return (_a = this.tableInstance) === null || _a === void 0 ? void 0 : _a.clearSort(v.field); });
+                (_e = this.tableInstance) === null || _e === void 0 ? void 0 : _e.sort([]);
             }
         });
     }
@@ -42174,6 +42176,12 @@ var script$44 = defineComponent({
         const icon = computed(() => {
             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);
@@ -42182,6 +42190,7 @@ var script$44 = defineComponent({
         return {
             visible,
             icon,
+            tooltipTitle,
             onChange
         };
     }
@@ -42198,7 +42207,7 @@ function render$2w(_ctx, _cache, $props, $setup, $data, $options) {
       visible: _ctx.visible,
       "onUpdate:visible": _cache[0] || (_cache[0] = $event => ((_ctx.visible) = $event)),
       placement: "bm",
-      title: _ctx.$translate('全屏')
+      title: _ctx.tooltipTitle
     }, {
       default: withCtx(() => [
         createVNode(_component_oio_icon, {
@@ -102390,15 +102399,17 @@ var script$z = /*#__PURE__*/ defineComponent({
         const tableHeaderValues = ref([]);
         // 表头下拉选项
         const selectOptions = computed(() => {
-            const options = [...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
+            ];
         });
         // ======== 状态 =========
         const tableRef = ref(null); // 表格引用
@@ -102951,14 +102962,14 @@ var script$z = /*#__PURE__*/ defineComponent({
             getTableHeaderValues() {
                 const fields = [];
                 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(Object.assign(Object.assign({}, target), { originField }));
                         }
                     }
                 }
@@ -103186,7 +103197,8 @@ var script$y = defineComponent({
                     key: fieldName,
                     value: fieldName,
                     readonly: field.readonly === true,
-                    field: fieldName
+                    field: fieldName,
+                    originField: fieldName
                 };
             });
             if (type.value === QuickFillType.create) {
@@ -103557,6 +103569,7 @@ let QuickFillWidget = class QuickFillWidget extends BaseElementWidget {
     onSure(headers, rows) {
         return __awaiter(this, void 0, void 0, function* () {
             const values = [];
+            const keepValues = [];
             /**
              * 将excel数据转换成提交的数据格式
              * [['值1', '值2'], ['值1', '值2']] -> [{name: '值1', code: '值2'}, {name: '值1', code: '值2'}]
@@ -103565,40 +103578,39 @@ let QuickFillWidget = class QuickFillWidget extends BaseElementWidget {
             rows.forEach((row, rowIndex) => {
                 const rowValue = {};
                 const relationObjects = {};
+                const keepRowValue = {};
+                const keepRelationObjects = {};
                 row.forEach((cell, columnIndex) => {
                     var _a;
                     if (!cell) {
                         return;
                     }
-                    const fieldName = (_a = headers[columnIndex]) === null || _a === void 0 ? void 0 : _a.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, (_a = this.lastCells) === null || _a === void 0 ? void 0 : _a[`${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);
                 }
             });
             /**
              *  values -> 可回填的数据
              *  failures -> 错误信息
              */
-            const { values: resultValues, failures } = yield this.validateExcelValue(headers, JSON.stringify(values));
+            const { values: resultValues, failures } = yield this.validateExcelValue(headers, values, keepValues);
             const data = resultValues ? JSON.parse(resultValues) : [];
             /**
              * 如果存在错误，则展示表格，将后端返回数据回填到表格
@@ -103616,6 +103628,20 @@ let QuickFillWidget = class QuickFillWidget extends BaseElementWidget {
             }
         });
     }
+    setRowValue(rowValue, relationObjects, fieldName, cell) {
+        const [name1, name2] = fieldName.split('#');
+        if (name2) {
+            let target = relationObjects[name1];
+            if (!target) {
+                target = {};
+                relationObjects[name1] = target;
+            }
+            target[name2] = cell;
+        }
+        else {
+            rowValue[fieldName] = cell;
+        }
+    }
     /**
      * 继续提交
      */
@@ -103634,6 +103660,7 @@ let QuickFillWidget = class QuickFillWidget extends BaseElementWidget {
         var _a;
         // 处理空数据情况
         if (!((_a = this.dataSource) === null || _a === void 0 ? void 0 : _a.length)) {
+            this.lastCells = undefined;
             return {
                 rowCount: 0
             };
@@ -103670,6 +103697,7 @@ let QuickFillWidget = class QuickFillWidget extends BaseElementWidget {
                 cells[cellKey] = this.fillFieldValue(field, fieldValue);
             });
         });
+        this.lastCells = Object.assign({}, cells);
         return { cells, rowCount: this.dataSource.length };
     }
     fillFieldValue(field, value) {
@@ -103831,13 +103859,20 @@ let QuickFillWidget = class QuickFillWidget extends BaseElementWidget {
     /**
      * 调接口校验excel数据
      */
-    validateExcelValue(headers, values) {
+    validateExcelValue(headers, values, keepValues) {
         return __awaiter(this, void 0, void 0, function* () {
             const fields = [];
-            const validHeaders = headers.filter((v) => v.value !== NON_CUT);
-            const keepHeaders = headers.filter((v) => v.value === NON_CUT && v.field && !validHeaders.find((vv) => vv.value === v.field));
+            const validHeaders = [];
+            const keepHeaders = {};
+            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;
                 }
@@ -103852,27 +103887,52 @@ let QuickFillWidget = 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 (isRelationField(modelField)) {
-                    fields.push({
-                        field: modelField.data,
-                        validate: false,
-                        labelFields: modelField.referencesModel.labelFields
-                    });
+            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];
+                    }
                 }
-                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 === null || keepValue === void 0 ? void 0 : keepValue[modelField.data];
+                        if (t) {
+                            value[modelField.data] = t;
+                        }
+                        else {
+                            delete value[modelField.data];
+                        }
+                    }
                 }
             }
             const gqlStr = yield buildSingleItemParam(quickFillFields, {
                 model: this.model.model,
                 fields,
-                values
+                values: JSON.stringify(values)
             });
             const body = `{
       quickFillingQuery {
@@ -103894,15 +103954,7 @@ let QuickFillWidget = class QuickFillWidget extends BaseElementWidget {
             return rst.data.quickFillingQuery.loadData;
         });
     }
-    findModelField(fields, header) {
-        const { value, field } = header;
-        let data;
-        if (value === NON_CUT) {
-            data = field;
-        }
-        else {
-            data = value;
-        }
+    findModelField(fields, data) {
         let fieldWidget;
         const [name1, name2] = data.split('#');
         if (name2) {
@@ -113712,7 +113764,6 @@ const queryRoleList = (options = {
           name
           description
           source
-          permissionDataSource
           createDate
           writeDate
         }
@@ -113743,11 +113794,10 @@ const queryGroups = (options) => __awaiter(void 0, void 0, void 0, function* ()
 				id
 				name
 				type
-				dataSource
+				source
 				active
 				displayName
 				comment
-				menuName
 				roles {
 					code
 					name
@@ -113761,11 +113811,10 @@ const queryGroups = (options) => __awaiter(void 0, void 0, void 0, function* ()
 				id
 				name
 				type
-				dataSource
+				source
 				active
 				displayName
 				comment
-				menuName
 				roles {
 					code
 					name
@@ -114926,7 +114975,7 @@ var script$6 = /*#__PURE__*/ defineComponent({
                                             title: withCtx(({ title, data }) => [
                                                 createElementVNode("div", null, [
                                                     createTextVNode(toDisplayString(title) + " ", 1 /* TEXT */),
-                                                    createElementVNode("span", _hoisted_4$4, " >" + toDisplayString(data.menuName) + "/" + toDisplayString(data.displayValue), 1 /* TEXT */)
+                                                    createElementVNode("span", _hoisted_4$4, toDisplayString(data.menuName) + "/" + toDisplayString(data.displayValue), 1 /* TEXT */)
                                                 ])
                                             ]),
                                             _: 1 /* STABLE */
@@ -115522,7 +115571,7 @@ var script$4 = /*#__PURE__*/ defineComponent({
                                             }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["onClick"]))
                                             : createCommentVNode("v-if", true),
                                         createVNode(_component_a_divider, { type: "vertical" }),
-                                        (item.dataSource !== 'SYSTEM' && unref(hasDeleteGroupAction))
+                                        (item.source === 'MANUAL' && unref(hasDeleteGroupAction))
                                             ? (openBlock(), createBlock(_component_a_popconfirm, {
                                                 key: 1,
                                                 placement: "topLeft",