ooxml-ui 1.53.0 → 1.54.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/custom-elements.json +4 -0
- package/dist/base.d.ts +1 -0
- package/dist/chart/chartex-options-locales.d.ts +6 -6
- package/dist/chart/chartex-options-more.d.ts +17 -0
- package/dist/chart/chartex-options.d.ts +1 -0
- package/dist/chart/data-sheet-keys.d.ts +1 -0
- package/dist/chart/data-sheet-labels.d.ts +1 -0
- package/dist/chart/data-sheet.d.ts +2 -1
- package/dist/chart/format-pane-3d.d.ts +1 -0
- package/dist/chart/format-pane-advanced-intent.d.ts +1 -0
- package/dist/chart/format-pane-analysis.d.ts.map +1 -1
- package/dist/chart/format-pane-axis.d.ts +1 -0
- package/dist/chart/format-pane-common.d.ts +1 -0
- package/dist/chart/format-pane-effects.d.ts +1 -0
- package/dist/chart/format-pane-fields.d.ts +1 -0
- package/dist/chart/format-pane-fill-kinds.d.ts +5 -0
- package/dist/chart/format-pane-fill-kinds.d.ts.map +1 -1
- package/dist/chart/format-pane-intent.d.ts +3 -2
- package/dist/chart/format-pane-intent.d.ts.map +1 -1
- package/dist/chart/format-pane-locales/de.d.ts.map +1 -1
- package/dist/chart/format-pane-locales/en.d.ts +1 -0
- package/dist/chart/format-pane-locales/en.d.ts.map +1 -1
- package/dist/chart/format-pane-locales/es.d.ts.map +1 -1
- package/dist/chart/format-pane-locales/fr.d.ts.map +1 -1
- package/dist/chart/format-pane-locales/ja.d.ts.map +1 -1
- package/dist/chart/format-pane-locales/ko.d.ts +1 -0
- package/dist/chart/format-pane-locales/ko.d.ts.map +1 -1
- package/dist/chart/format-pane-locales/zh-CN.d.ts.map +1 -1
- package/dist/chart/format-pane-model.d.ts +1 -0
- package/dist/chart/format-pane-options.d.ts +1 -0
- package/dist/chart/format-pane-space.d.ts +10 -4
- package/dist/chart/format-pane-space.d.ts.map +1 -1
- package/dist/chart/format-pane.d.ts +9 -1
- package/dist/chart/format-pane.d.ts.map +1 -1
- package/dist/chart/gallery-tiles.d.ts +1 -0
- package/dist/chart-format-locales.js +1 -1
- package/dist/chrome/account-profile.d.ts +1 -0
- package/dist/chrome/account.d.ts +2 -1
- package/dist/chrome/backstage.d.ts +2 -1
- package/dist/chrome/find-bar.d.ts +2 -1
- package/dist/chrome/find-replace-fields.d.ts +1 -0
- package/dist/chrome/format-section.d.ts +2 -1
- package/dist/chrome/ruler.d.ts +2 -1
- package/dist/chrome/status-bar.d.ts +2 -1
- package/dist/chrome/status-item.d.ts +2 -1
- package/dist/chrome/tab-drag.d.ts +1 -0
- package/dist/chrome/tab-strip.d.ts +2 -1
- package/dist/chrome/task-pane.d.ts +2 -1
- package/dist/chrome/title-bar-types.d.ts +1 -0
- package/dist/chrome/title-bar.d.ts +2 -1
- package/dist/{chunk-J36LIYGS.js → chunk-3BNPWXCC.js} +1 -1
- package/dist/{chunk-HUR5JAG7.js → chunk-4JFADIZ6.js} +359 -17
- package/dist/{chunk-Y535PPSZ.js → chunk-54MF25DU.js} +1 -1
- package/dist/{chunk-XQIZWJEV.js → chunk-6SAT2GKV.js} +1 -1
- package/dist/{chunk-NSBQACCO.js → chunk-7F5IZHKM.js} +150 -109
- package/dist/{chunk-X464LPTR.js → chunk-HTB63MJO.js} +210 -14
- package/dist/{chunk-JI4ZNPEK.js → chunk-O3ER66QG.js} +7 -0
- package/dist/{chunk-2EBZ6IV6.js → chunk-UEUP3EMQ.js} +3 -3
- package/dist/comments/comments-pane.d.ts +2 -1
- package/dist/controls.d.ts +1 -0
- package/dist/controls.js +2 -2
- package/dist/dialog/chart-picker.d.ts +2 -1
- package/dist/dialog/dialog-footer.d.ts +2 -1
- package/dist/dialog/dialog-session.d.ts +1 -0
- package/dist/dialog/dialog.d.ts +2 -1
- package/dist/dialog/focus.d.ts +1 -0
- package/dist/dialog/message-dialogs.d.ts +1 -0
- package/dist/dialog/options-categories.d.ts +1 -0
- package/dist/dialog/options-controls.d.ts +1 -0
- package/dist/dialog/options-dialog.d.ts +2 -1
- package/dist/dialog/progress-dialog.d.ts +2 -1
- package/dist/dialog/share-dialog-locales.d.ts +1 -0
- package/dist/dialog/share-dialog.d.ts +2 -1
- package/dist/docx/chart-commands.d.ts +5 -1
- package/dist/docx/locales/charts.d.ts +9 -0
- package/dist/docx/locales/en.d.ts +77 -14
- package/dist/docx/locales/smartart.d.ts +68 -14
- package/dist/docx/localization-strings.d.ts +77 -14
- package/dist/docx/smartart-node-view.d.ts +2 -1
- package/dist/docx.js +94 -22
- package/dist/export/pdf-image.d.ts +1 -0
- package/dist/export/pdf-path.d.ts +1 -0
- package/dist/export/pdf-svg-gradient.d.ts +1 -0
- package/dist/export/pdf-svg-notes.d.ts +1 -0
- package/dist/export/pdf-text-layer-font.d.ts +1 -0
- package/dist/files/cloud-files-labels.d.ts +1 -0
- package/dist/files/cloud-files-view.d.ts +1 -0
- package/dist/files/connected-services.d.ts +2 -1
- package/dist/files/open-places.d.ts +2 -1
- package/dist/files/save-progress-label.d.ts +1 -0
- package/dist/fonts/availability.d.ts +1 -0
- package/dist/fonts/catalog.d.ts +1 -0
- package/dist/fonts/custom-fonts.d.ts +1 -0
- package/dist/form/checkable.d.ts +1 -0
- package/dist/form/color-custom.d.ts +2 -1
- package/dist/form/color-grid.d.ts +2 -1
- package/dist/form/color-input/live-color-input.d.ts +1 -0
- package/dist/form/color-input/live-color-leaves.d.ts +1 -0
- package/dist/form/radio.d.ts +2 -1
- package/dist/form/range-control.d.ts +1 -0
- package/dist/form/search-field.d.ts +2 -1
- package/dist/form/select.d.ts +2 -1
- package/dist/form/switch.d.ts +2 -1
- package/dist/form/symbol-picker.d.ts +2 -1
- package/dist/form/zoom-slider.d.ts +2 -1
- package/dist/icon.d.ts +1 -0
- package/dist/image-native-size.d.ts +1 -0
- package/dist/index.js +6 -6
- package/dist/keytips.d.ts +1 -0
- package/dist/menu/command-search.d.ts +2 -1
- package/dist/menu/context-menu.d.ts +2 -1
- package/dist/menu/menu-button.d.ts +2 -1
- package/dist/menu/menu-item.d.ts +2 -1
- package/dist/menu/menu-model.d.ts +1 -0
- package/dist/menu/menu-separator.d.ts +2 -1
- package/dist/notices/toasts.d.ts +2 -1
- package/dist/picture-artistic-filters.d.ts +1 -0
- package/dist/pptx/{chart-3d-view-scene-RCWYLVC3.cjs → chart-3d-view-scene-B3SNZWRD.cjs} +37 -37
- package/dist/pptx/{chart-3d-view-scene-7LIMCTEM.mjs → chart-3d-view-scene-ENYOU7XV.mjs} +2 -2
- package/dist/pptx/{chunk-O33ER4AJ.cjs → chunk-3GS5BKST.cjs} +7 -0
- package/dist/pptx/{chunk-STQTJXYQ.cjs → chunk-5BQM5YYS.cjs} +21550 -19868
- package/dist/pptx/{chunk-3DJZBAQ2.mjs → chunk-6FDEQ46Q.mjs} +1 -1
- package/dist/pptx/{chunk-EEELXUAE.mjs → chunk-7EVC4DK7.mjs} +2 -2
- package/dist/pptx/{chunk-OS2SX33G.mjs → chunk-DNXARUCD.mjs} +18865 -17244
- package/dist/pptx/{chunk-75MKMQP5.mjs → chunk-FYNZ6QSV.mjs} +7 -0
- package/dist/pptx/{chunk-5PL3ZZV4.mjs → chunk-J4PPKLNF.mjs} +3 -3
- package/dist/pptx/{chunk-HTFYAGHG.cjs → chunk-K2SGPTSG.cjs} +43 -0
- package/dist/pptx/{chunk-LOUVYGWX.cjs → chunk-KESYQS6D.cjs} +12 -12
- package/dist/pptx/{chunk-XOAXPD2W.cjs → chunk-MCRNV5DK.cjs} +5 -187
- package/dist/pptx/{chunk-TJPRGVT4.cjs → chunk-QMGOPAN5.cjs} +49 -49
- package/dist/pptx/{chunk-RQJOOXRG.mjs → chunk-T3GW4SKO.mjs} +6 -186
- package/dist/pptx/{chunk-AN34Z3QP.cjs → chunk-WPM2ADMY.cjs} +2 -2
- package/dist/pptx/{chunk-XL5AF4U3.mjs → chunk-YFS2TFET.mjs} +40 -1
- package/dist/pptx/dom/index.cjs +441 -441
- package/dist/pptx/dom/index.mjs +11 -11
- package/dist/pptx/export/html2canvas-clone.cjs +6 -6
- package/dist/pptx/export/html2canvas-clone.mjs +1 -1
- package/dist/pptx/i18n/index.cjs +6 -6
- package/dist/pptx/i18n/index.mjs +1 -1
- package/dist/pptx/index.cjs +3987 -3727
- package/dist/pptx/index.mjs +6 -6
- package/dist/pptx/render/building-blocks/find-bar-controller.d.ts +5 -11
- package/dist/pptx/render/building-blocks/find-bar-controller.d.ts.map +1 -1
- package/dist/pptx/render/chart-combo-stock.cjs +3 -3
- package/dist/pptx/render/chart-combo-stock.mjs +1 -1
- package/dist/pptx/render/chart-format/chart-format-pane-edit-extra.d.ts +1 -5
- package/dist/pptx/render/chart-format/chart-format-pane-edit-extra.d.ts.map +1 -1
- package/dist/pptx/render/chart-format/chart-format-pane-edit.d.ts.map +1 -1
- package/dist/pptx/render/chart-format/chart-format-source.d.ts +3 -0
- package/dist/pptx/render/chart-format/chart-format-source.d.ts.map +1 -1
- package/dist/pptx/render/chart-overlays.cjs +7 -7
- package/dist/pptx/render/chart-overlays.mjs +1 -1
- package/dist/pptx/render/chart-surface-treemap.cjs +4 -4
- package/dist/pptx/render/chart-surface-treemap.mjs +1 -1
- package/dist/pptx/render/chart-view-model.cjs +44 -44
- package/dist/pptx/render/chart-view-model.mjs +1 -1
- package/dist/pptx/render/chart-waterfall-map.cjs +6 -6
- package/dist/pptx/render/chart-waterfall-map.mjs +1 -1
- package/dist/pptx/render/controller/comments-panel-controller.d.ts +78 -0
- package/dist/pptx/render/controller/comments-panel-controller.d.ts.map +1 -0
- package/dist/pptx/render/controller/find-replace-controller.d.ts +27 -0
- package/dist/pptx/render/controller/find-replace-controller.d.ts.map +1 -0
- package/dist/pptx/render/controller/index.d.ts +10 -0
- package/dist/pptx/render/controller/index.d.ts.map +1 -1
- package/dist/pptx/render/controller/selection-pane-controller.d.ts +82 -0
- package/dist/pptx/render/controller/selection-pane-controller.d.ts.map +1 -0
- package/dist/pptx/render/controller/slide-rail-controller.d.ts +67 -0
- package/dist/pptx/render/controller/slide-rail-controller.d.ts.map +1 -0
- package/dist/pptx/render/controller/slide-sorter-controller.d.ts +149 -0
- package/dist/pptx/render/controller/slide-sorter-controller.d.ts.map +1 -0
- package/dist/pptx/render/drawing-color.d.ts +10 -3
- package/dist/pptx/render/drawing-color.d.ts.map +1 -1
- package/dist/pptx/render/fill-style.d.ts.map +1 -1
- package/dist/pptx/render/index.d.ts +3 -0
- package/dist/pptx/render/index.d.ts.map +1 -1
- package/dist/pptx/render/inspector/action-settings-fields.d.ts +58 -0
- package/dist/pptx/render/inspector/action-settings-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/element-alt-text-fields.d.ts +23 -0
- package/dist/pptx/render/inspector/element-alt-text-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/index.d.ts +25 -0
- package/dist/pptx/render/inspector/index.d.ts.map +1 -1
- package/dist/pptx/render/inspector/inspector-field-model.d.ts +31 -3
- package/dist/pptx/render/inspector/inspector-field-model.d.ts.map +1 -1
- package/dist/pptx/render/inspector/inspector-option-label.d.ts +11 -0
- package/dist/pptx/render/inspector/inspector-option-label.d.ts.map +1 -0
- package/dist/pptx/render/inspector/media-playback-fields.d.ts +24 -0
- package/dist/pptx/render/inspector/media-playback-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/media-trim-fields.d.ts +29 -0
- package/dist/pptx/render/inspector/media-trim-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/ole-fields.d.ts +33 -0
- package/dist/pptx/render/inspector/ole-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/paragraph-fields.d.ts +27 -0
- package/dist/pptx/render/inspector/paragraph-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/picture-artistic-fields.d.ts +16 -0
- package/dist/pptx/render/inspector/picture-artistic-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/picture-effect-fields.d.ts +45 -0
- package/dist/pptx/render/inspector/picture-effect-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/picture-fields.d.ts +38 -0
- package/dist/pptx/render/inspector/picture-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/shape-fill-fields.d.ts.map +1 -1
- package/dist/pptx/render/inspector/slide-background-fields.d.ts +22 -0
- package/dist/pptx/render/inspector/slide-background-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/table-cell-fields.d.ts +26 -0
- package/dist/pptx/render/inspector/table-cell-fields.d.ts.map +1 -0
- package/dist/pptx/render/inspector/table-option-fields.d.ts +23 -0
- package/dist/pptx/render/inspector/table-option-fields.d.ts.map +1 -0
- package/dist/pptx/render/outline-view-session.d.ts +67 -0
- package/dist/pptx/render/outline-view-session.d.ts.map +1 -0
- package/dist/pptx/render/present-controls-state.d.ts +6 -0
- package/dist/pptx/render/present-controls-state.d.ts.map +1 -1
- package/dist/pptx/render/ribbon-galleries/smartart-native-entries.d.ts +3 -2
- package/dist/pptx/render/ribbon-galleries/smartart-native-entries.d.ts.map +1 -1
- package/dist/pptx/render/ribbon-galleries/smartart-style-3d-preview.d.ts +4 -0
- package/dist/pptx/render/ribbon-galleries/smartart-style-3d-preview.d.ts.map +1 -0
- package/dist/pptx/render/ribbon-galleries/smartart-styles-gallery.d.ts.map +1 -1
- package/dist/pptx/render/slide-background-fill.d.ts +49 -0
- package/dist/pptx/render/slide-background-fill.d.ts.map +1 -0
- package/dist/pptx/render/slide-background.d.ts +3 -2
- package/dist/pptx/render/slide-background.d.ts.map +1 -1
- package/dist/pptx/render/smartart-3d-scene-camera.d.ts +13 -43
- package/dist/pptx/render/smartart-3d-scene-camera.d.ts.map +1 -1
- package/dist/pptx/render/visual-3d-camera-presets.d.ts +3 -33
- package/dist/pptx/render/visual-3d-camera-presets.d.ts.map +1 -1
- package/dist/pptx/render/zoom-to-selection.d.ts +41 -0
- package/dist/pptx/render/zoom-to-selection.d.ts.map +1 -0
- package/dist/pptx/{smartart-insert-preview-FJFP4JJ5.mjs → smartart-insert-preview-D2WJBY2M.mjs} +7 -7
- package/dist/pptx/{smartart-insert-preview-XNHOSN3T.cjs → smartart-insert-preview-WI2O6X6C.cjs} +8 -8
- package/dist/pptx/{view-scene-GHBN7QMR.mjs → view-scene-DZCPZTE4.mjs} +1 -1
- package/dist/pptx/{view-scene-4ZFUCP6S.cjs → view-scene-HMOCSMJM.cjs} +8 -8
- package/dist/presence/presence.d.ts +2 -1
- package/dist/recovery-scheduler.d.ts +1 -0
- package/dist/render-cache.d.ts +1 -0
- package/dist/ribbon/button.d.ts +2 -1
- package/dist/ribbon/color-preview.d.ts +1 -0
- package/dist/ribbon/gallery-styles.d.ts +1 -0
- package/dist/ribbon/gallery.d.ts +2 -1
- package/dist/ribbon/group-overflow.d.ts +1 -0
- package/dist/ribbon/keytip-run.d.ts +1 -0
- package/dist/ribbon/overflow.d.ts +1 -0
- package/dist/ribbon/ribbon-actions.d.ts +2 -1
- package/dist/ribbon/ribbon-section.d.ts +2 -1
- package/dist/ribbon/ribbon-stack.d.ts +2 -1
- package/dist/ribbon/ribbon-tabs.d.ts +2 -1
- package/dist/ribbon/ribbon-toolbar.d.ts +2 -1
- package/dist/ribbon/safe-svg.d.ts +1 -0
- package/dist/smartart/smartart-3d.d.ts +39 -0
- package/dist/smartart/smartart-picker.d.ts +2 -1
- package/dist/smartart/smartart-svg.d.ts +8 -1
- package/dist/smartart/smartart-text-pane-tools.d.ts +1 -0
- package/dist/smartart/smartart-text-pane.d.ts +2 -1
- package/dist/smartart.js +1 -1
- package/dist/teams.js +3 -3
- package/dist/theme.d.ts +1 -0
- package/dist/touch-targets.d.ts +1 -0
- package/dist/visio.js +12 -7
- package/dist/xlsx/chart-format-source.d.ts +2 -0
- package/dist/xlsx.js +72 -19
- package/package.json +9 -9
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
4
|
-
var
|
|
3
|
+
var chunkKESYQS6D_cjs = require('./chunk-KESYQS6D.cjs');
|
|
4
|
+
var chunkK2SGPTSG_cjs = require('./chunk-K2SGPTSG.cjs');
|
|
5
5
|
require('./chunk-FI2ATACZ.cjs');
|
|
6
6
|
var chart = require('ooxml-core/chart');
|
|
7
7
|
|
|
@@ -182,7 +182,7 @@ function buildChart3DBarMeshes(three, layout, svgWidth, svgHeight) {
|
|
|
182
182
|
// src/pptx/render/chart-3d-chrome-overlay.ts
|
|
183
183
|
function renderChart3DChromeOverlaySvg(doc, source, box) {
|
|
184
184
|
const vm = box ? withBoxChromePositions(source) : source;
|
|
185
|
-
const svg =
|
|
185
|
+
const svg = chunkKESYQS6D_cjs.createSvgEl(doc, "svg", {
|
|
186
186
|
class: "pptxv-chart-3d-chrome",
|
|
187
187
|
viewBox: `0 0 ${vm.svgWidth} ${vm.svgHeight}`,
|
|
188
188
|
preserveAspectRatio: "none"
|
|
@@ -195,7 +195,7 @@ function renderChart3DChromeOverlaySvg(doc, source, box) {
|
|
|
195
195
|
svg.style.setProperty("pointer-events", "none");
|
|
196
196
|
if (vm.areaFill) {
|
|
197
197
|
svg.appendChild(
|
|
198
|
-
|
|
198
|
+
chunkKESYQS6D_cjs.createSvgEl(doc, "rect", {
|
|
199
199
|
x: 0,
|
|
200
200
|
y: 0,
|
|
201
201
|
width: vm.svgWidth,
|
|
@@ -206,7 +206,7 @@ function renderChart3DChromeOverlaySvg(doc, source, box) {
|
|
|
206
206
|
);
|
|
207
207
|
}
|
|
208
208
|
if (vm.title) {
|
|
209
|
-
const title =
|
|
209
|
+
const title = chunkKESYQS6D_cjs.createSvgEl(doc, "text", {
|
|
210
210
|
x: vm.titleX,
|
|
211
211
|
y: vm.titleY,
|
|
212
212
|
"text-anchor": "middle",
|
|
@@ -218,7 +218,7 @@ function renderChart3DChromeOverlaySvg(doc, source, box) {
|
|
|
218
218
|
});
|
|
219
219
|
if (vm.titleRunSpans && vm.titleRunSpans.length > 0) {
|
|
220
220
|
for (const run of vm.titleRunSpans) {
|
|
221
|
-
const tspan =
|
|
221
|
+
const tspan = chunkKESYQS6D_cjs.createSvgEl(doc, "tspan", {
|
|
222
222
|
"font-size": run.fontSize,
|
|
223
223
|
"font-weight": run.fontWeight,
|
|
224
224
|
"font-style": run.fontStyle,
|
|
@@ -237,28 +237,28 @@ function renderChart3DChromeOverlaySvg(doc, source, box) {
|
|
|
237
237
|
appendBoxLabels(doc, svg, vm, box.labels);
|
|
238
238
|
const legend = box.legend ?? vm.legend.map((item) => ({ ...item, lineSwatch: void 0 }));
|
|
239
239
|
const legendVm = { ...vm, legend: box.reverseLegend ? legend.reverse() : legend };
|
|
240
|
-
|
|
240
|
+
chunkKESYQS6D_cjs.appendChartLegendSvg(doc, svg, legendVm);
|
|
241
241
|
return svg;
|
|
242
242
|
}
|
|
243
243
|
for (const gl of vm.gridlines) {
|
|
244
|
-
svg.appendChild(
|
|
244
|
+
svg.appendChild(chunkKESYQS6D_cjs.renderChartLineSvg(doc, gl));
|
|
245
245
|
}
|
|
246
246
|
for (const gl of vm.secondaryGridlines ?? []) {
|
|
247
|
-
svg.appendChild(
|
|
247
|
+
svg.appendChild(chunkKESYQS6D_cjs.renderChartLineSvg(doc, gl));
|
|
248
248
|
}
|
|
249
249
|
for (const lbl of vm.axisLabels) {
|
|
250
|
-
svg.appendChild(
|
|
250
|
+
svg.appendChild(chunkKESYQS6D_cjs.renderChartTextSvg(doc, lbl));
|
|
251
251
|
}
|
|
252
252
|
for (const lbl of vm.secondaryAxisLabels ?? []) {
|
|
253
|
-
svg.appendChild(
|
|
253
|
+
svg.appendChild(chunkKESYQS6D_cjs.renderChartTextSvg(doc, lbl));
|
|
254
254
|
}
|
|
255
255
|
if (vm.zeroLine) {
|
|
256
|
-
svg.appendChild(
|
|
256
|
+
svg.appendChild(chunkKESYQS6D_cjs.renderChartLineSvg(doc, vm.zeroLine));
|
|
257
257
|
}
|
|
258
258
|
for (const lbl of vm.categoryLabels) {
|
|
259
|
-
svg.appendChild(
|
|
259
|
+
svg.appendChild(chunkKESYQS6D_cjs.renderChartTextSvg(doc, lbl));
|
|
260
260
|
}
|
|
261
|
-
|
|
261
|
+
chunkKESYQS6D_cjs.appendChartLegendSvg(doc, svg, vm);
|
|
262
262
|
return svg;
|
|
263
263
|
}
|
|
264
264
|
var PT = 4 / 3;
|
|
@@ -277,7 +277,7 @@ function appendBoxLabels(doc, svg, vm, labels) {
|
|
|
277
277
|
const style = vm.axisLabels[0];
|
|
278
278
|
for (const label of labels) {
|
|
279
279
|
svg.appendChild(
|
|
280
|
-
|
|
280
|
+
chunkKESYQS6D_cjs.renderChartTextSvg(doc, {
|
|
281
281
|
kind: "text",
|
|
282
282
|
x: label.x,
|
|
283
283
|
y: label.y,
|
|
@@ -347,7 +347,7 @@ function attachChart3DMarkInteraction(options) {
|
|
|
347
347
|
}
|
|
348
348
|
const point = pointAt(event.clientX, event.clientY);
|
|
349
349
|
const value = point ? adapter.valueOf(point) : void 0;
|
|
350
|
-
const tooltip = point && value !== void 0 ?
|
|
350
|
+
const tooltip = point && value !== void 0 ? chunkKESYQS6D_cjs.buildBarChart3DHoverTooltip(
|
|
351
351
|
{ seriesIndex: point.seriesIndex, categoryIndex: point.pointIndex, value },
|
|
352
352
|
{
|
|
353
353
|
categoryLabels: options.categoryLabels,
|
|
@@ -365,7 +365,7 @@ function attachChart3DMarkInteraction(options) {
|
|
|
365
365
|
return;
|
|
366
366
|
}
|
|
367
367
|
const point = pointAt(event.clientX, event.clientY);
|
|
368
|
-
const armed = point !== null &&
|
|
368
|
+
const armed = point !== null && chunkKESYQS6D_cjs.isChartInteractionArmed(target);
|
|
369
369
|
if (armed) {
|
|
370
370
|
event.stopPropagation();
|
|
371
371
|
}
|
|
@@ -441,7 +441,7 @@ function obliqueDragValue(layout, startValue, dx, dy) {
|
|
|
441
441
|
const along = layout.horizontal ? dx : -dy;
|
|
442
442
|
const raw = startValue + along / layout.valueScale;
|
|
443
443
|
const span = layout.range.max - layout.range.min;
|
|
444
|
-
return
|
|
444
|
+
return chunkKESYQS6D_cjs.roundDragValue(raw, { min: layout.range.min, max: layout.range.max, span });
|
|
445
445
|
}
|
|
446
446
|
function obliqueDraggedExtent(layout, value) {
|
|
447
447
|
const { min, max } = layout.range;
|
|
@@ -454,7 +454,7 @@ function obliqueDraggedExtent(layout, value) {
|
|
|
454
454
|
function obliqueBarAtValue(layout, bar, value) {
|
|
455
455
|
const { from, length } = obliqueDraggedExtent(layout, value);
|
|
456
456
|
const extent = (layout.range.max - layout.range.min) * layout.valueScale;
|
|
457
|
-
const taper =
|
|
457
|
+
const taper = chunkKESYQS6D_cjs.obliqueBarTaper(bar.shape, from, from + length, extent, value);
|
|
458
458
|
return layout.horizontal ? { ...bar, x: from, w: length, value, taper } : { ...bar, y: from, h: length, value, taper };
|
|
459
459
|
}
|
|
460
460
|
|
|
@@ -546,7 +546,7 @@ function buildPerspBarPrisms(chartData, layout, override) {
|
|
|
546
546
|
const nSer = chartData.series.length;
|
|
547
547
|
const catExtent = layout.horizontal ? layout.view.box.h : layout.view.box.w;
|
|
548
548
|
const slot = nCat > 0 ? catExtent / nCat : catExtent;
|
|
549
|
-
const gapWidth = (chartData.barGapWidth ??
|
|
549
|
+
const gapWidth = (chartData.barGapWidth ?? chunkK2SGPTSG_cjs.DEFAULT_BAR_GAP_WIDTH) / 100;
|
|
550
550
|
const slots = layout.grouping === "clustered" ? nSer : 1;
|
|
551
551
|
const barW = slot / (slots + gapWidth);
|
|
552
552
|
const depth = Math.min(barW, layout.rowDepth);
|
|
@@ -599,7 +599,7 @@ function buildPerspBarPrisms(chartData, layout, override) {
|
|
|
599
599
|
z0,
|
|
600
600
|
z1: z0 + depth,
|
|
601
601
|
shape,
|
|
602
|
-
taper:
|
|
602
|
+
taper: chunkKESYQS6D_cjs.obliqueBarTaper(
|
|
603
603
|
shape,
|
|
604
604
|
v0,
|
|
605
605
|
v1,
|
|
@@ -794,7 +794,7 @@ function buildPerspGridlines(three, layout) {
|
|
|
794
794
|
function buildPerspMeshes(three, layout, prisms) {
|
|
795
795
|
const group = new three.Group();
|
|
796
796
|
group.matrixAutoUpdate = false;
|
|
797
|
-
group.matrix.copy(
|
|
797
|
+
group.matrix.copy(chunkKESYQS6D_cjs.perspBoxMatrix(three, layout.view));
|
|
798
798
|
const gridlines = buildPerspGridlines(three, layout);
|
|
799
799
|
group.add(gridlines);
|
|
800
800
|
const material = new three.MeshBasicMaterial({ vertexColors: true, side: three.DoubleSide });
|
|
@@ -849,7 +849,7 @@ function surfaceBands(chartData, range, palette) {
|
|
|
849
849
|
const fmt = chartData.bandFmts?.find((b) => b.index === i)?.spPr;
|
|
850
850
|
const cycle = palette.length > 0 ? palette : ["#4472C4"];
|
|
851
851
|
const base = cycle[i % cycle.length];
|
|
852
|
-
const fallback = Math.floor(i / cycle.length) % 2 === 1 ?
|
|
852
|
+
const fallback = Math.floor(i / cycle.length) % 2 === 1 ? chunkK2SGPTSG_cjs.shade(base, 0.4) : base;
|
|
853
853
|
return {
|
|
854
854
|
label: `${formatEdge(lo)}-${formatEdge(edges[i + 1])}`,
|
|
855
855
|
color: fmt?.fillColor ?? fmt?.strokeColor ?? fallback
|
|
@@ -1033,7 +1033,7 @@ function disposeObject(object) {
|
|
|
1033
1033
|
function buildSurfaceMarks(three, chartData, layout, palette) {
|
|
1034
1034
|
const group = new three.Group();
|
|
1035
1035
|
group.matrixAutoUpdate = false;
|
|
1036
|
-
group.matrix.copy(
|
|
1036
|
+
group.matrix.copy(chunkKESYQS6D_cjs.perspBoxMatrix(three, layout.view));
|
|
1037
1037
|
const gridlines = buildPerspGridlines(three, layout);
|
|
1038
1038
|
group.add(gridlines);
|
|
1039
1039
|
let visual = buildVisual(three, chartData, layout, palette);
|
|
@@ -1173,8 +1173,8 @@ function surfaceLegend(chartData, layout, palette, background, textStyle) {
|
|
|
1173
1173
|
function mountPerspChartView(input, ctx) {
|
|
1174
1174
|
const three = ctx.three;
|
|
1175
1175
|
const { vm, layout, chartData } = input;
|
|
1176
|
-
const palette =
|
|
1177
|
-
const camera =
|
|
1176
|
+
const palette = chunkK2SGPTSG_cjs.resolveChartPalette(chartData);
|
|
1177
|
+
const camera = chunkKESYQS6D_cjs.buildPerspCamera(three, layout.view, vm.svgWidth, vm.svgHeight);
|
|
1178
1178
|
const scene = new three.Scene();
|
|
1179
1179
|
const marks = buildPerspMarkSet(three, chartData, layout, palette);
|
|
1180
1180
|
scene.add(marks.group);
|
|
@@ -1223,15 +1223,15 @@ function mountPerspChartView(input, ctx) {
|
|
|
1223
1223
|
const a = marks.anchor(point, start);
|
|
1224
1224
|
const step = unit * layout.valueScale;
|
|
1225
1225
|
const b = layout.horizontal ? [a[0] + step, a[1], a[2]] : [a[0], a[1] + step, a[2]];
|
|
1226
|
-
const s0 =
|
|
1227
|
-
const s1 =
|
|
1226
|
+
const s0 = chunkKESYQS6D_cjs.perspToScreen(layout.view, a);
|
|
1227
|
+
const s1 = chunkKESYQS6D_cjs.perspToScreen(layout.view, b);
|
|
1228
1228
|
const ux = (s1.x - s0.x) / unit;
|
|
1229
1229
|
const uy = (s1.y - s0.y) / unit;
|
|
1230
1230
|
const len2 = ux * ux + uy * uy || 1;
|
|
1231
1231
|
const span = layout.range.max - layout.range.min;
|
|
1232
1232
|
return {
|
|
1233
1233
|
preview(dx, dy) {
|
|
1234
|
-
const value =
|
|
1234
|
+
const value = chunkKESYQS6D_cjs.roundDragValue(start + (dx * ux + dy * uy) / len2, {
|
|
1235
1235
|
min: layout.range.min,
|
|
1236
1236
|
max: layout.range.max,
|
|
1237
1237
|
span
|
|
@@ -1319,7 +1319,7 @@ function sliceBuffers(three, layout, slice) {
|
|
|
1319
1319
|
const steps = Math.max(2, Math.ceil(span / (Math.PI * 2) * SEGMENTS_PER_TURN));
|
|
1320
1320
|
const angles = Array.from({ length: steps + 1 }, (_, i) => slice.startAngle + span * i / steps);
|
|
1321
1321
|
const rim = (a, y) => {
|
|
1322
|
-
const p =
|
|
1322
|
+
const p = chunkKESYQS6D_cjs.pieRimPoint(cx, cz, r, a);
|
|
1323
1323
|
return [p.x, y, p.z];
|
|
1324
1324
|
};
|
|
1325
1325
|
const radial = (a) => [Math.sin(a), 0, Math.cos(a)];
|
|
@@ -1363,7 +1363,7 @@ function sliceBuffers(three, layout, slice) {
|
|
|
1363
1363
|
function buildPieMarks(three, layout) {
|
|
1364
1364
|
const group = new three.Group();
|
|
1365
1365
|
group.matrixAutoUpdate = false;
|
|
1366
|
-
group.matrix.copy(
|
|
1366
|
+
group.matrix.copy(chunkKESYQS6D_cjs.perspBoxMatrix(three, layout.view));
|
|
1367
1367
|
const material = new three.MeshBasicMaterial({
|
|
1368
1368
|
vertexColors: true,
|
|
1369
1369
|
side: three.DoubleSide,
|
|
@@ -1427,12 +1427,12 @@ function slicesWith(input, pointIndex, value) {
|
|
|
1427
1427
|
...input.element,
|
|
1428
1428
|
chartData: { ...input.chartData, series }
|
|
1429
1429
|
};
|
|
1430
|
-
return
|
|
1430
|
+
return chunkKESYQS6D_cjs.computePieChartLayout(element, input.vm)?.slices ?? input.layout.slices;
|
|
1431
1431
|
}
|
|
1432
1432
|
function mountPieChartView(input, ctx) {
|
|
1433
1433
|
const three = ctx.three;
|
|
1434
1434
|
const { vm, layout, chartData } = input;
|
|
1435
|
-
const camera =
|
|
1435
|
+
const camera = chunkKESYQS6D_cjs.buildPerspCamera(three, layout.view, vm.svgWidth, vm.svgHeight);
|
|
1436
1436
|
const scene = new three.Scene();
|
|
1437
1437
|
const marks = buildPieMarks(three, layout);
|
|
1438
1438
|
scene.add(marks.group);
|
|
@@ -1473,7 +1473,7 @@ function mountPieChartView(input, ctx) {
|
|
|
1473
1473
|
const start = values();
|
|
1474
1474
|
return {
|
|
1475
1475
|
preview(_dx, _dy, at) {
|
|
1476
|
-
const hit =
|
|
1476
|
+
const hit = chunkKESYQS6D_cjs.perspScreenToPlaneY(layout.view, at.x, at.y, layout.center.y);
|
|
1477
1477
|
if (!hit) {
|
|
1478
1478
|
return start[point.pointIndex];
|
|
1479
1479
|
}
|
|
@@ -1481,7 +1481,7 @@ function mountPieChartView(input, ctx) {
|
|
|
1481
1481
|
hit.x - layout.center.x - slice.offset.x,
|
|
1482
1482
|
hit.z - layout.center.z - slice.offset.z
|
|
1483
1483
|
);
|
|
1484
|
-
const value =
|
|
1484
|
+
const value = chunkKESYQS6D_cjs.resolvePieSliceShareValue(
|
|
1485
1485
|
angle,
|
|
1486
1486
|
slice.startAngle,
|
|
1487
1487
|
start,
|
|
@@ -1497,7 +1497,7 @@ function mountPieChartView(input, ctx) {
|
|
|
1497
1497
|
marker.visible = slice !== void 0;
|
|
1498
1498
|
if (slice) {
|
|
1499
1499
|
const mid = (slice.startAngle + slice.endAngle) / 2;
|
|
1500
|
-
const p =
|
|
1500
|
+
const p = chunkKESYQS6D_cjs.pieRimPoint(
|
|
1501
1501
|
layout.center.x + slice.offset.x,
|
|
1502
1502
|
layout.center.z + slice.offset.z,
|
|
1503
1503
|
layout.radius * 0.6,
|
|
@@ -1562,7 +1562,7 @@ async function mountChart3DView(spec, ctx) {
|
|
|
1562
1562
|
return mountPieChartView(
|
|
1563
1563
|
{
|
|
1564
1564
|
element: spec.element,
|
|
1565
|
-
vm:
|
|
1565
|
+
vm: chunkKESYQS6D_cjs.widenPieViewModel(spec.vm, spec.element),
|
|
1566
1566
|
layout: spec.geometry.layout,
|
|
1567
1567
|
chartData: chartData2,
|
|
1568
1568
|
categoryLabels: spec.categoryLabels
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { widenPieViewModel, buildPerspCamera, createSvgEl, appendChartLegendSvg, renderChartLineSvg, renderChartTextSvg, perspBoxMatrix, pieRimPoint, perspScreenToPlaneY, resolvePieSliceShareValue, perspToScreen, roundDragValue, buildBarChart3DHoverTooltip, isChartInteractionArmed, computePieChartLayout, obliqueBarTaper } from './chunk-
|
|
2
|
-
import { resolveChartPalette, shade, DEFAULT_BAR_GAP_WIDTH } from './chunk-
|
|
1
|
+
import { widenPieViewModel, buildPerspCamera, createSvgEl, appendChartLegendSvg, renderChartLineSvg, renderChartTextSvg, perspBoxMatrix, pieRimPoint, perspScreenToPlaneY, resolvePieSliceShareValue, perspToScreen, roundDragValue, buildBarChart3DHoverTooltip, isChartInteractionArmed, computePieChartLayout, obliqueBarTaper } from './chunk-6FDEQ46Q.mjs';
|
|
2
|
+
import { resolveChartPalette, shade, DEFAULT_BAR_GAP_WIDTH } from './chunk-YFS2TFET.mjs';
|
|
3
3
|
import './chunk-G5NEBI7N.mjs';
|
|
4
4
|
import { buildChart3DBoxFaceColors } from 'ooxml-core/chart';
|
|
5
5
|
|
|
@@ -1027,6 +1027,7 @@ var chartFormatEn = {
|
|
|
1027
1027
|
"chartFormat.errorBars.minusValues": "Negative error value",
|
|
1028
1028
|
"chartFormat.errorBars.customHint": "Enter values such as 1, 2, 3 or a range such as Sheet1!$C$2:$C$4.",
|
|
1029
1029
|
"chartFormat.errorBars.customCachedHint": "Enter values such as 1, 2, 3, or a range of cells this chart already plots.",
|
|
1030
|
+
"chartFormat.errorBars.customValuesHint": "Enter values such as 1, 2, 3.",
|
|
1030
1031
|
"chartFormat.analysis.multipleErrorBars": "Ambiguous error bars are preserved and cannot be edited here.",
|
|
1031
1032
|
"chartFormat.axis.title": "Axis title",
|
|
1032
1033
|
"chartFormat.axis.baseTimeUnit": "Base unit",
|
|
@@ -1340,6 +1341,7 @@ var chartFormatDe = {
|
|
|
1340
1341
|
"chartFormat.errorBars.minusValues": "Negativer Fehlerwert",
|
|
1341
1342
|
"chartFormat.errorBars.customHint": "Geben Sie Werte wie 1, 2, 3 oder einen Bereich wie Sheet1!$C$2:$C$4 ein.",
|
|
1342
1343
|
"chartFormat.errorBars.customCachedHint": "Geben Sie Werte wie 1, 2, 3 ein oder einen Zellbereich, den dieses Diagramm bereits darstellt.",
|
|
1344
|
+
"chartFormat.errorBars.customValuesHint": "Geben Sie Werte wie 1, 2, 3 ein.",
|
|
1343
1345
|
"chartFormat.analysis.multipleErrorBars": "Mehrdeutige Fehlerindikatoren bleiben erhalten und k\xF6nnen hier nicht bearbeitet werden.",
|
|
1344
1346
|
"chartFormat.axis.title": "Achsentitel",
|
|
1345
1347
|
"chartFormat.axis.baseTimeUnit": "Basiseinheit",
|
|
@@ -1653,6 +1655,7 @@ var chartFormatEs = {
|
|
|
1653
1655
|
"chartFormat.errorBars.minusValues": "Valor de error negativo",
|
|
1654
1656
|
"chartFormat.errorBars.customHint": "Escriba valores como 1, 2, 3 o un rango como Sheet1!$C$2:$C$4.",
|
|
1655
1657
|
"chartFormat.errorBars.customCachedHint": "Escriba valores como 1, 2, 3 o un rango de celdas que este gr\xE1fico ya representa.",
|
|
1658
|
+
"chartFormat.errorBars.customValuesHint": "Escriba valores como 1, 2, 3.",
|
|
1656
1659
|
"chartFormat.analysis.multipleErrorBars": "Las barras de error ambiguas se conservan y no se pueden editar aqu\xED.",
|
|
1657
1660
|
"chartFormat.axis.title": "T\xEDtulo del eje",
|
|
1658
1661
|
"chartFormat.axis.baseTimeUnit": "Unidad base",
|
|
@@ -1966,6 +1969,7 @@ var chartFormatFr = {
|
|
|
1966
1969
|
"chartFormat.errorBars.minusValues": "Valeur d\u2019erreur n\xE9gative",
|
|
1967
1970
|
"chartFormat.errorBars.customHint": "Saisissez des valeurs comme 1, 2, 3 ou une plage comme Sheet1!$C$2:$C$4.",
|
|
1968
1971
|
"chartFormat.errorBars.customCachedHint": "Saisissez des valeurs comme 1, 2, 3 ou une plage de cellules que ce graphique repr\xE9sente d\xE9j\xE0.",
|
|
1972
|
+
"chartFormat.errorBars.customValuesHint": "Saisissez des valeurs comme 1, 2, 3.",
|
|
1969
1973
|
"chartFormat.analysis.multipleErrorBars": "Les barres d\u2019erreur ambigu\xEBs sont conserv\xE9es et ne peuvent pas \xEAtre modifi\xE9es ici.",
|
|
1970
1974
|
"chartFormat.axis.title": "Titre de l\u2019axe",
|
|
1971
1975
|
"chartFormat.axis.baseTimeUnit": "Unit\xE9 de base",
|
|
@@ -2279,6 +2283,7 @@ var chartFormatJa = {
|
|
|
2279
2283
|
"chartFormat.errorBars.minusValues": "\u8CA0\u306E\u8AA4\u5DEE\u306E\u5024",
|
|
2280
2284
|
"chartFormat.errorBars.customHint": "1, 2, 3 \u306E\u3088\u3046\u306A\u5024\u3001\u307E\u305F\u306F Sheet1!$C$2:$C$4 \u306E\u3088\u3046\u306A\u7BC4\u56F2\u3092\u5165\u529B\u3057\u307E\u3059\u3002",
|
|
2281
2285
|
"chartFormat.errorBars.customCachedHint": "1, 2, 3 \u306E\u3088\u3046\u306A\u5024\u3001\u307E\u305F\u306F\u3053\u306E\u30B0\u30E9\u30D5\u306B\u65E2\u306B\u8868\u793A\u3055\u308C\u3066\u3044\u308B\u30BB\u30EB\u7BC4\u56F2\u3092\u5165\u529B\u3057\u307E\u3059\u3002",
|
|
2286
|
+
"chartFormat.errorBars.customValuesHint": "1, 2, 3 \u306E\u3088\u3046\u306A\u5024\u3092\u5165\u529B\u3057\u307E\u3059\u3002",
|
|
2282
2287
|
"chartFormat.analysis.multipleErrorBars": "\u5224\u5225\u3067\u304D\u306A\u3044\u8AA4\u5DEE\u7BC4\u56F2\u306F\u4FDD\u6301\u3055\u308C\u307E\u3059\u304C\u3001\u3053\u3053\u3067\u306F\u7DE8\u96C6\u3067\u304D\u307E\u305B\u3093\u3002",
|
|
2283
2288
|
"chartFormat.axis.title": "\u8EF8\u30E9\u30D9\u30EB",
|
|
2284
2289
|
"chartFormat.axis.baseTimeUnit": "\u57FA\u672C\u5358\u4F4D",
|
|
@@ -2592,6 +2597,7 @@ var chartFormatKo = {
|
|
|
2592
2597
|
"chartFormat.errorBars.minusValues": "\uC74C\uC758 \uC624\uCC28 \uAC12",
|
|
2593
2598
|
"chartFormat.errorBars.customHint": "1, 2, 3 \uAC19\uC740 \uAC12 \uB610\uB294 Sheet1!$C$2:$C$4 \uAC19\uC740 \uBC94\uC704\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624.",
|
|
2594
2599
|
"chartFormat.errorBars.customCachedHint": "1, 2, 3 \uAC19\uC740 \uAC12 \uB610\uB294 \uC774 \uCC28\uD2B8\uC5D0 \uC774\uBBF8 \uD45C\uC2DC\uB41C \uC140 \uBC94\uC704\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624.",
|
|
2600
|
+
"chartFormat.errorBars.customValuesHint": "1, 2, 3 \uAC19\uC740 \uAC12\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624.",
|
|
2595
2601
|
"chartFormat.analysis.multipleErrorBars": "\uAD6C\uBD84\uD560 \uC218 \uC5C6\uB294 \uC624\uCC28 \uB9C9\uB300\uB294 \uC720\uC9C0\uB418\uC9C0\uB9CC \uC5EC\uAE30\uC5D0\uC11C \uD3B8\uC9D1\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
|
|
2596
2602
|
"chartFormat.axis.title": "\uCD95 \uC81C\uBAA9",
|
|
2597
2603
|
"chartFormat.axis.baseTimeUnit": "\uAE30\uBCF8 \uB2E8\uC704",
|
|
@@ -2905,6 +2911,7 @@ var chartFormatZhCN = {
|
|
|
2905
2911
|
"chartFormat.errorBars.minusValues": "\u8D1F\u9519\u8BEF\u503C",
|
|
2906
2912
|
"chartFormat.errorBars.customHint": "\u8F93\u5165 1, 2, 3 \u7B49\u503C\u6216 Sheet1!$C$2:$C$4 \u7B49\u533A\u57DF\u3002",
|
|
2907
2913
|
"chartFormat.errorBars.customCachedHint": "\u8F93\u5165 1, 2, 3 \u7B49\u503C\uFF0C\u6216\u6B64\u56FE\u8868\u5DF2\u7ED8\u5236\u7684\u5355\u5143\u683C\u533A\u57DF\u3002",
|
|
2914
|
+
"chartFormat.errorBars.customValuesHint": "\u8F93\u5165 1, 2, 3 \u7B49\u503C\u3002",
|
|
2908
2915
|
"chartFormat.analysis.multipleErrorBars": "\u6709\u6B67\u4E49\u7684\u8BEF\u5DEE\u7EBF\u5C06\u4FDD\u7559\uFF0C\u65E0\u6CD5\u5728\u6B64\u7F16\u8F91\u3002",
|
|
2909
2916
|
"chartFormat.axis.title": "\u5750\u6807\u8F74\u6807\u9898",
|
|
2910
2917
|
"chartFormat.axis.baseTimeUnit": "\u57FA\u672C\u5355\u4F4D",
|