Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:art: Share attribute view field groups and filter profiles https://github.com/siyuan-note/siyuan/issues/20279

Daniel144d3324542b
diff --git a/app/src/protyle/render/av/capabilities.generated.ts b/app/src/protyle/render/av/capabilities.generated.ts
index d778d272bc..4214591068 100644
--- a/app/src/protyle/render/av/capabilities.generated.ts
+++ b/app/src/protyle/render/av/capabilities.generated.ts
@@ -1,25 +1,40 @@
// 此文件由内核字段能力声明生成,请运行 pnpm run api:generate 更新。
-import type {AVKeyType, AVKeyCapability} from "../../../types/av";
+import type {AVKeyType, AVKeyCapability, AVFilterProfile, AVFilterCapability, AVCalcOperator} from "../../../types/av";
export const AV_KEY_TYPES: readonly AVKeyType[] = ["block","text","number","date","select","mSelect","url","email","phone","mAsset","template","created","updated","checkbox","relation","rollup","lineNumber"];
export const AV_KEY_CAPABILITIES: Readonly<Record<AVKeyType, AVKeyCapability>> = {
- "block": {"valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
- "text": {"valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
- "number": {"valueKind":"number","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
- "date": {"valueKind":"date","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
- "select": {"valueKind":"options","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
- "mSelect": {"valueKind":"options","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
- "url": {"valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
- "email": {"valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
- "phone": {"valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
- "mAsset": {"valueKind":"assets","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
- "template": {"valueKind":"text","editable":false,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
- "created": {"valueKind":"timestamp","editable":false,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
- "updated": {"valueKind":"timestamp","editable":false,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
- "checkbox": {"valueKind":"checkbox","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
- "relation": {"valueKind":"relation","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains any item"},
- "rollup": {"valueKind":"rollup","editable":false,"filterable":true,"sortable":true,"groupable":false,"defaultOperator":"Contains"},
- "lineNumber": {"valueKind":"lineNumber","editable":false,"filterable":false,"sortable":false,"groupable":false,"defaultOperator":""},
+ "block": {"groups":["richText","link","scalarContent"],"filterProfile":"text","valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
+ "text": {"groups":["richText","scalarContent","attributePlaceholder","newItemTemplate"],"filterProfile":"text","valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
+ "number": {"groups":["scalarContent","attributePlaceholder","newItemTemplate"],"filterProfile":"number","valueKind":"number","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
+ "date": {"groups":["attributePlaceholder","newItemTemplate"],"filterProfile":"date","valueKind":"date","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
+ "select": {"groups":["rollupCell","newItemTemplate"],"filterProfile":"select","valueKind":"options","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
+ "mSelect": {"groups":["rollupCell","newItemTemplate"],"filterProfile":"mSelect","valueKind":"options","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
+ "url": {"groups":["link","scalarContent","attributePlaceholder","newItemTemplate"],"filterProfile":"text","valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
+ "email": {"groups":["richText","link","scalarContent","attributePlaceholder","newItemTemplate"],"filterProfile":"text","valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
+ "phone": {"groups":["richText","link","scalarContent","attributePlaceholder","newItemTemplate"],"filterProfile":"text","valueKind":"text","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
+ "mAsset": {"groups":["scalarContent","rollupCell","newItemTemplate","renderDependentFilter"],"filterProfile":"text","valueKind":"assets","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
+ "template": {"groups":["richText","scalarContent","attributePlaceholder","rollupCell","noFilterDefault","renderDependentFilter","renderAutoFill","rollupAlwaysRender"],"filterProfile":"template","valueKind":"text","editable":false,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains"},
+ "created": {"groups":["noFilterDefault","renderDependentFilter","skipRowCopy","renderAutoFill","rollupForeignRender"],"filterProfile":"date","valueKind":"timestamp","editable":false,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
+ "updated": {"groups":["noFilterDefault","renderDependentFilter","skipRowCopy","renderAutoFill","rollupForeignRender"],"filterProfile":"date","valueKind":"timestamp","editable":false,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
+ "checkbox": {"groups":["newItemTemplate"],"filterProfile":"checkbox","valueKind":"checkbox","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"="},
+ "relation": {"groups":["rollupCell","newItemTemplate","rollupForeignRender"],"filterProfile":"relation","valueKind":"relation","editable":true,"filterable":true,"sortable":true,"groupable":true,"defaultOperator":"Contains any item"},
+ "rollup": {"groups":["noFilterDefault","renderDependentFilter","skipRowCopy"],"filterProfile":"rollup","valueKind":"rollup","editable":false,"filterable":true,"sortable":true,"groupable":false,"defaultOperator":"Contains"},
+ "lineNumber": {"groups":["none"],"filterProfile":"none","valueKind":"lineNumber","editable":false,"filterable":false,"sortable":false,"groupable":false,"defaultOperator":""},
};
+
+export const AV_FILTER_CAPABILITIES: Readonly<Record<AVFilterProfile, AVFilterCapability>> = {
+ "checkbox": {"accepted":["=","!=","Is true","Is false"],"offered":["=","!="]},
+ "date": {"accepted":["=","\u003e","\u003c","\u003e=","\u003c=","Is between","Is empty","Is not empty"],"offered":["=","\u003e","\u003c","\u003e=","\u003c=","Is between","Is empty","Is not empty"]},
+ "mSelect": {"accepted":["Contains","Does not contains","Is empty","Is not empty"],"offered":["Contains","Does not contains","Is empty","Is not empty"]},
+ "none": {"accepted":[],"offered":[]},
+ "number": {"accepted":["=","!=","\u003e","\u003c","\u003e=","\u003c=","Is empty","Is not empty"],"offered":["=","!=","\u003e","\u003c","\u003e=","\u003c=","Is empty","Is not empty"]},
+ "relation": {"accepted":["Contains any item","Does not contain any item","Contains","Does not contains","Is empty","Is not empty"],"offered":["Contains any item","Does not contain any item","Contains","Does not contains","Is empty","Is not empty"],"offeredRollup":["Contains","Does not contains","Is empty","Is not empty"]},
+ "rollup": {"accepted":["=","!=","\u003e","\u003e=","\u003c","\u003c=","Contains","Does not contains","Contains any item","Does not contain any item","Is empty","Is not empty","Starts with","Ends with","Is between"],"offered":[]},
+ "select": {"accepted":["=","!=","Is empty","Is not empty"],"offered":["=","!=","Is empty","Is not empty"]},
+ "template": {"accepted":["=","!=","Contains","Does not contains","Starts with","Ends with","Is empty","Is not empty","\u003e","\u003c","\u003e=","\u003c="],"offered":["=","!=","Contains","Does not contains","Starts with","Ends with","Is empty","Is not empty","\u003e","\u003c","\u003e=","\u003c="]},
+ "text": {"accepted":["=","!=","Contains","Does not contains","Starts with","Ends with","Is empty","Is not empty"],"offered":["=","!=","Contains","Does not contains","Starts with","Ends with","Is empty","Is not empty"]},
+};
+
+export const AV_CALC_FILTER_NUMBER_OPERATORS: readonly AVCalcOperator[] = ["Average","Checked","Count all","Count empty","Count not empty","Count unique values","Count values","Max","Median","Min","Percent checked","Percent empty","Percent not empty","Percent unchecked","Percent unique values","Sum","Unchecked"];
diff --git a/app/src/protyle/render/av/capabilities.ts b/app/src/protyle/render/av/capabilities.ts
index 1c085e0ab9..c614d18c12 100644
--- a/app/src/protyle/render/av/capabilities.ts
+++ b/app/src/protyle/render/av/capabilities.ts
@@ -1,5 +1,5 @@
-import type {AVFilterOperator, AVKeyCapability, AVKeyType} from "../../../types/av";
-import {AV_KEY_CAPABILITIES, AV_KEY_TYPES} from "./capabilities.generated";
+import type {AVFilterOperator, AVKeyCapability, AVKeyGroup, AVKeyType} from "../../../types/av";
+import {AV_CALC_FILTER_NUMBER_OPERATORS, AV_FILTER_CAPABILITIES, AV_KEY_CAPABILITIES, AV_KEY_TYPES} from "./capabilities.generated";
export const isAVKeyType = (type: string): type is AVKeyType =>
Object.prototype.hasOwnProperty.call(AV_KEY_CAPABILITIES, type);
@@ -31,22 +31,34 @@ export const isAVTextType = (type: string | undefined | null) =>
export const isAVReadonlyType = (type: string | undefined | null) =>
getAVKeyCapability(type)?.editable === false;
-export const isAVRichTextType = (type: string | undefined | null) => isAVTextType(type) && type !== "url";
+export const hasAVKeyGroup = (type: string | undefined | null, group: AVKeyGroup) =>
+ getAVKeyCapability(type)?.groups?.includes(group) === true;
+
+export const isAVRichTextType = (type: string | undefined | null) => hasAVKeyGroup(type, "richText");
export const isAVLinkType = (type: string | undefined | null) =>
- isAVTextType(type) && type !== "text" && type !== "template";
+ hasAVKeyGroup(type, "link");
export const hasAVScalarContent = (type: string | undefined | null) =>
- isAVTextType(type) || type === "number" || type === "mAsset";
+ hasAVKeyGroup(type, "scalarContent");
export const hasAVAttributePlaceholder = (type: string | undefined | null) =>
- isAVTextType(type) && type !== "block" || type === "number" || type === "date";
+ hasAVKeyGroup(type, "attributePlaceholder");
export const usesAVRollupCellRenderer = (type: string | undefined | null) =>
- isAVSelectType(type) || type === "template" || type === "mAsset" || type === "relation";
+ hasAVKeyGroup(type, "rollupCell");
export const isAVNewItemTemplateType = (type: string | undefined | null) =>
- hasAVCapability(type, "editable") && type !== "block";
+ hasAVKeyGroup(type, "newItemTemplate");
+
+export const getAVOfferedFilterOperators = (type: string, isRollup = false): readonly AVFilterOperator[] => {
+ const profile = getAVKeyCapability(type)?.filterProfile;
+ const capability = profile && AV_FILTER_CAPABILITIES[profile];
+ return capability ? (isRollup && capability.offeredRollup || capability.offered) : [];
+};
+
+export const isAVNumericFilterCalcOperator = (operator: string | undefined) =>
+ AV_CALC_FILTER_NUMBER_OPERATORS.some(item => item === operator);
export const getAVDefaultFilterOperator = (type: string, isRollup = false): AVFilterOperator | undefined => {
if (type === "relation" && isRollup) {
diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.ts
index 24e7d654ca..f5b2019393 100644
--- a/app/src/protyle/render/av/filter.ts
+++ b/app/src/protyle/render/av/filter.ts
@@ -1,4 +1,4 @@
-import {getAVDefaultFilterOperator, hasAVCapability, hasAVScalarContent, isAVDateType, isAVTextType} from "./capabilities";
+import {getAVDefaultFilterOperator, getAVOfferedFilterOperators, hasAVCapability, hasAVScalarContent, isAVDateType, isAVNumericFilterCalcOperator, isAVTextType} from "./capabilities";
import {Menu} from "../../../plugin/Menu";
import {transaction} from "../../wysiwyg/transaction";
import {escapeAttr, escapeHtml} from "../../../util/escape";
@@ -379,59 +379,35 @@ export const convertGroupToFilter = (nodes: IAVFilter[], path: string): boolean
// getOperatorSelectByType 按值类型生成操作符 <select> 的 option HTML,标记当前 operator 为 selected。
const getOperatorSelectByType = (type: TAVCol, currentOperator: string, isRollup: boolean): string => {
const opt = (value: string, label: string) => `<option ${value === currentOperator ? "selected" : ""} value="${value}">${label}</option>`;
- switch (type) {
- case "checkbox":
- return opt("=", window.siyuan.languages.filterOperatorIs) + opt("!=", window.siyuan.languages.filterOperatorIsNot);
- case "block":
- case "mAsset":
- case "text":
- case "url":
- case "phone":
- case "email":
- return opt("=", window.siyuan.languages.filterOperatorIs) + opt("!=", window.siyuan.languages.filterOperatorIsNot) +
- opt("Contains", window.siyuan.languages.filterOperatorContains) + opt("Does not contains", window.siyuan.languages.filterOperatorDoesNotContain) +
- opt("Starts with", window.siyuan.languages.filterOperatorStartsWith) + opt("Ends with", window.siyuan.languages.filterOperatorEndsWith) +
- opt("Is empty", window.siyuan.languages.filterOperatorIsEmpty) + opt("Is not empty", window.siyuan.languages.filterOperatorIsNotEmpty);
- case "template":
- return opt("=", window.siyuan.languages.filterOperatorIs) + opt("!=", window.siyuan.languages.filterOperatorIsNot) +
- opt("Contains", window.siyuan.languages.filterOperatorContains) + opt("Does not contains", window.siyuan.languages.filterOperatorDoesNotContain) +
- opt("Starts with", window.siyuan.languages.filterOperatorStartsWith) + opt("Ends with", window.siyuan.languages.filterOperatorEndsWith) +
- opt("Is empty", window.siyuan.languages.filterOperatorIsEmpty) + opt("Is not empty", window.siyuan.languages.filterOperatorIsNotEmpty) +
- opt(">", "&gt;") + opt("<", "&lt;") + opt(">=", "&GreaterEqual;") + opt("<=", "&le;");
- case "date":
- case "created":
- case "updated":
- return opt("=", window.siyuan.languages.filterOperatorIs) + opt(">", window.siyuan.languages.filterOperatorIsAfter) +
- opt("<", window.siyuan.languages.filterOperatorIsBefore) + opt(">=", window.siyuan.languages.filterOperatorIsOnOrAfter) +
- opt("<=", window.siyuan.languages.filterOperatorIsOnOrBefore) + opt("Is between", window.siyuan.languages.filterOperatorIsBetween) +
- opt("Is empty", window.siyuan.languages.filterOperatorIsEmpty) + opt("Is not empty", window.siyuan.languages.filterOperatorIsNotEmpty);
- case "number":
- return opt("=", "=") + opt("!=", "!=") + opt(">", "&gt;") + opt("<", "&lt;") +
- opt(">=", "&GreaterEqual;") + opt("<=", "&le;") +
- opt("Is empty", window.siyuan.languages.filterOperatorIsEmpty) + opt("Is not empty", window.siyuan.languages.filterOperatorIsNotEmpty);
- case "mSelect":
- return opt("Contains", window.siyuan.languages.filterOperatorContains) + opt("Does not contains", window.siyuan.languages.filterOperatorDoesNotContain) +
- opt("Is empty", window.siyuan.languages.filterOperatorIsEmpty) + opt("Is not empty", window.siyuan.languages.filterOperatorIsNotEmpty);
- case "relation":
- if (isRollup) {
- return opt("Contains", window.siyuan.languages.filterOperatorContains) +
- opt("Does not contains", window.siyuan.languages.filterOperatorDoesNotContain) +
- opt("Is empty", window.siyuan.languages.filterOperatorIsEmpty) +
- opt("Is not empty", window.siyuan.languages.filterOperatorIsNotEmpty);
- }
- return opt("Contains any item", window.siyuan.languages.filterOperatorContainsAnyItem) +
- opt("Does not contain any item", window.siyuan.languages.filterOperatorDoesNotContainAnyItem) +
- opt("Contains", window.siyuan.languages.filterOperatorContainsKeyword) +
- opt("Does not contains", window.siyuan.languages.filterOperatorDoesNotContainKeyword) +
- opt("Is empty", window.siyuan.languages.filterOperatorIsEmpty) +
- opt("Is not empty", window.siyuan.languages.filterOperatorIsNotEmpty);
- case "select":
- return opt("=", isRollup ? window.siyuan.languages.filterOperatorIs : window.siyuan.languages.filterOperatorContains) +
- opt("!=", isRollup ? window.siyuan.languages.filterOperatorIsNot : window.siyuan.languages.filterOperatorDoesNotContain) +
- opt("Is empty", window.siyuan.languages.filterOperatorIsEmpty) + opt("Is not empty", window.siyuan.languages.filterOperatorIsNotEmpty);
- default:
- return "";
+ const languages = window.siyuan.languages;
+ const labels: Partial<Record<TAVFilterOperator, string>> = {
+ "=": languages.filterOperatorIs,
+ "!=": languages.filterOperatorIsNot,
+ "Contains": languages.filterOperatorContains,
+ "Does not contains": languages.filterOperatorDoesNotContain,
+ "Starts with": languages.filterOperatorStartsWith,
+ "Ends with": languages.filterOperatorEndsWith,
+ "Is empty": languages.filterOperatorIsEmpty,
+ "Is not empty": languages.filterOperatorIsNotEmpty,
+ "Contains any item": languages.filterOperatorContainsAnyItem,
+ "Does not contain any item": languages.filterOperatorDoesNotContainAnyItem,
+ "Is between": languages.filterOperatorIsBetween,
+ ">": isAVDateType(type) ? languages.filterOperatorIsAfter : "&gt;",
+ "<": isAVDateType(type) ? languages.filterOperatorIsBefore : "&lt;",
+ ">=": isAVDateType(type) ? languages.filterOperatorIsOnOrAfter : "&GreaterEqual;",
+ "<=": isAVDateType(type) ? languages.filterOperatorIsOnOrBefore : "&le;",
+ };
+ if (type === "number") {
+ labels["="] = "=";
+ labels["!="] = "!=";
+ } else if (type === "select" && !isRollup) {
+ labels["="] = languages.filterOperatorContains;
+ labels["!="] = languages.filterOperatorDoesNotContain;
+ } else if (type === "relation" && !isRollup) {
+ labels.Contains = languages.filterOperatorContainsKeyword;
+ labels["Does not contains"] = languages.filterOperatorDoesNotContainKeyword;
}
+ return getAVOfferedFilterOperators(type, isRollup).map(operator => opt(operator, labels[operator])).join("");
};
const rollupTargetColumns = new WeakMap<IAVColumn, IAVColumn>();
@@ -547,12 +523,7 @@ const resolveFilterValueType = (filter: IAVFilter, colData: IAVColumn): { type:
const rollup = filter.value?.rollup;
const contentType = rollup?.contents?.[0]?.type as TAVCol;
const calcOperator = colData.rollup?.calc?.operator;
- const numberOperators = [
- "Count all", "Count values", "Count unique values", "Count empty", "Count not empty",
- "Percent empty", "Percent not empty", "Percent unique values", "Sum", "Average", "Median", "Min", "Max",
- "Checked", "Unchecked", "Percent checked", "Percent unchecked",
- ];
- const resolvedType = numberOperators.includes(calcOperator)
+ const resolvedType = isAVNumericFilterCalcOperator(calcOperator)
? "number"
: targetColumn?.type || contentType || "text";
return {type: resolvedType, colData: targetColumn || colData, isRollup: true};
diff --git a/app/src/protyle/render/av/filterCapabilities.test.ts b/app/src/protyle/render/av/filterCapabilities.test.ts
new file mode 100644
index 0000000000..eebd8004cf
--- /dev/null
+++ b/app/src/protyle/render/av/filterCapabilities.test.ts
@@ -0,0 +1,34 @@
+import * as assert from "node:assert/strict";
+import {readFileSync} from "node:fs";
+import {test} from "node:test";
+import * as ts from "typescript";
+import {getAVOfferedFilterOperators, isAVDateType, isAVNumericFilterCalcOperator} from "./capabilities";
+
+test("filter options preserve labels, order, selection and rollup distinctions", () => {
+ const source = ts.createSourceFile("filter.ts", readFileSync(`${__dirname}/filter.ts`, "utf8"), ts.ScriptTarget.Latest, true);
+ const declaration = source.statements.find(node => ts.isVariableStatement(node) &&
+ node.declarationList.declarations.some(item => item.name.getText(source) === "getOperatorSelectByType"));
+ const compiled = ts.transpileModule(`${declaration.getText(source)}\nreturn getOperatorSelectByType;`, {
+ compilerOptions: {target: ts.ScriptTarget.ES2021},
+ }).outputText;
+ const options = new Function("window", "getAVOfferedFilterOperators", "isAVDateType", compiled)(
+ {siyuan: {languages: new Proxy({}, {get: (_target, key) => String(key)})}},
+ getAVOfferedFilterOperators, isAVDateType,
+ );
+ const baseline = JSON.parse(readFileSync(`${__dirname}/fixtures/filter-options.json`, "utf8"));
+ for (const [type, expected] of Object.entries(baseline)) {
+ assert.deepEqual([false, true].map(rollup => options(type, "Contains", rollup)), expected, type);
+ }
+});
+
+test("rollup numeric filters preserve target fallback for range and unknown operators", () => {
+ const numbers = ["Count all", "Count values", "Count unique values", "Count empty", "Count not empty",
+ "Percent empty", "Percent not empty", "Percent unique values", "Sum", "Average", "Median", "Min", "Max",
+ "Checked", "Unchecked", "Percent checked", "Percent unchecked"];
+ for (const operator of numbers) {
+ assert.equal(isAVNumericFilterCalcOperator(operator), true, operator);
+ }
+ for (const operator of ["", "Unique values", "Range", "Earliest", "Latest", "Template", "unknown", undefined]) {
+ assert.equal(isAVNumericFilterCalcOperator(operator), false, operator);
+ }
+});
diff --git a/app/src/protyle/render/av/fixtures/filter-options.json b/app/src/protyle/render/av/fixtures/filter-options.json
new file mode 100644
index 0000000000..9784021e7a
--- /dev/null
+++ b/app/src/protyle/render/av/fixtures/filter-options.json
@@ -0,0 +1,74 @@
+{
+ "block": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "text": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "number": [
+ "<option value=\"=\">=</option><option value=\"!=\">!=</option><option value=\">\">&gt;</option><option value=\"<\">&lt;</option><option value=\">=\">&GreaterEqual;</option><option value=\"<=\">&le;</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">=</option><option value=\"!=\">!=</option><option value=\">\">&gt;</option><option value=\"<\">&lt;</option><option value=\">=\">&GreaterEqual;</option><option value=\"<=\">&le;</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "date": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\">\">filterOperatorIsAfter</option><option value=\"<\">filterOperatorIsBefore</option><option value=\">=\">filterOperatorIsOnOrAfter</option><option value=\"<=\">filterOperatorIsOnOrBefore</option><option value=\"Is between\">filterOperatorIsBetween</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\">\">filterOperatorIsAfter</option><option value=\"<\">filterOperatorIsBefore</option><option value=\">=\">filterOperatorIsOnOrAfter</option><option value=\"<=\">filterOperatorIsOnOrBefore</option><option value=\"Is between\">filterOperatorIsBetween</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "select": [
+ "<option value=\"=\">filterOperatorContains</option><option value=\"!=\">filterOperatorDoesNotContain</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "mSelect": [
+ "<option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "url": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "email": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "phone": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "mAsset": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "template": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option><option value=\">\">&gt;</option><option value=\"<\">&lt;</option><option value=\">=\">&GreaterEqual;</option><option value=\"<=\">&le;</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option><option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Starts with\">filterOperatorStartsWith</option><option value=\"Ends with\">filterOperatorEndsWith</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option><option value=\">\">&gt;</option><option value=\"<\">&lt;</option><option value=\">=\">&GreaterEqual;</option><option value=\"<=\">&le;</option>"
+ ],
+ "created": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\">\">filterOperatorIsAfter</option><option value=\"<\">filterOperatorIsBefore</option><option value=\">=\">filterOperatorIsOnOrAfter</option><option value=\"<=\">filterOperatorIsOnOrBefore</option><option value=\"Is between\">filterOperatorIsBetween</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\">\">filterOperatorIsAfter</option><option value=\"<\">filterOperatorIsBefore</option><option value=\">=\">filterOperatorIsOnOrAfter</option><option value=\"<=\">filterOperatorIsOnOrBefore</option><option value=\"Is between\">filterOperatorIsBetween</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "updated": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\">\">filterOperatorIsAfter</option><option value=\"<\">filterOperatorIsBefore</option><option value=\">=\">filterOperatorIsOnOrAfter</option><option value=\"<=\">filterOperatorIsOnOrBefore</option><option value=\"Is between\">filterOperatorIsBetween</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\">\">filterOperatorIsAfter</option><option value=\"<\">filterOperatorIsBefore</option><option value=\">=\">filterOperatorIsOnOrAfter</option><option value=\"<=\">filterOperatorIsOnOrBefore</option><option value=\"Is between\">filterOperatorIsBetween</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "checkbox": [
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option>",
+ "<option value=\"=\">filterOperatorIs</option><option value=\"!=\">filterOperatorIsNot</option>"
+ ],
+ "relation": [
+ "<option value=\"Contains any item\">filterOperatorContainsAnyItem</option><option value=\"Does not contain any item\">filterOperatorDoesNotContainAnyItem</option><option selected value=\"Contains\">filterOperatorContainsKeyword</option><option value=\"Does not contains\">filterOperatorDoesNotContainKeyword</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>",
+ "<option selected value=\"Contains\">filterOperatorContains</option><option value=\"Does not contains\">filterOperatorDoesNotContain</option><option value=\"Is empty\">filterOperatorIsEmpty</option><option value=\"Is not empty\">filterOperatorIsNotEmpty</option>"
+ ],
+ "rollup": [
+ "",
+ ""
+ ],
+ "lineNumber": [
+ "",
+ ""
+ ],
+ "unknown": [
+ "",
+ ""
+ ]
+}
\ No newline at end of file
diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.ts
index aea8d38503..d3c24c96a4 100644
--- a/app/src/protyle/util/editorCommonEvent.ts
+++ b/app/src/protyle/util/editorCommonEvent.ts
@@ -1,3 +1,4 @@
+import {hasAVKeyGroup} from "../render/av/capabilities";
import type {FileTreeGetDocRequestInput} from "../../types/api";
import {cleanupDragIndicators, createListDragTarget} from "./listDragTarget";
import {focusBlock, getRangeByPoint} from "./selection";
@@ -2683,7 +2684,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
// 模板渲染结果及无法回填的字段作为分组方式时不允许跨分组拖拽
// https://github.com/siyuan-note/siyuan/issues/15553
const isTCU = getAVData(blockElement)?.view.group?.valueSource === "rendered" ||
- ["template", "created", "updated"].includes(bodyElement.getAttribute("data-dtype"));
+ hasAVKeyGroup(bodyElement.getAttribute("data-dtype"), "renderAutoFill");
gutterTypes[2].split(",").find(item => {
const sourceGroupID = item ? item.split("@")[1] : "";
if (sourceGroupID !== groupID && isTCU) {
@@ -2707,7 +2708,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
// 模板渲染结果及无法回填的字段作为分组方式时不允许跨分组拖拽
// https://github.com/siyuan-note/siyuan/issues/15553
const isTCU = getAVData(blockElement)?.view.group?.valueSource === "rendered" ||
- ["template", "created", "updated"].includes(bodyElement.getAttribute("data-dtype"));
+ hasAVKeyGroup(bodyElement.getAttribute("data-dtype"), "renderAutoFill");
gutterTypes[2].split(",").find(item => {
const sourceGroupID = item ? item.split("@")[1] : "";
if (sourceGroupID !== groupID && isTCU) {
diff --git a/app/src/types/av/index.d.ts b/app/src/types/av/index.d.ts
index 5d6753d70a..6fcec3f15d 100644
--- a/app/src/types/av/index.d.ts
+++ b/app/src/types/av/index.d.ts
@@ -3,8 +3,23 @@
export type AVKeyType = "block" | "text" | "number" | "date" | "select" | "mSelect" | "url" | "email" | "phone" | "mAsset" | "template" | "created" | "updated" | "checkbox" | "relation" | "rollup" | "lineNumber";
export type AVFilterOperator = "=" | "!=" | ">" | ">=" | "<" | "<=" | "Contains" | "Does not contains" | "Contains any item" | "Does not contain any item" | "Is empty" | "Is not empty" | "Starts with" | "Ends with" | "Is between" | "Is true" | "Is false";
+export type AVKeyGroup = "none" | "richText" | "link" | "scalarContent" | "attributePlaceholder" | "rollupCell" | "newItemTemplate" | "noFilterDefault" | "renderDependentFilter" | "skipRowCopy" | "renderAutoFill" | "rollupAlwaysRender" | "rollupForeignRender";
+export type AVFilterProfile = "checkbox" | "date" | "mSelect" | "none" | "number" | "relation" | "rollup" | "select" | "template" | "text";
+export type AVCalcOperator = "" | "Average" | "Checked" | "Count all" | "Count empty" | "Count not empty" | "Count unique values" | "Count values" | "Earliest" | "Latest" | "Max" | "Median" | "Min" | "Percent checked" | "Percent empty" | "Percent not empty" | "Percent unchecked" | "Percent unique values" | "Range" | "Sum" | "Template" | "Unchecked" | "Unique values";
+
+/** 接受集合与界面呈现集合独立,呈现集合保留选项顺序 */
+export interface AVFilterCapability {
+ readonly accepted: readonly AVFilterOperator[];
+ readonly offered: readonly AVFilterOperator[];
+ readonly offeredRollup?: readonly AVFilterOperator[];
+}
+
/** 字段基础能力仅用于类型分派,不属于 AV 持久化格式 */
export interface AVKeyCapability {
+ /** 派生用途由内核声明,none 表示明确不属于任何用途分组 */
+ readonly groups?: readonly AVKeyGroup[];
+ /** 用于选择接受与呈现的算子集合,保留旧调用方构造基础能力对象的兼容性 */
+ readonly filterProfile?: AVFilterProfile;
readonly valueKind: "assets" | "checkbox" | "date" | "lineNumber" | "number" | "options" | "relation" | "rollup" | "text" | "timestamp";
readonly editable: boolean;
readonly filterable: boolean;
diff --git a/kernel/av/capabilities.go b/kernel/av/capabilities.go
index ae3e0dfcb9..57c193ac70 100644
--- a/kernel/av/capabilities.go
+++ b/kernel/av/capabilities.go
@@ -5,6 +5,8 @@ import "sort"
// KeyCapability 描述字段的基础能力,不参与属性视图的持久化。
// 资源字段仅在设置显示模板后支持分组,关联汇总的默认算子按取值来源调整。
type KeyCapability struct {
+ Groups KeyGroup `json:"groups"`
+ FilterProfile FilterProfile `json:"filterProfile"`
ValueKind string `json:"valueKind"`
Editable bool `json:"editable"`
Filterable bool `json:"filterable"`
@@ -15,39 +17,90 @@ type KeyCapability struct {
}
var keyCapabilities = map[KeyType]KeyCapability{
- KeyTypeBlock: {order: 0, ValueKind: "text", Editable: true, Filterable: true,
+ KeyTypeBlock: {
+ Groups: KeyGroupRichText | KeyGroupLink | KeyGroupScalarContent,
+ FilterProfile: FilterProfileText,
+ order: 0, ValueKind: "text", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContains},
- KeyTypeText: {order: 1, ValueKind: "text", Editable: true, Filterable: true,
+ KeyTypeText: {
+ Groups: KeyGroupRichText | KeyGroupScalarContent | KeyGroupAttributePlaceholder | KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileText,
+ order: 1, ValueKind: "text", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContains},
- KeyTypeNumber: {order: 2, ValueKind: "number", Editable: true, Filterable: true,
+ KeyTypeNumber: {
+ Groups: KeyGroupScalarContent | KeyGroupAttributePlaceholder | KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileNumber,
+ order: 2, ValueKind: "number", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorIsEqual},
- KeyTypeDate: {order: 3, ValueKind: "date", Editable: true, Filterable: true,
+ KeyTypeDate: {
+ Groups: KeyGroupAttributePlaceholder | KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileDate,
+ order: 3, ValueKind: "date", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorIsEqual},
- KeyTypeSelect: {order: 4, ValueKind: "options", Editable: true, Filterable: true,
+ KeyTypeSelect: {
+ Groups: KeyGroupRollupCell | KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileSelect,
+ order: 4, ValueKind: "options", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorIsEqual},
- KeyTypeMSelect: {order: 5, ValueKind: "options", Editable: true, Filterable: true,
+ KeyTypeMSelect: {
+ Groups: KeyGroupRollupCell | KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileMSelect,
+ order: 5, ValueKind: "options", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContains},
- KeyTypeURL: {order: 6, ValueKind: "text", Editable: true, Filterable: true,
+ KeyTypeURL: {
+ Groups: KeyGroupLink | KeyGroupScalarContent | KeyGroupAttributePlaceholder | KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileText,
+ order: 6, ValueKind: "text", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContains},
- KeyTypeEmail: {order: 7, ValueKind: "text", Editable: true, Filterable: true,
+ KeyTypeEmail: {
+ Groups: KeyGroupRichText | KeyGroupLink | KeyGroupScalarContent | KeyGroupAttributePlaceholder | KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileText,
+ order: 7, ValueKind: "text", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContains},
- KeyTypePhone: {order: 8, ValueKind: "text", Editable: true, Filterable: true,
+ KeyTypePhone: {
+ Groups: KeyGroupRichText | KeyGroupLink | KeyGroupScalarContent | KeyGroupAttributePlaceholder | KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileText,
+ order: 8, ValueKind: "text", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContains},
- KeyTypeMAsset: {order: 9, ValueKind: "assets", Editable: true, Filterable: true,
+ KeyTypeMAsset: {
+ Groups: KeyGroupScalarContent | KeyGroupRollupCell | KeyGroupNewItemTemplate | KeyGroupRenderDependentFilter,
+ FilterProfile: FilterProfileText,
+ order: 9, ValueKind: "assets", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContains},
- KeyTypeTemplate: {order: 10, ValueKind: "text", Editable: false, Filterable: true,
+ KeyTypeTemplate: {
+ Groups: KeyGroupRichText | KeyGroupScalarContent | KeyGroupAttributePlaceholder | KeyGroupRollupCell | KeyGroupNoFilterDefault | KeyGroupRenderDependentFilter | KeyGroupRenderAutoFill | KeyGroupRollupAlwaysRender,
+ FilterProfile: FilterProfileTemplate,
+ order: 10, ValueKind: "text", Editable: false, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContains},
- KeyTypeCreated: {order: 11, ValueKind: "timestamp", Editable: false, Filterable: true,
+ KeyTypeCreated: {
+ Groups: KeyGroupNoFilterDefault | KeyGroupRenderDependentFilter | KeyGroupSkipRowCopy | KeyGroupRenderAutoFill | KeyGroupRollupForeignRender,
+ FilterProfile: FilterProfileDate,
+ order: 11, ValueKind: "timestamp", Editable: false, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorIsEqual},
- KeyTypeUpdated: {order: 12, ValueKind: "timestamp", Editable: false, Filterable: true,
+ KeyTypeUpdated: {
+ Groups: KeyGroupNoFilterDefault | KeyGroupRenderDependentFilter | KeyGroupSkipRowCopy | KeyGroupRenderAutoFill | KeyGroupRollupForeignRender,
+ FilterProfile: FilterProfileDate,
+ order: 12, ValueKind: "timestamp", Editable: false, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorIsEqual},
- KeyTypeCheckbox: {order: 13, ValueKind: "checkbox", Editable: true, Filterable: true,
+ KeyTypeCheckbox: {
+ Groups: KeyGroupNewItemTemplate,
+ FilterProfile: FilterProfileCheckbox,
+ order: 13, ValueKind: "checkbox", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorIsEqual},
- KeyTypeRelation: {order: 14, ValueKind: "relation", Editable: true, Filterable: true,
+ KeyTypeRelation: {
+ Groups: KeyGroupRollupCell | KeyGroupNewItemTemplate | KeyGroupRollupForeignRender,
+ FilterProfile: FilterProfileRelation,
+ order: 14, ValueKind: "relation", Editable: true, Filterable: true,
Sortable: true, Groupable: true, DefaultOperator: FilterOperatorContainsAnyItem},
- KeyTypeRollup: {order: 15, ValueKind: "rollup", Editable: false, Filterable: true,
+ KeyTypeRollup: {
+ Groups: KeyGroupNoFilterDefault | KeyGroupRenderDependentFilter | KeyGroupSkipRowCopy,
+ FilterProfile: FilterProfileRollup,
+ order: 15, ValueKind: "rollup", Editable: false, Filterable: true,
Sortable: true, Groupable: false, DefaultOperator: FilterOperatorContains},
- KeyTypeLineNumber: {order: 16, ValueKind: "lineNumber", Editable: false, Filterable: false,
+ KeyTypeLineNumber: {
+ Groups: KeyGroupNone,
+ FilterProfile: FilterProfileNone,
+ order: 16, ValueKind: "lineNumber", Editable: false, Filterable: false,
Sortable: false, Groupable: false, DefaultOperator: ""},
}
diff --git a/kernel/av/capabilities_codegen.go b/kernel/av/capabilities_codegen.go
index 58c4771363..e0825a288a 100644
--- a/kernel/av/capabilities_codegen.go
+++ b/kernel/av/capabilities_codegen.go
@@ -13,7 +13,7 @@ func CapabilityTypeScript() (runtime, declarations []byte) {
var source, types strings.Builder
header := "// 此文件由内核字段能力声明生成,请运行 pnpm run api:generate 更新。\n\n"
source.WriteString(header)
- source.WriteString("import type {AVKeyType, AVKeyCapability} from \"../../../types/av\";\n\n")
+ source.WriteString("import type {AVKeyType, AVKeyCapability, AVFilterProfile, AVFilterCapability, AVCalcOperator} from \"../../../types/av\";\n\n")
keys := KeyTypes()
keyNames := make([]string, len(keys))
for i, key := range keys {
@@ -27,6 +27,28 @@ func CapabilityTypeScript() (runtime, declarations []byte) {
fmt.Fprintf(&source, " %q: %s,\n", key, data)
}
source.WriteString("};\n")
+ var profileNames []string
+ for profile := range filterCapabilities {
+ profileNames = append(profileNames, string(profile))
+ }
+ sort.Strings(profileNames)
+ source.WriteString("\nexport const AV_FILTER_CAPABILITIES: Readonly<Record<AVFilterProfile, AVFilterCapability>> = {\n")
+ for _, profile := range profileNames {
+ data, _ := json.Marshal(filterCapabilities[FilterProfile(profile)])
+ fmt.Fprintf(&source, " %q: %s,\n", profile, data)
+ }
+ source.WriteString("};\n")
+ var calcNames, numberCalcNames []string
+ for operator, number := range calcFilterNumber {
+ calcNames = append(calcNames, string(operator))
+ if number {
+ numberCalcNames = append(numberCalcNames, string(operator))
+ }
+ }
+ sort.Strings(calcNames)
+ sort.Strings(numberCalcNames)
+ calcJSON, _ := json.Marshal(numberCalcNames)
+ fmt.Fprintf(&source, "\nexport const AV_CALC_FILTER_NUMBER_OPERATORS: readonly AVCalcOperator[] = %s;\n", calcJSON)
types.WriteString(header)
var keyLiterals, operatorLiterals []string
kinds := map[string]bool{}
@@ -39,7 +61,25 @@ func CapabilityTypeScript() (runtime, declarations []byte) {
}
fmt.Fprintf(&types, "export type AVKeyType = %s;\n", strings.Join(keyLiterals, " | "))
fmt.Fprintf(&types, "export type AVFilterOperator = %s;\n\n", strings.Join(operatorLiterals, " | "))
+ var groupLiterals, profileLiterals, calcLiterals []string
+ for _, group := range keyGroups {
+ groupLiterals = append(groupLiterals, fmt.Sprintf("%q", group.name))
+ }
+ for _, profile := range profileNames {
+ profileLiterals = append(profileLiterals, fmt.Sprintf("%q", profile))
+ }
+ for _, operator := range calcNames {
+ calcLiterals = append(calcLiterals, fmt.Sprintf("%q", operator))
+ }
+ fmt.Fprintf(&types, "export type AVKeyGroup = %s;\n", strings.Join(groupLiterals, " | "))
+ fmt.Fprintf(&types, "export type AVFilterProfile = %s;\n", strings.Join(profileLiterals, " | "))
+ fmt.Fprintf(&types, "export type AVCalcOperator = %s;\n\n", strings.Join(calcLiterals, " | "))
+ types.WriteString("/** 接受集合与界面呈现集合独立,呈现集合保留选项顺序 */\nexport interface AVFilterCapability {\n")
+ types.WriteString(" readonly accepted: readonly AVFilterOperator[];\n readonly offered: readonly AVFilterOperator[];\n")
+ types.WriteString(" readonly offeredRollup?: readonly AVFilterOperator[];\n}\n\n")
types.WriteString("/** 字段基础能力仅用于类型分派,不属于 AV 持久化格式 */\nexport interface AVKeyCapability {\n")
+ types.WriteString(" /** 派生用途由内核声明,none 表示明确不属于任何用途分组 */\n readonly groups?: readonly AVKeyGroup[];\n")
+ types.WriteString(" /** 用于选择接受与呈现的算子集合,保留旧调用方构造基础能力对象的兼容性 */\n readonly filterProfile?: AVFilterProfile;\n")
var kindLiterals []string
for kind := range kinds {
kindLiterals = append(kindLiterals, fmt.Sprintf("%q", kind))
diff --git a/kernel/av/capability_groups.go b/kernel/av/capability_groups.go
new file mode 100644
index 0000000000..9fdecb457a
--- /dev/null
+++ b/kernel/av/capability_groups.go
@@ -0,0 +1,76 @@
+package av
+
+import "encoding/json"
+
+// KeyGroup 区分字段在各处理阶段的用途,不能把不同的生成值阶段统一当作只读字段。
+type KeyGroup uint32
+
+const (
+ KeyGroupNone KeyGroup = 1 << iota
+ KeyGroupRichText
+ KeyGroupLink
+ KeyGroupScalarContent
+ KeyGroupAttributePlaceholder
+ KeyGroupRollupCell
+ KeyGroupNewItemTemplate
+ KeyGroupNoFilterDefault
+ KeyGroupRenderDependentFilter
+ KeyGroupSkipRowCopy
+ KeyGroupRenderAutoFill
+ KeyGroupRollupAlwaysRender
+ KeyGroupRollupForeignRender
+)
+
+var keyGroups = []struct {
+ flag KeyGroup
+ name string
+}{
+ {KeyGroupNone, "none"},
+ {KeyGroupRichText, "richText"},
+ {KeyGroupLink, "link"},
+ {KeyGroupScalarContent, "scalarContent"},
+ {KeyGroupAttributePlaceholder, "attributePlaceholder"},
+ {KeyGroupRollupCell, "rollupCell"},
+ {KeyGroupNewItemTemplate, "newItemTemplate"},
+ {KeyGroupNoFilterDefault, "noFilterDefault"},
+ {KeyGroupRenderDependentFilter, "renderDependentFilter"},
+ {KeyGroupSkipRowCopy, "skipRowCopy"},
+ {KeyGroupRenderAutoFill, "renderAutoFill"},
+ {KeyGroupRollupAlwaysRender, "rollupAlwaysRender"},
+ {KeyGroupRollupForeignRender, "rollupForeignRender"},
+}
+
+func (g KeyGroup) MarshalJSON() ([]byte, error) {
+ names := []string{}
+ for _, group := range keyGroups {
+ if g&group.flag != 0 {
+ names = append(names, group.name)
+ }
+ }
+ return json.Marshal(names)
+}
+
+// HasKeyGroup 只读取字段能力声明,未知类型不归入任何用途分组。
+func HasKeyGroup(typ KeyType, group KeyGroup) bool {
+ return GetKeyCapability(typ).Groups&group != 0
+}
+
+func IsKnownKeyType(typ KeyType) bool {
+ _, found := keyCapabilities[typ]
+ return found
+}
+
+// NeedsRollupTargetRender 保留同库与跨库汇总在模板、时间和关联字段上的不同渲染要求。
+func NeedsRollupTargetRender(typ KeyType, sameAV bool) bool {
+ return HasKeyGroup(typ, KeyGroupRollupAlwaysRender) || !sameAV && HasKeyGroup(typ, KeyGroupRollupForeignRender)
+}
+
+func DateKeyTypes() []KeyType {
+ var result []KeyType
+ for _, typ := range KeyTypes() {
+ if IsDateKeyType(typ) {
+ result = append(result, typ)
+ }
+ }
+ return result
+}
diff --git a/kernel/av/filter.go b/kernel/av/filter.go
index 8248c0c08c..56866d058c 100644
--- a/kernel/av/filter.go
+++ b/kernel/av/filter.go
@@ -1076,7 +1076,7 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
// isRollupFilterValueEmpty 判断汇总筛选是否缺少比较值,相对日期仅依赖相对时间配置。
func isRollupFilterValueEmpty(filter *ViewFilter) bool {
valueType := filter.Value.Rollup.Contents[0].Type
- if nil != filter.RelativeDate && (KeyTypeDate == valueType || KeyTypeCreated == valueType || KeyTypeUpdated == valueType) {
+ if nil != filter.RelativeDate && (IsDateKeyType(valueType)) {
return false
}
v := filter.Value.GetValByType(valueType)
@@ -1644,7 +1644,7 @@ func (filter *ViewFilter) IsValid() bool {
func (filter *ViewFilter) GetAffectValue(key *Key, addingBlockID string) (ret *Value, allowNearItem bool) {
if nil != filter.Value {
- if KeyTypeTemplate == filter.Value.Type || KeyTypeRollup == filter.Value.Type || KeyTypeUpdated == filter.Value.Type || KeyTypeCreated == filter.Value.Type {
+ if HasKeyGroup(filter.Value.Type, KeyGroupNoFilterDefault) {
// 所有生成的数据都不设置默认值
return nil, false
}
diff --git a/kernel/av/filter_capabilities.go b/kernel/av/filter_capabilities.go
new file mode 100644
index 0000000000..ee2ad1fe44
--- /dev/null
+++ b/kernel/av/filter_capabilities.go
@@ -0,0 +1,103 @@
+package av
+
+import "slices"
+
+type FilterProfile string
+
+const (
+ FilterProfileNone FilterProfile = "none"
+ FilterProfileText FilterProfile = "text"
+ FilterProfileTemplate FilterProfile = "template"
+ FilterProfileNumber FilterProfile = "number"
+ FilterProfileDate FilterProfile = "date"
+ FilterProfileCheckbox FilterProfile = "checkbox"
+ FilterProfileSelect FilterProfile = "select"
+ FilterProfileMSelect FilterProfile = "mSelect"
+ FilterProfileRelation FilterProfile = "relation"
+ FilterProfileRollup FilterProfile = "rollup"
+)
+
+// 筛选接受集合用于工具校验,呈现集合保留界面选项顺序与汇总关联的特殊选择。
+// 两者不能合并,复选框的 Is true/Is false 只属于接受集合。
+type FilterCapability struct {
+ Accepted []FilterOperator `json:"accepted"`
+ Offered []FilterOperator `json:"offered"`
+ OfferedRollup []FilterOperator `json:"offeredRollup,omitempty"`
+}
+
+var filterCapabilities = map[FilterProfile]FilterCapability{
+ FilterProfileNone: {Accepted: []FilterOperator{}, Offered: []FilterOperator{}},
+ FilterProfileText: {
+ Accepted: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorContains,
+ FilterOperatorDoesNotContain, FilterOperatorStartsWith, FilterOperatorEndsWith, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ Offered: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorContains,
+ FilterOperatorDoesNotContain, FilterOperatorStartsWith, FilterOperatorEndsWith, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ },
+ FilterProfileTemplate: {
+ Accepted: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorContains,
+ FilterOperatorDoesNotContain, FilterOperatorStartsWith, FilterOperatorEndsWith, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty,
+ FilterOperatorIsGreater, FilterOperatorIsLess, FilterOperatorIsGreaterOrEqual, FilterOperatorIsLessOrEqual},
+ Offered: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorContains,
+ FilterOperatorDoesNotContain, FilterOperatorStartsWith, FilterOperatorEndsWith, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty,
+ FilterOperatorIsGreater, FilterOperatorIsLess, FilterOperatorIsGreaterOrEqual, FilterOperatorIsLessOrEqual},
+ },
+ FilterProfileNumber: {
+ Accepted: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorIsGreater,
+ FilterOperatorIsLess, FilterOperatorIsGreaterOrEqual, FilterOperatorIsLessOrEqual, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ Offered: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorIsGreater,
+ FilterOperatorIsLess, FilterOperatorIsGreaterOrEqual, FilterOperatorIsLessOrEqual, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ },
+ FilterProfileDate: {
+ Accepted: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsGreater, FilterOperatorIsLess,
+ FilterOperatorIsGreaterOrEqual, FilterOperatorIsLessOrEqual, FilterOperatorIsBetween, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ Offered: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsGreater, FilterOperatorIsLess,
+ FilterOperatorIsGreaterOrEqual, FilterOperatorIsLessOrEqual, FilterOperatorIsBetween, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ },
+ FilterProfileCheckbox: {
+ Accepted: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorIsTrue, FilterOperatorIsFalse},
+ Offered: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual},
+ },
+ FilterProfileSelect: {
+ Accepted: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ Offered: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ },
+ FilterProfileMSelect: {
+ Accepted: []FilterOperator{FilterOperatorContains, FilterOperatorDoesNotContain, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ Offered: []FilterOperator{FilterOperatorContains, FilterOperatorDoesNotContain, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ },
+ FilterProfileRelation: {
+ Accepted: []FilterOperator{FilterOperatorContainsAnyItem, FilterOperatorDoesNotContainAnyItem, FilterOperatorContains,
+ FilterOperatorDoesNotContain, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ Offered: []FilterOperator{FilterOperatorContainsAnyItem, FilterOperatorDoesNotContainAnyItem, FilterOperatorContains,
+ FilterOperatorDoesNotContain, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ OfferedRollup: []FilterOperator{FilterOperatorContains, FilterOperatorDoesNotContain, FilterOperatorIsEmpty, FilterOperatorIsNotEmpty},
+ },
+ FilterProfileRollup: {
+ Accepted: []FilterOperator{FilterOperatorIsEqual, FilterOperatorIsNotEqual, FilterOperatorIsGreater,
+ FilterOperatorIsGreaterOrEqual, FilterOperatorIsLess, FilterOperatorIsLessOrEqual, FilterOperatorContains,
+ FilterOperatorDoesNotContain, FilterOperatorContainsAnyItem, FilterOperatorDoesNotContainAnyItem,
+ FilterOperatorIsEmpty, FilterOperatorIsNotEmpty, FilterOperatorStartsWith, FilterOperatorEndsWith, FilterOperatorIsBetween},
+ Offered: []FilterOperator{},
+ },
+}
+
+func IsFilterOperatorAllowed(typ KeyType, operator FilterOperator) bool {
+ // 历史工具校验允许未知字段类型使用空值筛选,其余算子仍不放行。
+ if !IsKnownKeyType(typ) {
+ return operator == FilterOperatorIsEmpty || operator == FilterOperatorIsNotEmpty
+ }
+ return slices.Contains(filterCapabilities[GetKeyCapability(typ).FilterProfile].Accepted, operator)
+}
+
+// calcFilterNumber 明确登记全部汇总算子的筛选类型;false 表示继续使用目标字段或现有内容类型。
+// Range 保留目标类型回退,不能与总是按数值展示的算子合并。
+var calcFilterNumber = map[CalcOperator]bool{
+ CalcOperatorNone: false, CalcOperatorUniqueValues: false,
+ CalcOperatorCountAll: true, CalcOperatorCountValues: true, CalcOperatorCountUniqueValues: true,
+ CalcOperatorCountEmpty: true, CalcOperatorCountNotEmpty: true, CalcOperatorPercentEmpty: true,
+ CalcOperatorPercentNotEmpty: true, CalcOperatorPercentUniqueValues: true,
+ CalcOperatorSum: true, CalcOperatorAverage: true, CalcOperatorMedian: true, CalcOperatorMin: true, CalcOperatorMax: true,
+ CalcOperatorRange: false, CalcOperatorEarliest: false, CalcOperatorLatest: false,
+ CalcOperatorChecked: true, CalcOperatorUnchecked: true, CalcOperatorPercentChecked: true, CalcOperatorPercentUnchecked: true,
+ CalcOperatorTemplate: false,
+}
diff --git a/kernel/av/filter_capabilities_test.go b/kernel/av/filter_capabilities_test.go
new file mode 100644
index 0000000000..df4c49b5d5
--- /dev/null
+++ b/kernel/av/filter_capabilities_test.go
@@ -0,0 +1,98 @@
+package av
+
+import (
+ "encoding/json"
+ "os"
+ "reflect"
+ "slices"
+ "sort"
+ "testing"
+)
+
+func TestFilterCapabilityCompleteness(t *testing.T) {
+ var profiles, operators []string
+ for profile, capability := range filterCapabilities {
+ profiles = append(profiles, string(profile))
+ for _, list := range [][]FilterOperator{capability.Accepted, capability.Offered, capability.OfferedRollup} {
+ seen := map[FilterOperator]bool{}
+ for _, operator := range list {
+ if !slices.Contains(filterOperators, operator) || seen[operator] {
+ t.Fatalf("invalid or duplicate operator %s in %s", operator, profile)
+ }
+ seen[operator] = true
+ }
+ }
+ }
+ for operator := range calcFilterNumber {
+ operators = append(operators, string(operator))
+ }
+ sort.Strings(profiles)
+ sort.Strings(operators)
+ if !reflect.DeepEqual(profiles, declaredCapabilityConstants(t, "FilterProfile")) ||
+ !reflect.DeepEqual(operators, declaredCapabilityConstants(t, "CalcOperator")) {
+ t.Fatal("filter profiles and calculated result types must cover all declarations")
+ }
+ var mask KeyGroup
+ for _, group := range keyGroups {
+ if group.flag == 0 || mask&group.flag != 0 {
+ t.Fatal("duplicate or empty group flag")
+ }
+ mask |= group.flag
+ }
+ for typ, capability := range keyCapabilities {
+ if _, found := filterCapabilities[capability.FilterProfile]; !found {
+ t.Fatalf("missing filter profile for %s", typ)
+ }
+ if capability.Groups == 0 || capability.Groups&^mask != 0 ||
+ capability.Groups&KeyGroupNone != 0 && capability.Groups != KeyGroupNone {
+ t.Fatalf("field %s must explicitly declare valid groups", typ)
+ }
+ }
+}
+
+func TestFilterCapabilityAcceptedBaseline(t *testing.T) {
+ data, err := os.ReadFile("testdata/filter-accepted.json")
+ if err != nil {
+ t.Fatal(err)
+ }
+ var baseline map[KeyType]map[FilterOperator]bool
+ if err = json.Unmarshal(data, &baseline); err != nil {
+ t.Fatal(err)
+ }
+ if len(baseline) != len(KeyTypes())+1 {
+ t.Fatal("baseline must cover all supported types and an unknown type")
+ }
+ for typ, operators := range baseline {
+ for operator, expected := range operators {
+ if actual := IsFilterOperatorAllowed(typ, operator); actual != expected {
+ t.Errorf("%s / %s: got %v want %v", typ, operator, actual, expected)
+ }
+ }
+ }
+}
+
+func TestKeyGroupPhaseBehavior(t *testing.T) {
+ groups := map[KeyGroup][]KeyType{
+ KeyGroupNoFilterDefault: {KeyTypeTemplate, KeyTypeRollup, KeyTypeCreated, KeyTypeUpdated},
+ KeyGroupRenderDependentFilter: {KeyTypeTemplate, KeyTypeRollup, KeyTypeMAsset, KeyTypeCreated, KeyTypeUpdated},
+ KeyGroupSkipRowCopy: {KeyTypeRollup, KeyTypeCreated, KeyTypeUpdated},
+ KeyGroupRenderAutoFill: {KeyTypeTemplate, KeyTypeCreated, KeyTypeUpdated},
+ }
+ for _, typ := range append(KeyTypes(), KeyType("unknown")) {
+ for group, members := range groups {
+ if HasKeyGroup(typ, group) != slices.Contains(members, typ) {
+ t.Fatalf("phase behavior changed for %s", typ)
+ }
+ }
+ for _, sameAV := range []bool{false, true} {
+ expected := typ == KeyTypeTemplate || !sameAV &&
+ (typ == KeyTypeCreated || typ == KeyTypeUpdated || typ == KeyTypeRelation)
+ if NeedsRollupTargetRender(typ, sameAV) != expected {
+ t.Fatalf("rollup render changed for %s (sameAV=%v)", typ, sameAV)
+ }
+ }
+ }
+ if !reflect.DeepEqual(DateKeyTypes(), []KeyType{KeyTypeDate, KeyTypeCreated, KeyTypeUpdated}) {
+ t.Fatal("calendar date order changed")
+ }
+}
diff --git a/kernel/av/testdata/filter-accepted.json b/kernel/av/testdata/filter-accepted.json
new file mode 100644
index 0000000000..36e243ccbe
--- /dev/null
+++ b/kernel/av/testdata/filter-accepted.json
@@ -0,0 +1,380 @@
+{
+ "block": {
+ "": false,
+ "!=": true,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": true,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": true,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": true,
+ "Ends with": true,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": true,
+ "invalid": false
+ },
+ "checkbox": {
+ "": false,
+ "!=": true,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": true,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": false,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": false,
+ "Ends with": false,
+ "Is between": false,
+ "Is empty": false,
+ "Is false": true,
+ "Is not empty": false,
+ "Is true": true,
+ "Starts with": false,
+ "invalid": false
+ },
+ "created": {
+ "": false,
+ "!=": false,
+ "\u003c": true,
+ "\u003c=": true,
+ "=": true,
+ "\u003e": true,
+ "\u003e=": true,
+ "Contains": false,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": false,
+ "Ends with": false,
+ "Is between": true,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "date": {
+ "": false,
+ "!=": false,
+ "\u003c": true,
+ "\u003c=": true,
+ "=": true,
+ "\u003e": true,
+ "\u003e=": true,
+ "Contains": false,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": false,
+ "Ends with": false,
+ "Is between": true,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "email": {
+ "": false,
+ "!=": true,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": true,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": true,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": true,
+ "Ends with": true,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": true,
+ "invalid": false
+ },
+ "lineNumber": {
+ "": false,
+ "!=": false,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": false,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": false,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": false,
+ "Ends with": false,
+ "Is between": false,
+ "Is empty": false,
+ "Is false": false,
+ "Is not empty": false,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "mAsset": {
+ "": false,
+ "!=": true,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": true,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": true,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": true,
+ "Ends with": true,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": true,
+ "invalid": false
+ },
+ "mSelect": {
+ "": false,
+ "!=": false,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": false,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": true,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": true,
+ "Ends with": false,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "number": {
+ "": false,
+ "!=": true,
+ "\u003c": true,
+ "\u003c=": true,
+ "=": true,
+ "\u003e": true,
+ "\u003e=": true,
+ "Contains": false,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": false,
+ "Ends with": false,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "phone": {
+ "": false,
+ "!=": true,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": true,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": true,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": true,
+ "Ends with": true,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": true,
+ "invalid": false
+ },
+ "relation": {
+ "": false,
+ "!=": false,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": false,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": true,
+ "Contains any item": true,
+ "Does not contain any item": true,
+ "Does not contains": true,
+ "Ends with": false,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "rollup": {
+ "": false,
+ "!=": true,
+ "\u003c": true,
+ "\u003c=": true,
+ "=": true,
+ "\u003e": true,
+ "\u003e=": true,
+ "Contains": true,
+ "Contains any item": true,
+ "Does not contain any item": true,
+ "Does not contains": true,
+ "Ends with": true,
+ "Is between": true,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": true,
+ "invalid": false
+ },
+ "select": {
+ "": false,
+ "!=": true,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": true,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": false,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": false,
+ "Ends with": false,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "template": {
+ "": false,
+ "!=": true,
+ "\u003c": true,
+ "\u003c=": true,
+ "=": true,
+ "\u003e": true,
+ "\u003e=": true,
+ "Contains": true,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": true,
+ "Ends with": true,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": true,
+ "invalid": false
+ },
+ "text": {
+ "": false,
+ "!=": true,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": true,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": true,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": true,
+ "Ends with": true,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": true,
+ "invalid": false
+ },
+ "unknown": {
+ "": false,
+ "!=": false,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": false,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": false,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": false,
+ "Ends with": false,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "updated": {
+ "": false,
+ "!=": false,
+ "\u003c": true,
+ "\u003c=": true,
+ "=": true,
+ "\u003e": true,
+ "\u003e=": true,
+ "Contains": false,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": false,
+ "Ends with": false,
+ "Is between": true,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": false,
+ "invalid": false
+ },
+ "url": {
+ "": false,
+ "!=": true,
+ "\u003c": false,
+ "\u003c=": false,
+ "=": true,
+ "\u003e": false,
+ "\u003e=": false,
+ "Contains": true,
+ "Contains any item": false,
+ "Does not contain any item": false,
+ "Does not contains": true,
+ "Ends with": true,
+ "Is between": false,
+ "Is empty": true,
+ "Is false": false,
+ "Is not empty": true,
+ "Is true": false,
+ "Starts with": true,
+ "invalid": false
+ }
+}
\ No newline at end of file
diff --git a/kernel/av/value.go b/kernel/av/value.go
index 19fb8494dd..766b28eb63 100644
--- a/kernel/av/value.go
+++ b/kernel/av/value.go
@@ -2718,7 +2718,7 @@ func (r *ValueRollup) BuildContents(attrView *AttributeView, destKey *Key, relat
destVal := GetValue(attrView.KeyValues, destKey.ID, blockID)
if nil != context && nil != context.FurtherCollection &&
- (KeyTypeTemplate == destKey.Type || KeyTypeUpdated == destKey.Type || KeyTypeCreated == destKey.Type || KeyTypeRollup == destKey.Type) {
+ (HasKeyGroup(destKey.Type, KeyGroupNoFilterDefault)) {
destVal = context.FurtherCollection.GetValue(blockID, destKey.ID)
}
diff --git a/kernel/mcp/tools/database_view.go b/kernel/mcp/tools/database_view.go
index 3b03894d3c..f2ffb435da 100644
--- a/kernel/mcp/tools/database_view.go
+++ b/kernel/mcp/tools/database_view.go
@@ -272,7 +272,7 @@ func databaseValidateViewFilterNode(attrView *av.AttributeView, filter *av.ViewF
}
filterType = av.KeyTypeTemplate
}
- if !databaseFilterOperatorAllowed(filterType, filter.Operator) {
+ if !av.IsFilterOperatorAllowed(filterType, filter.Operator) {
return fmt.Errorf("operator %q is not supported for field %s", filter.Operator, filter.Column)
}
if filter.Operator != av.FilterOperatorIsEmpty && filter.Operator != av.FilterOperatorIsNotEmpty &&
@@ -290,7 +290,7 @@ func databaseValidateViewFilterNode(attrView *av.AttributeView, filter *av.ViewF
dateType = filter.Value.Rollup.Contents[0].Type
}
if (nil != filter.RelativeDate || nil != filter.RelativeDate2 || filter.DateEndpoint != "") &&
- dateType != av.KeyTypeDate && dateType != av.KeyTypeCreated && dateType != av.KeyTypeUpdated {
+ !av.IsDateKeyType(dateType) {
return fmt.Errorf("date options require a date field: %s", filter.Column)
}
if filter.DateEndpoint != "" && filter.DateEndpoint != av.DateEndpointStart && filter.DateEndpoint != av.DateEndpointEnd {
@@ -313,46 +313,6 @@ func databaseValidRelativeDate(value *av.RelativeDate) bool {
value.Direction >= av.RelativeDateDirectionBefore && value.Direction <= av.RelativeDateDirectionAfter
}
-func databaseFilterOperatorAllowed(keyType av.KeyType, operator av.FilterOperator) bool {
- if keyType == av.KeyTypeRollup {
- switch operator {
- case av.FilterOperatorIsEqual, av.FilterOperatorIsNotEqual, av.FilterOperatorIsGreater,
- av.FilterOperatorIsGreaterOrEqual, av.FilterOperatorIsLess, av.FilterOperatorIsLessOrEqual,
- av.FilterOperatorContains, av.FilterOperatorDoesNotContain, av.FilterOperatorContainsAnyItem,
- av.FilterOperatorDoesNotContainAnyItem, av.FilterOperatorIsEmpty, av.FilterOperatorIsNotEmpty,
- av.FilterOperatorStartsWith, av.FilterOperatorEndsWith, av.FilterOperatorIsBetween:
- return true
- }
- return false
- }
- if operator == av.FilterOperatorIsEmpty || operator == av.FilterOperatorIsNotEmpty {
- return keyType != av.KeyTypeCheckbox && keyType != av.KeyTypeLineNumber
- }
- switch keyType {
- case av.KeyTypeCheckbox:
- return operator == av.FilterOperatorIsEqual || operator == av.FilterOperatorIsNotEqual ||
- operator == av.FilterOperatorIsTrue || operator == av.FilterOperatorIsFalse
- case av.KeyTypeNumber:
- return operator == "=" || operator == "!=" || operator == ">" || operator == ">=" || operator == "<" || operator == "<="
- case av.KeyTypeDate, av.KeyTypeCreated, av.KeyTypeUpdated:
- return operator == "=" || operator == ">" || operator == ">=" || operator == "<" || operator == "<=" || operator == av.FilterOperatorIsBetween
- case av.KeyTypeSelect:
- return operator == "=" || operator == "!="
- case av.KeyTypeMSelect:
- return operator == av.FilterOperatorContains || operator == av.FilterOperatorDoesNotContain
- case av.KeyTypeRelation:
- return operator == av.FilterOperatorContainsAnyItem || operator == av.FilterOperatorDoesNotContainAnyItem ||
- operator == av.FilterOperatorContains || operator == av.FilterOperatorDoesNotContain
- case av.KeyTypeBlock, av.KeyTypeText, av.KeyTypeURL, av.KeyTypeEmail, av.KeyTypePhone,
- av.KeyTypeMAsset, av.KeyTypeTemplate:
- return operator == "=" || operator == "!=" || operator == av.FilterOperatorContains ||
- operator == av.FilterOperatorDoesNotContain || operator == av.FilterOperatorStartsWith ||
- operator == av.FilterOperatorEndsWith || (keyType == av.KeyTypeTemplate &&
- (operator == ">" || operator == ">=" || operator == "<" || operator == "<="))
- }
- return false
-}
-
func databaseValidateViewSorts(attrView *av.AttributeView, sorts []*av.ViewSort) error {
for _, sort := range sorts {
if nil == sort {
@@ -371,7 +331,7 @@ func databaseValidateViewSorts(attrView *av.AttributeView, sorts []*av.ViewSort)
if sort.ValueSource == av.ValueSourceRendered && "" == strings.TrimSpace(key.RenderTemplate) {
return fmt.Errorf("rendered sorting requires a display template: %s", sort.Column)
}
- if sort.DateEndpoint != "" && key.Type != av.KeyTypeDate && key.Type != av.KeyTypeCreated && key.Type != av.KeyTypeUpdated {
+ if sort.DateEndpoint != "" && !av.IsDateKeyType(key.Type) {
return fmt.Errorf("date endpoint requires a date field: %s", sort.Column)
}
if sort.DateEndpoint != "" && sort.DateEndpoint != av.DateEndpointStart && sort.DateEndpoint != av.DateEndpointEnd {
@@ -411,7 +371,11 @@ func databaseValidateViewGroup(attrView *av.AttributeView, view *av.View, group
}
return nil
}
- switch key.Type {
+ groupType := key.Type
+ if av.IsDateKeyType(groupType) {
+ groupType = av.KeyTypeDate
+ }
+ switch groupType {
case av.KeyTypeNumber:
if group.Method != av.GroupMethodValue && group.Method != av.GroupMethodRangeNum {
return errors.New("number group method must be value or number range")
@@ -419,7 +383,7 @@ func databaseValidateViewGroup(attrView *av.AttributeView, view *av.View, group
if group.Method == av.GroupMethodRangeNum && (nil == group.Range || group.Range.NumStep <= 0 || group.Range.NumEnd < group.Range.NumStart) {
return errors.New("number range requires a positive step and ordered bounds")
}
- case av.KeyTypeDate, av.KeyTypeCreated, av.KeyTypeUpdated:
+ case av.KeyTypeDate:
if group.Method < av.GroupMethodValue || group.Method > av.GroupMethodDateYear {
return errors.New("invalid date group method")
}
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index f0f73d5985..5987aec6f3 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -784,8 +784,7 @@ func filterBranchMatchesDefaultValues(filter *av.ViewFilter, attrView *av.Attrib
// 显示模板结果无法在新增条目时根据存储值准确判断。
return true
}
- switch keyValues.Key.Type {
- case av.KeyTypeTemplate, av.KeyTypeRollup, av.KeyTypeMAsset, av.KeyTypeCreated, av.KeyTypeUpdated:
+ if av.HasKeyGroup(keyValues.Key.Type, av.KeyGroupRenderDependentFilter) {
// 这些字段的最终值需要在渲染阶段计算,此处无法根据存储值准确判断。
return true
}
@@ -2277,7 +2276,7 @@ func DuplicateAttributeViewRow(tx *Transaction, avID, previousItemID, srcRowID,
if av.KeyTypeBlock == keyValues.Key.Type {
continue // 主键已处理
}
- if av.KeyTypeRollup == keyValues.Key.Type || av.KeyTypeCreated == keyValues.Key.Type || av.KeyTypeUpdated == keyValues.Key.Type {
+ if av.HasKeyGroup(keyValues.Key.Type, av.KeyGroupSkipRowCopy) {
continue // 汇总/创建时间/更新时间字段在渲染或自动生成时处理,不复制
}
@@ -7558,18 +7557,15 @@ func AddAttributeViewKey(avID, blockID, keyID, keyName, keyType, keyIcon, previo
func newAttributeViewKey(keyID, keyName, keyType, keyIcon string, dateFormat av.DateDisplayFormat) (ret *av.Key, err error) {
keyTyp := av.KeyType(keyType)
- switch keyTyp {
- case av.KeyTypeBlock:
+ if av.KeyTypeBlock == keyTyp {
return nil, errors.New("cannot add an attribute view block key")
- case av.KeyTypeText, av.KeyTypeNumber, av.KeyTypeDate, av.KeyTypeSelect, av.KeyTypeMSelect, av.KeyTypeURL, av.KeyTypeEmail,
- av.KeyTypePhone, av.KeyTypeMAsset, av.KeyTypeTemplate, av.KeyTypeCreated, av.KeyTypeUpdated, av.KeyTypeCheckbox,
- av.KeyTypeRelation, av.KeyTypeRollup, av.KeyTypeLineNumber:
- default:
+ }
+ if !av.IsKnownKeyType(keyTyp) {
return nil, fmt.Errorf("unsupported attribute view key type [%s]", keyType)
}
ret = av.NewKey(keyID, keyName, filterAttrViewIconValue(keyIcon), keyTyp)
- if av.KeyTypeDate == keyTyp || av.KeyTypeCreated == keyTyp || av.KeyTypeUpdated == keyTyp {
+ if av.IsDateKeyType(keyTyp) {
if !dateFormat.IsValid() {
return nil, errors.New("invalid date display format")
}
@@ -7779,7 +7775,7 @@ func setAttributeViewColDateFormat(operation *Operation) (err error) {
}
colType := av.KeyType(operation.Typ)
- if av.KeyTypeDate != colType && av.KeyTypeCreated != colType && av.KeyTypeUpdated != colType {
+ if !av.IsDateKeyType(colType) {
return errors.New("date display format is only available for date fields")
}
for _, keyValues := range attrView.KeyValues {
@@ -7809,10 +7805,7 @@ func updateAttributeViewColumn(operation *Operation) (err error) {
colType := av.KeyType(operation.Typ)
changeType := false
- switch colType {
- case av.KeyTypeBlock, av.KeyTypeText, av.KeyTypeNumber, av.KeyTypeDate, av.KeyTypeSelect, av.KeyTypeMSelect, av.KeyTypeURL, av.KeyTypeEmail,
- av.KeyTypePhone, av.KeyTypeMAsset, av.KeyTypeTemplate, av.KeyTypeCreated, av.KeyTypeUpdated, av.KeyTypeCheckbox,
- av.KeyTypeRelation, av.KeyTypeRollup, av.KeyTypeLineNumber:
+ if av.IsKnownKeyType(colType) {
for _, keyValues := range attrView.KeyValues {
if keyValues.Key.ID == operation.ID {
isPrimaryKey := av.KeyTypeBlock == keyValues.Key.Type
diff --git a/kernel/model/attribute_view_calendar.go b/kernel/model/attribute_view_calendar.go
index b7ad001c77..fd3de6702b 100644
--- a/kernel/model/attribute_view_calendar.go
+++ b/kernel/model/attribute_view_calendar.go
@@ -18,7 +18,7 @@ func newAttributeViewCalendarLayout(attrView *av.AttributeView, fieldIDs []strin
LayoutTable: newAttributeViewListLayout(attrView, fieldIDs),
Settings: av.CalendarSettings{WeekStart: 1},
}
- for _, keyType := range []av.KeyType{av.KeyTypeDate, av.KeyTypeCreated, av.KeyTypeUpdated} {
+ for _, keyType := range av.DateKeyTypes() {
for _, keyValues := range attrView.KeyValues {
if keyValues.Key.Type == keyType {
ret.Settings.DateKeyID = keyValues.Key.ID
diff --git a/kernel/sql/av.go b/kernel/sql/av.go
index a326888ee9..8d3ca1b8d9 100644
--- a/kernel/sql/av.go
+++ b/kernel/sql/av.go
@@ -785,7 +785,7 @@ func fillAttributeViewAutoGeneratedValues(attrView *av.AttributeView, collection
var furtherCollection av.Collection
if av.KeyTypeRollup == destKey.Type {
furtherCollection = renderRollupTarget(destAv, destKey, depth, cachedAttrViews, renderContext)
- } else if av.KeyTypeTemplate == destKey.Type || (!isSameAv && (av.KeyTypeUpdated == destKey.Type || av.KeyTypeCreated == destKey.Type || av.KeyTypeRelation == destKey.Type)) {
+ } else if av.NeedsRollupTargetRender(destKey.Type, isSameAv) {
viewable := renderView(destAv, destAv.Views[0], "", depth, cachedAttrViews, false, false, renderContext)
if nil != viewable {
furtherCollection = viewable.(av.Collection)
@@ -951,7 +951,7 @@ func getFurtherCollections(attrView *av.AttributeView, cachedAttrViews map[strin
var furtherCollection av.Collection
if av.KeyTypeRollup == destKey.Type {
furtherCollection = renderRollupTarget(destAv, destKey, depth, cachedAttrViews, renderContext)
- } else if av.KeyTypeTemplate == destKey.Type || (!isSameAv && (av.KeyTypeUpdated == destKey.Type || av.KeyTypeCreated == destKey.Type || av.KeyTypeRelation == destKey.Type)) {
+ } else if av.NeedsRollupTargetRender(destKey.Type, isSameAv) {
viewable := renderView(destAv, destAv.Views[0], "", depth, cachedAttrViews, false, false, renderContext)
if nil != viewable {
furtherCollection = viewable.(av.Collection)
@@ -1093,7 +1093,7 @@ func fillAttributeViewKeyValues(attrView *av.AttributeView, collection av.Collec
logging.LogWarnf("attribute view [%s] key [%s] not found while filling values", attrView.ID, keyID)
continue
}
- if av.KeyTypeTemplate == keyValues.Key.Type || av.KeyTypeCreated == keyValues.Key.Type || av.KeyTypeUpdated == keyValues.Key.Type {
+ if av.HasKeyGroup(keyValues.Key.Type, av.KeyGroupRenderAutoFill) {
renderedBlockIDs := map[string]bool{}
for _, val := range values {
val.IsRenderAutoFill = true