diff --git a/frontend/package-lock.json b/frontend/package-lock.json index aae0c51b7b..949d26d6fa 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -11,7 +11,7 @@ "@gatsbyjs/reach-router": "1.3.9", "@seafile/react-image-lightbox": "2.0.2", "@seafile/resumablejs": "1.1.16", - "@seafile/sdoc-editor": "0.1.83", + "@seafile/sdoc-editor": "0.1.84", "@seafile/seafile-calendar": "0.0.12", "@seafile/seafile-editor": "0.3.132", "@seafile/slate-react": "0.54.13", @@ -2972,6 +2972,14 @@ "react": ">=0.14.0" } }, + "node_modules/@icons/material": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz", + "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==", + "peerDependencies": { + "react": "*" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "dev": true, @@ -5198,9 +5206,9 @@ "license": "MIT" }, "node_modules/@seafile/sdoc-editor": { - "version": "0.1.83", - "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.1.83.tgz", - "integrity": "sha512-nymDvlXrWOLy5DpwMmmCnHj74Ri7y+pYD2IHm5uomKKVuHBAB7Wl4HrI/pD0FzmMfS7XkcNAKOXHTRrkwcnDng==", + "version": "0.1.84", + "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.1.84.tgz", + "integrity": "sha512-tv7qNG8Yl7mEmVwvhvafaW+LNn7+x0BouguAsagE3XAIkgoJYMafo2YliGbM/wfm1VeK2QKrjxSY3+bRBKTMbw==", "dependencies": { "@seafile/react-image-lightbox": "2.0.2", "@seafile/slate": "0.91.8", @@ -5216,6 +5224,7 @@ "lodash.throttle": "4.1.1", "prismjs": "^1.29.0", "randomcolor": "0.6.2", + "react-color": "2.19.3", "react-cookies": "0.1.1", "reactstrap": "8.9.0", "slugid": "3.2.0", @@ -17708,6 +17717,11 @@ "version": "4.17.21", "license": "MIT" }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "node_modules/lodash._reinterpolate": { "version": "3.0.0", "dev": true, @@ -18044,6 +18058,11 @@ "css-mediaquery": "^0.1.2" } }, + "node_modules/material-colors": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", + "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + }, "node_modules/mathjax-full": { "version": "3.2.0", "license": "Apache-2.0", @@ -22749,6 +22768,23 @@ "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, + "node_modules/react-color": { + "version": "2.19.3", + "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.19.3.tgz", + "integrity": "sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==", + "dependencies": { + "@icons/material": "^0.2.4", + "lodash": "^4.17.15", + "lodash-es": "^4.17.15", + "material-colors": "^1.2.1", + "prop-types": "^15.5.10", + "reactcss": "^1.2.0", + "tinycolor2": "^1.4.1" + }, + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-cookies": { "version": "0.1.1", "license": "MIT", @@ -23533,6 +23569,14 @@ "react-dom": ">=16.6.0" } }, + "node_modules/reactcss": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz", + "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==", + "dependencies": { + "lodash": "^4.0.1" + } + }, "node_modules/reactstrap": { "version": "8.9.0", "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-8.9.0.tgz", @@ -27146,6 +27190,11 @@ "version": "1.0.3", "license": "MIT" }, + "node_modules/tinycolor2": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", + "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -31714,6 +31763,12 @@ "warning": "^4.0.3" } }, + "@icons/material": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz", + "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==", + "requires": {} + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "dev": true, @@ -33361,9 +33416,9 @@ "version": "1.1.16" }, "@seafile/sdoc-editor": { - "version": "0.1.83", - "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.1.83.tgz", - "integrity": "sha512-nymDvlXrWOLy5DpwMmmCnHj74Ri7y+pYD2IHm5uomKKVuHBAB7Wl4HrI/pD0FzmMfS7XkcNAKOXHTRrkwcnDng==", + "version": "0.1.84", + "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.1.84.tgz", + "integrity": "sha512-tv7qNG8Yl7mEmVwvhvafaW+LNn7+x0BouguAsagE3XAIkgoJYMafo2YliGbM/wfm1VeK2QKrjxSY3+bRBKTMbw==", "requires": { "@seafile/react-image-lightbox": "2.0.2", "@seafile/slate": "0.91.8", @@ -33379,6 +33434,7 @@ "lodash.throttle": "4.1.1", "prismjs": "^1.29.0", "randomcolor": "0.6.2", + "react-color": "2.19.3", "react-cookies": "0.1.1", "reactstrap": "8.9.0", "slugid": "3.2.0", @@ -41974,6 +42030,11 @@ "lodash": { "version": "4.17.21" }, + "lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "lodash._reinterpolate": { "version": "3.0.0", "dev": true @@ -42221,6 +42282,11 @@ "css-mediaquery": "^0.1.2" } }, + "material-colors": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", + "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + }, "mathjax-full": { "version": "3.2.0", "requires": { @@ -45692,6 +45758,20 @@ "prop-types": "^15.7.2" } }, + "react-color": { + "version": "2.19.3", + "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.19.3.tgz", + "integrity": "sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==", + "requires": { + "@icons/material": "^0.2.4", + "lodash": "^4.17.15", + "lodash-es": "^4.17.15", + "material-colors": "^1.2.1", + "prop-types": "^15.5.10", + "reactcss": "^1.2.0", + "tinycolor2": "^1.4.1" + } + }, "react-cookies": { "version": "0.1.1", "requires": { @@ -46272,6 +46352,14 @@ "prop-types": "^15.6.2" } }, + "reactcss": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz", + "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==", + "requires": { + "lodash": "^4.0.1" + } + }, "reactstrap": { "version": "8.9.0", "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-8.9.0.tgz", @@ -48895,6 +48983,11 @@ "tiny-warning": { "version": "1.0.3" }, + "tinycolor2": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", + "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" + }, "tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", diff --git a/frontend/package.json b/frontend/package.json index 177193a157..ef6003bc78 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,7 +6,7 @@ "@gatsbyjs/reach-router": "1.3.9", "@seafile/react-image-lightbox": "2.0.2", "@seafile/resumablejs": "1.1.16", - "@seafile/sdoc-editor": "0.1.83", + "@seafile/sdoc-editor": "0.1.84", "@seafile/seafile-calendar": "0.0.12", "@seafile/seafile-editor": "0.3.132", "@seafile/slate-react": "0.54.13", diff --git a/media/sdoc-editor/locales/en/sdoc-editor.json b/media/sdoc-editor/locales/en/sdoc-editor.json index 4b1c4e8935..1092738935 100644 --- a/media/sdoc-editor/locales/en/sdoc-editor.json +++ b/media/sdoc-editor/locales/en/sdoc-editor.json @@ -262,5 +262,48 @@ "Start_revise_tip": "Create a temporary document and modify on it, merge it back after reviewing changes", "Load_doc_content_error": "Load doc content error", "Draft": "Draft", - "Unmark_as_draft": "Unmark as draft" + "Unmark_as_draft": "Unmark as draft", + "Background_color": "Background color", + "No_color": "No color", + "Standard_color": "Standard color", + "Recently_used": "Recently used", + "More_color": "More color", + "White": "White", + "Black": "Black", + "Blue_grey": "Blue_grey", + "Blue": "Blue", + "Sky_blue": "Sky_blue", + "Green": "Green", + "Red": "Red", + "Orange": "Orange", + "Yellow": "Yellow", + "Purple": "Purple", + "Light_grey_x": "Light grey {{value}}", + "Dark_grey_x": "Dark grey {{value}}", + "Light_blue_grey_x": "Light blue grey {{value}}", + "Light_blue_x": "Light blue {{value}}", + "Light_sky_blue_x": "Light sky blue {{value}}", + "Light_green_x": "Light green {{value}}", + "Light_red_x": "Light red {{value}}", + "Light_orange_x": "Light orange {{value}}", + "Light_yellow_x": "Light yellow {{value}}", + "Light_purple_x": "Light purple {{value}}", + "Dark_blue_grey_x": "Dark blue grey {{value}}", + "Dark_blue_x": "Dark blue {{value}}", + "Dark_sky_blue_x": "Dark sky blue {{value}}", + "Dark_green_x": "Dark green {{value}}", + "Dark_red_x": "Dark red {{value}}", + "Dark_orange_x": "Dark orange {{value}}", + "Dark_yellow_x": "Dark yellow {{value}}", + "Dark_purple_x": "Dark purple {{value}}", + "Standard_dark_red": "Standard dark red", + "Standard_red": "Standard red", + "Standard_orange": "Standard orange", + "Standard_yellow": "Standard yellow", + "Standard_light_green": "Standard light green", + "Standard_green": "Standard green", + "Standard_light_blue": "Standard light blue", + "Standard_blue": "Standard blue", + "Standard_dark_blue": "Standard dark blue", + "Standard_purple": "Standard purple" } diff --git a/media/sdoc-editor/locales/zh-CN/sdoc-editor.json b/media/sdoc-editor/locales/zh-CN/sdoc-editor.json index bac83093f8..8b31a07d02 100644 --- a/media/sdoc-editor/locales/zh-CN/sdoc-editor.json +++ b/media/sdoc-editor/locales/zh-CN/sdoc-editor.json @@ -262,5 +262,48 @@ "Start_revise_tip": "创建一个临时文档并对其进行修订，检查更改后将其合并回来", "Load_doc_content_error": "加载文档内容错误", "Draft": "草稿", - "Unmark_as_draft": "取消草稿标记" + "Unmark_as_draft": "取消草稿标记", + "Background_color": "背景色", + "No_color": "无颜色", + "Standard_color": "标准色", + "Recently_used": "最近使用", + "More_color": "更多颜色", + "White": "白", + "Black": "黑", + "Blue_grey": "蓝灰", + "Blue": "蓝", + "Sky_blue": "天蓝", + "Green": "绿", + "Red": "红", + "Orange": "橙", + "Yellow": "黄", + "Purple": "紫", + "Light_grey_x": "浅灰 {{value}}", + "Dark_grey_x": "深灰 {{value}}", + "Light_blue_grey_x": "浅蓝灰 {{value}}", + "Light_blue_x": "浅蓝 {{value}}", + "Light_sky_blue_x": "浅天蓝 {{value}}", + "Light_green_x": "浅绿 {{value}}", + "Light_red_x": "浅红 {{value}}", + "Light_orange_x": "浅橙 {{value}}", + "Light_yellow_x": "浅黄 {{value}}", + "Light_purple_x": "浅紫 {{value}}", + "Dark_blue_grey_x": "深蓝灰 {{value}}", + "Dark_blue_x": "深蓝 {{value}}", + "Dark_sky_blue_x": "深天蓝 {{value}}", + "Dark_green_x": "深绿 {{value}}", + "Dark_red_x": "深红 {{value}}", + "Dark_orange_x": "深橙 {{value}}", + "Dark_yellow_x": "深黄 {{value}}", + "Dark_purple_x": "深紫 {{value}}", + "Standard_dark_red": "标准深红", + "Standard_red": "标准红", + "Standard_orange": "标准橙", + "Standard_yellow": "标准黄", + "Standard_light_green": "标准浅绿", + "Standard_green": "标准绿", + "Standard_light_blue": "标准浅蓝", + "Standard_blue": "标准蓝", + "Standard_dark_blue": "标准深蓝", + "Standard_purple": "标准紫" } diff --git a/media/sdoc-editor/sdoc-editor-font.css b/media/sdoc-editor/sdoc-editor-font.css index 7bb667d290..c83e140933 100644 --- a/media/sdoc-editor/sdoc-editor-font.css +++ b/media/sdoc-editor/sdoc-editor-font.css @@ -1,11 +1,11 @@ @font-face { font-family: "sdocfont"; /* Project id 4097705 */ - src: url('./sdoc-editor-font/iconfont.eot?t=1689301494065'); /* IE9 */ - src: url('./sdoc-editor-font/iconfont.eot?t=1689301494065#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('./sdoc-editor-font/iconfont.woff2?t=1689301494065') format('woff2'), - url('./sdoc-editor-font/iconfont.woff?t=1689301494065') format('woff'), - url('./sdoc-editor-font/iconfont.ttf?t=1689301494065') format('truetype'), - url('./sdoc-editor-font/iconfont.svg?t=1689301494065#sdocfont') format('svg'); + src: url('./sdoc-editor-font/iconfont.eot?t=1689838000925'); /* IE9 */ + src: url('./sdoc-editor-font/iconfont.eot?t=1689838000925#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./sdoc-editor-font/iconfont.woff2?t=1689838000925') format('woff2'), + url('./sdoc-editor-font/iconfont.woff?t=1689838000925') format('woff'), + url('./sdoc-editor-font/iconfont.ttf?t=1689838000925') format('truetype'), + url('./sdoc-editor-font/iconfont.svg?t=1689838000925#sdocfont') format('svg'); } .sdocfont { @@ -16,6 +16,14 @@ -moz-osx-font-smoothing: grayscale; } +.sdoc-bg-color:before { + content: "\e604"; +} + +.sdoc-right-slide:before { + content: "\e602"; +} + .sdoc-superscript:before { content: "\e638"; } diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.eot b/media/sdoc-editor/sdoc-editor-font/iconfont.eot index 4d11588123..c0586226ec 100644 Binary files a/media/sdoc-editor/sdoc-editor-font/iconfont.eot and b/media/sdoc-editor/sdoc-editor-font/iconfont.eot differ diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.svg b/media/sdoc-editor/sdoc-editor-font/iconfont.svg index 40715d86f0..0bdecd5e58 100644 --- a/media/sdoc-editor/sdoc-editor-font/iconfont.svg +++ b/media/sdoc-editor/sdoc-editor-font/iconfont.svg @@ -14,6 +14,10 @@ /> + + + + diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.ttf b/media/sdoc-editor/sdoc-editor-font/iconfont.ttf index ece0df0f46..853df04673 100644 Binary files a/media/sdoc-editor/sdoc-editor-font/iconfont.ttf and b/media/sdoc-editor/sdoc-editor-font/iconfont.ttf differ diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.woff b/media/sdoc-editor/sdoc-editor-font/iconfont.woff index 4057a41510..8976d40c9c 100644 Binary files a/media/sdoc-editor/sdoc-editor-font/iconfont.woff and b/media/sdoc-editor/sdoc-editor-font/iconfont.woff differ diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.woff2 b/media/sdoc-editor/sdoc-editor-font/iconfont.woff2 index d02ba6c3af..d966535956 100644 Binary files a/media/sdoc-editor/sdoc-editor-font/iconfont.woff2 and b/media/sdoc-editor/sdoc-editor-font/iconfont.woff2 differ