🎨 rollup render

This commit is contained in:
Vanessa 2024-01-01 21:11:12 +08:00
parent f2b148ab16
commit 7c799a92bf
7 changed files with 11 additions and 6 deletions

View file

@ -1,4 +1,5 @@
{
"original": "Original",
"selectRelation": "Please select the related column first",
"backRelation": "Bidirectional",
"thisDatabase": "This database",

View file

@ -1,4 +1,5 @@
{
"original": "Original",
"selectRelation": "Seleccione primero la columna relacionada",
"backRelation": "Bidireccional",
"thisDatabase": "Esta base de datos",

View file

@ -1,4 +1,5 @@
{
"original": "Originale",
"selectRelation": "Veuillez d'abord sélectionner la colonne associée",
"backRelation": "Bidirectionnel",
"thisDatabase": "Cette base de données",

View file

@ -1,4 +1,5 @@
{
"original": "原值",
"selectRelation": "請先選擇關聯列",
"backRelation": "雙向關聯",
"thisDatabase": "目前資料庫",

View file

@ -1,4 +1,5 @@
{
"original": "原值",
"selectRelation": "请先选择关联列",
"backRelation": "双向关联",
"thisDatabase": "当前数据库",

View file

@ -8,13 +8,13 @@ const calcItem = (options: {
operator: string,
oldOperator: string,
colId: string,
data?: IAV,
data?: IAV, // rollup
target: HTMLElement,
avId: string
}) => {
options.menu.addItem({
iconHTML: "",
label: getNameByOperator(options.operator),
label: getNameByOperator(options.operator, !!options.data),
click() {
if (!options.data) {
transaction(options.protyle, [{
@ -33,7 +33,7 @@ const calcItem = (options: {
}
}]);
} else {
options.target.querySelector(".b3-menu__accelerator").textContent = getNameByOperator(options.operator)
options.target.querySelector(".b3-menu__accelerator").textContent = getNameByOperator(options.operator, true)
const colData = options.data.view.columns.find((item) => {
if (item.id === options.colId) {
if (!item.rollup) {
@ -397,10 +397,10 @@ export const getCalcValue = (column: IAVColumn) => {
return value;
};
export const getNameByOperator = (operator: string) => {
export const getNameByOperator = (operator: string, isRollup: boolean) => {
switch (operator) {
case "":
return window.siyuan.languages.calcOperatorNone;
return isRollup ? window.siyuan.languages.original : window.siyuan.languages.calcOperatorNone;
case "Count all":
return window.siyuan.languages.calcOperatorCountAll;
case "Count values":

View file

@ -170,7 +170,7 @@ export const getRollupHTML = (options: { data?: IAV, cellElements?: HTMLElement[
</button>
<button class="b3-menu__item" data-type="goSearchRollupCalc">
<span class="b3-menu__label">${window.siyuan.languages.calc}</span>
<span class="b3-menu__accelerator">${getNameByOperator(colData.rollup?.calc?.operator)}</span>
<span class="b3-menu__accelerator">${getNameByOperator(colData.rollup?.calc?.operator, true)}</span>
<svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
</button>`
}