From 7c799a92bfa5c95c9ca08c41835e34931a87aa6a Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Mon, 1 Jan 2024 21:11:12 +0800
Subject: [PATCH] :art: rollup render

---
 app/appearance/langs/en_US.json     |  1 +
 app/appearance/langs/es_ES.json     |  1 +
 app/appearance/langs/fr_FR.json     |  1 +
 app/appearance/langs/zh_CHT.json    |  1 +
 app/appearance/langs/zh_CN.json     |  1 +
 app/src/protyle/render/av/calc.ts   | 10 +++++-----
 app/src/protyle/render/av/rollup.ts |  2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 6c40b8e5b..cd7bfb53f 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,5 @@
 {
+  "original": "Original",
   "selectRelation": "Please select the related column first",
   "backRelation": "Bidirectional",
   "thisDatabase": "This database",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 136e9e485..fe5ac056b 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,5 @@
 {
+  "original": "Original",
   "selectRelation": "Seleccione primero la columna relacionada",
   "backRelation": "Bidireccional",
   "thisDatabase": "Esta base de datos",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 4f7010f2d..822bd30c5 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,5 @@
 {
+  "original": "Originale",
   "selectRelation": "Veuillez d'abord sélectionner la colonne associée",
   "backRelation": "Bidirectionnel",
   "thisDatabase": "Cette base de données",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index f0a2de14f..9445fa9ab 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,5 @@
 {
+  "original": "原值",
   "selectRelation": "請先選擇關聯列",
   "backRelation": "雙向關聯",
   "thisDatabase": "目前資料庫",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index cce910915..bb3d421bf 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,5 @@
 {
+  "original": "原值",
   "selectRelation": "请先选择关联列",
   "backRelation": "双向关联",
   "thisDatabase": "当前数据库",
diff --git a/app/src/protyle/render/av/calc.ts b/app/src/protyle/render/av/calc.ts
index 29d4a2742..f528496f1 100644
--- a/app/src/protyle/render/av/calc.ts
+++ b/app/src/protyle/render/av/calc.ts
@@ -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":
diff --git a/app/src/protyle/render/av/rollup.ts b/app/src/protyle/render/av/rollup.ts
index 40c278dad..794e38938 100644
--- a/app/src/protyle/render/av/rollup.ts
+++ b/app/src/protyle/render/av/rollup.ts
@@ -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>`
 }