feat: 产物更新,表格列支持冻结(fixed)
- funjiaui.es.js / cjs / umd 重新构建,包含列冻结能力 - UmTable/types.d.ts 新增 TFixed,IFieldMetaValue / IOperateItem 增加 fixed - UmTable/core/columns.d.ts 新增 hasLeftFixedColumn 等导出 - UmTable/UmTableColumn.vue.d.ts 增加 fixed 属性 用法:数据列 fixed: "left" | "right" | true; 操作列在配置类上写 operateFixed = "right"。默认为不冻结,既有调用方行为不变。
This commit is contained in:
+85
-21
@@ -1416,6 +1416,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
|
||||
label: null,
|
||||
width: { default: 180 },
|
||||
minWidth: null,
|
||||
fixed: null,
|
||||
showOverflowTooltip: { type: Boolean },
|
||||
operateItems: { default: () => [] },
|
||||
expandTemplate: null,
|
||||
@@ -1435,7 +1436,8 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
|
||||
width: __props.minWidth ? void 0 : __props.width,
|
||||
"min-width": __props.minWidth,
|
||||
label: unref(resolvedLabel),
|
||||
"show-overflow-tooltip": __props.showOverflowTooltip
|
||||
"show-overflow-tooltip": __props.showOverflowTooltip,
|
||||
fixed: __props.fixed
|
||||
}, {
|
||||
default: withCtx((scope) => {
|
||||
var _a, _b;
|
||||
@@ -1460,7 +1462,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
|
||||
];
|
||||
}),
|
||||
_: 1
|
||||
}, 8, ["type", "prop", "width", "min-width", "label", "show-overflow-tooltip"]);
|
||||
}, 8, ["type", "prop", "width", "min-width", "label", "show-overflow-tooltip", "fixed"]);
|
||||
};
|
||||
}
|
||||
});
|
||||
@@ -3053,20 +3055,38 @@ async function runEventPipeline(options) {
|
||||
}
|
||||
return current;
|
||||
}
|
||||
const collectDataColumns = (target) => scanDecoratedMembers(target, "table:field").map((member) => ({
|
||||
sort: member.meta.sort || 1,
|
||||
vnode: h(_sfc_main$e, {
|
||||
prop: member.fieldName,
|
||||
label: member.meta.def,
|
||||
fieldType: member.meta.fieldType,
|
||||
width: member.meta.width,
|
||||
minWidth: member.meta.minWidth,
|
||||
columnRender: member.meta.columnRender,
|
||||
isShow: member.meta.isShow,
|
||||
showOverflowTooltip: member.meta.showOverflowTooltip,
|
||||
dateFormat: member.meta.dateFormat
|
||||
})
|
||||
})).sort((a, b) => a.sort - b.sort).map((item) => item.vnode);
|
||||
const collectDataColumns = (target) => scanDecoratedMembers(target, "table:field").map((member) => {
|
||||
var _a;
|
||||
return {
|
||||
sort: (_a = member.meta.sort) != null ? _a : 1,
|
||||
vnode: h(_sfc_main$e, {
|
||||
prop: member.fieldName,
|
||||
label: member.meta.def,
|
||||
fieldType: member.meta.fieldType,
|
||||
width: member.meta.width,
|
||||
minWidth: member.meta.minWidth,
|
||||
fixed: normalizeFixed(member.meta.fixed),
|
||||
columnRender: member.meta.columnRender,
|
||||
isShow: member.meta.isShow,
|
||||
showOverflowTooltip: member.meta.showOverflowTooltip,
|
||||
dateFormat: member.meta.dateFormat
|
||||
})
|
||||
};
|
||||
}).sort((a, b) => a.sort - b.sort).map((item) => item.vnode);
|
||||
const normalizeFixed = (value) => {
|
||||
if (value === true || value === "left")
|
||||
return "left";
|
||||
if (value === "right")
|
||||
return "right";
|
||||
return void 0;
|
||||
};
|
||||
const FIXED_VALUES = [true, false, "left", "right"];
|
||||
const hasLeftFixedColumn = (target) => scanDecoratedMembers(target, "table:field").some(
|
||||
(member) => normalizeFixed(member.meta.fixed) === "left"
|
||||
);
|
||||
const hasRightFixedColumn = (target) => scanDecoratedMembers(target, "table:field").some(
|
||||
(member) => normalizeFixed(member.meta.fixed) === "right"
|
||||
);
|
||||
const collectOperateGroups = (target) => {
|
||||
var _a;
|
||||
const groups = /* @__PURE__ */ new Map();
|
||||
@@ -3117,6 +3137,12 @@ const resolveOperateWidth = (target, fallback = "120px") => {
|
||||
const instance = createTargetInstance(target);
|
||||
return (_b = (_a = instance.operateWidth) != null ? _a : target == null ? void 0 : target.operateWidth) != null ? _b : fallback;
|
||||
};
|
||||
const resolveOperateFixed = (target) => {
|
||||
var _a;
|
||||
const instance = createTargetInstance(target);
|
||||
const value = (_a = instance.operateFixed) != null ? _a : target == null ? void 0 : target.operateFixed;
|
||||
return normalizeFixed(value);
|
||||
};
|
||||
const isDeferredAfter = (type, deferred) => !!(deferred == null ? void 0 : deferred.some((item) => item === type));
|
||||
const withoutDeferredAfter = (tasks, deferred) => tasks.filter(
|
||||
(task) => {
|
||||
@@ -3138,6 +3164,7 @@ const buildOperateColumn = (groups, options) => {
|
||||
fire,
|
||||
tableData = [],
|
||||
width = "120px",
|
||||
fixed,
|
||||
deferAfterTypes
|
||||
} = options;
|
||||
const operateItems = [...groups].sort((a, b) => a.sort - b.sort).map((group) => ({
|
||||
@@ -3158,7 +3185,8 @@ const buildOperateColumn = (groups, options) => {
|
||||
type: "operate",
|
||||
label: "\u64CD\u4F5C",
|
||||
operateItems,
|
||||
width
|
||||
width,
|
||||
fixed
|
||||
});
|
||||
};
|
||||
const collectTypedTasks = (target, decoratorKey, type) => sortTasksByPriority(
|
||||
@@ -3410,6 +3438,15 @@ const diagnoseTarget = (target, options = {}) => {
|
||||
hint: `\u5408\u6CD5\u503C\uFF1A${Object.keys(FIELD_TYPE_SET).join(" / ")}`
|
||||
});
|
||||
}
|
||||
if (dKey === "table:field" && meta.fixed !== void 0 && meta.fixed !== null && !FIXED_VALUES.includes(meta.fixed)) {
|
||||
push({
|
||||
level: "warn",
|
||||
code: "invalid-fixed-value",
|
||||
member: entry.member.key,
|
||||
message: `fixed: ${JSON.stringify(meta.fixed)} \u4E0D\u662F\u5408\u6CD5\u7684\u51BB\u7ED3\u65B9\u5411\uFF0C\u8FD9\u4E00\u5217\u4E0D\u4F1A\u88AB\u51BB\u7ED3`,
|
||||
hint: '\u53EF\u7528 "left" / "right"\uFF08true \u7B49\u4EF7\u4E8E "left"\uFF09'
|
||||
});
|
||||
}
|
||||
}
|
||||
if ((formMeta == null ? void 0 : formMeta.fieldType) && FORM_UNIMPLEMENTED.has(formMeta.fieldType) && !formMeta.component) {
|
||||
push({
|
||||
@@ -3452,6 +3489,28 @@ const diagnoseTarget = (target, options = {}) => {
|
||||
hint: "\u68C0\u67E5 @TableColumnPropertyDecorator \u662F\u5426\u6302\u5728\u4E86\u7C7B\u7684\u5C5E\u6027\u4E0A\uFF08\u800C\u4E0D\u662F\u9759\u6001\u5C5E\u6027 / \u6784\u9020\u51FD\u6570\u91CC\uFF09"
|
||||
});
|
||||
}
|
||||
const orderedColumns = [...columns].sort(
|
||||
(a, b) => {
|
||||
var _a2, _b2;
|
||||
return ((_a2 = a.meta.sort) != null ? _a2 : 1) - ((_b2 = b.meta.sort) != null ? _b2 : 1);
|
||||
}
|
||||
);
|
||||
const fixDirs = orderedColumns.map((column) => normalizeFixed(column.meta.fixed));
|
||||
const reportFixedEdge = (column, dir) => push({
|
||||
level: "warn",
|
||||
code: "fixed-column-not-at-edge",
|
||||
member: column.key,
|
||||
message: `"${column.meta.def || column.key}" \u51BB\u7ED3\u5230\u4E86${dir === "left" ? "\u5DE6" : "\u53F3"}\u4FA7\uFF0C\u4F46\u5B83\u7684${dir === "left" ? "\u524D\u9762" : "\u540E\u9762"}\u8FD8\u6709\u4E0D\u51BB\u7ED3\u7684\u5217\uFF0C\u8FD9\u4E00\u5217\u4E0D\u4F1A\u771F\u7684\u51BB\u7ED3`,
|
||||
hint: `\u51BB\u7ED3\u5217\u5FC5\u987B\u4ECE\u8FB9\u7F18\u8D77\u8FDE\u7EED\uFF1A\u6539 sort \u628A\u5B83\u6392\u5230${dir === "left" ? "\u6700\u524D" : "\u6700\u540E"}\uFF0C\u6216\u8005\u8BA9\u76F8\u90BB\u7684\u5217\u4E00\u8D77 fixed`
|
||||
});
|
||||
orderedColumns.forEach((column, index) => {
|
||||
const dir = fixDirs[index];
|
||||
if (!dir)
|
||||
return;
|
||||
const blocked = dir === "left" ? fixDirs.slice(0, index).some((item) => item !== "left") : fixDirs.slice(index + 1).some((item) => item !== "right");
|
||||
if (blocked)
|
||||
reportFixedEdge(column, dir);
|
||||
});
|
||||
const hasFormSubmit = byType.has("edit") || byType.has("\u6DFB\u52A0");
|
||||
const primaryKeys = columns.filter(
|
||||
(column) => column.meta.fieldType === "primaryKey"
|
||||
@@ -3569,12 +3628,14 @@ const _sfc_main$d = defineComponent({
|
||||
});
|
||||
let columnList = collectDataColumns(target);
|
||||
const deferAfterTypes = this.$attrs["defer-after-types"];
|
||||
const leadFixed = hasLeftFixedColumn(target) ? "left" : void 0;
|
||||
const operateGroups = collectOperateGroups(target);
|
||||
if (resolveShowOperate(target, operateGroups.length > 0)) {
|
||||
const operateColumn = buildOperateColumn(operateGroups, {
|
||||
fire,
|
||||
tableData: data,
|
||||
width: resolveOperateWidth(target),
|
||||
fixed: resolveOperateFixed(target),
|
||||
deferAfterTypes
|
||||
});
|
||||
if (operateColumn)
|
||||
@@ -3587,19 +3648,22 @@ const _sfc_main$d = defineComponent({
|
||||
columnList = [
|
||||
h(_sfc_main$e, {
|
||||
type: "expand",
|
||||
expandTemplate: this.$attrs["expand-template"]
|
||||
expandTemplate: this.$attrs["expand-template"],
|
||||
fixed: leadFixed
|
||||
})
|
||||
].concat(columnList);
|
||||
}
|
||||
const hasIndex = this.$attrs["show-index"] !== false;
|
||||
if (hasIndex) {
|
||||
columnList = [
|
||||
h(ElTableColumn, { type: "index", label: "\u5E8F\u53F7", width: 56 })
|
||||
h(ElTableColumn, { type: "index", label: "\u5E8F\u53F7", width: 56, fixed: leadFixed })
|
||||
].concat(columnList);
|
||||
}
|
||||
const enableSelection = toolbars.some((item) => item.type === "\u6279\u91CF\u5220\u9664");
|
||||
if (enableSelection) {
|
||||
columnList = [h(ElTableColumn, { type: "selection" })].concat(columnList);
|
||||
columnList = [
|
||||
h(ElTableColumn, { type: "selection", fixed: leadFixed })
|
||||
].concat(columnList);
|
||||
}
|
||||
return h(
|
||||
UmTable,
|
||||
@@ -5629,4 +5693,4 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
||||
};
|
||||
}
|
||||
});
|
||||
export { _sfc_main as AreaTree, DEFAULT_DEFER_TYPES, EVENT_PHASES, _sfc_main$k as Iconfont, TableColumnMethodDecorator, TableColumnPropertyDecorator, TableFormColumnPropertyDecorator, TableSearchFormPropertyDecorator, _sfc_main$d as UmByClass, UmByClassEnhance, UmColumnRender, _sfc_main$c as UmDialog, UmDistrictTree, UmDistrictTreeNode, UmPagination, UmSearchForm, _sfc_main$3 as UmSyncNodeForm, UmTable, _sfc_main$e as UmTableColumn, _sfc_main$b as UmTableDialog, UmTableForm, UmTableOperate, UmTableToolbar, _sfc_main$6 as UmTree, _sfc_main$5 as UmTreeSelect, buildOperateColumn, collectClassMembers, collectDataColumns, collectOperateGroups, collectToolbar, collectTypedTasks, createTargetInstance, diagnoseTarget, findMethodMeta, getMemberMeta, isDiagnosticsEnabled, normalizeFieldName, reportDiagnostics, reportDiagnosticsOnce, resolveOperateWidth, resolveShowOperate, runEventPipeline, scanDecoratedMembers, setDiagnosticsEnabled, sortTasksByPriority, transformFields };
|
||||
export { _sfc_main as AreaTree, DEFAULT_DEFER_TYPES, EVENT_PHASES, FIXED_VALUES, _sfc_main$k as Iconfont, TableColumnMethodDecorator, TableColumnPropertyDecorator, TableFormColumnPropertyDecorator, TableSearchFormPropertyDecorator, _sfc_main$d as UmByClass, UmByClassEnhance, UmColumnRender, _sfc_main$c as UmDialog, UmDistrictTree, UmDistrictTreeNode, UmPagination, UmSearchForm, _sfc_main$3 as UmSyncNodeForm, UmTable, _sfc_main$e as UmTableColumn, _sfc_main$b as UmTableDialog, UmTableForm, UmTableOperate, UmTableToolbar, _sfc_main$6 as UmTree, _sfc_main$5 as UmTreeSelect, buildOperateColumn, collectClassMembers, collectDataColumns, collectOperateGroups, collectToolbar, collectTypedTasks, createTargetInstance, diagnoseTarget, findMethodMeta, getMemberMeta, hasLeftFixedColumn, hasRightFixedColumn, isDiagnosticsEnabled, normalizeFieldName, normalizeFixed, reportDiagnostics, reportDiagnosticsOnce, resolveOperateFixed, resolveOperateWidth, resolveShowOperate, runEventPipeline, scanDecoratedMembers, setDiagnosticsEnabled, sortTasksByPriority, transformFields };
|
||||
|
||||
Reference in New Issue
Block a user