diff --git a/gradle.properties b/gradle.properties index 7485de7a..1c6d8363 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.2.35 +platform_version=8.2.36 platform_plugin_version=8.2.10 platform_core_frontend_version=8.2.129 diff --git a/io.sc.platform.core.frontend/.npmrc b/io.sc.platform.core.frontend/.npmrc index ac3953c7..09e5dd69 100644 --- a/io.sc.platform.core.frontend/.npmrc +++ b/io.sc.platform.core.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npmmirror.com # 用户邮箱 email= diff --git a/io.sc.platform.core.frontend/package copy 1.json b/io.sc.platform.core.frontend/package copy 1.json new file mode 100644 index 00000000..1a268f70 --- /dev/null +++ b/io.sc.platform.core.frontend/package copy 1.json @@ -0,0 +1,152 @@ +{ + "name": "platform-core", + "version": "8.2.129", + "description": "前端核心包,用于快速构建前端的脚手架", + "//main": "库的主文件", + "main": "dist/platform-core.js", + "//files": "打包时需要包含的文件列表", + "files": [ + ".bin", + "dist/configure.js", + "dist/css", + "dist/favicon.svg", + "dist/fonts", + "dist/index.html", + "dist/login-bg.jpg", + "dist/logo.svg", + "dist/platform-core.js", + "dist/types", + "template-project/*.*", + "template-project/public", + "template-project/src" + ], + "//types": "类型申明主文件", + "types": "./dist/types/index.d.ts", + "private": false, + "keywords": [], + "author": "", + "license": "ISC", + "//bin": "可直接通过 npx 执行的命令", + "bin": { + "//platform": "npx platform", + "platform": "./.bin/platform.js" + }, + "scripts": { + "dev": "nodemon", + "serve": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack serve --config webpack.env.serve.cjs", + "build": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack --config webpack.env.build.cjs", + "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", + "lib": "node ./util.template-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.lib.cjs && tsc --project tsconfig.json --emitDeclarationOnly --noEmit false", + "check": "tsc --project tsconfig.json --emitDeclarationOnly --noEmit false", + "template": "node ./util.template-generator.cjs", + "clean": "platform clean dist ./node_modules ./pnpm-lock.yaml ./package-lock.json", + "sync": "platform sync" + }, + "engines": { + "node": ">=18", + "pnpm": ">=7" + }, + "publishConfig": { + "registry": "http://nexus.sc.io:8000/repository/npm-releases/", + "access": "public", + "no-git-checks": true + }, + "devDependencies": { + "@babel/core": "7.26.0", + "@babel/plugin-transform-class-properties": "7.25.9", + "@babel/plugin-transform-object-rest-spread": "7.25.9", + "@babel/preset-env": "7.26.0", + "@babel/preset-typescript": "7.26.0", + "@quasar/app-webpack": "4.0.7", + "@quasar/cli": "2.4.1", + "@types/mockjs": "1.0.10", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", + "@vue/babel-plugin-jsx": "1.2.5", + "@vue/compiler-sfc": "3.5.13", + "@vuepress/bundler-webpack": "2.0.0-rc.15", + "@vuepress/theme-default": "2.0.0-rc.49", + "@webpack-cli/serve": "3.0.1", + "autoprefixer": "10.4.20", + "babel-loader": "9.2.1", + "clean-webpack-plugin": "4.0.0", + "copy-webpack-plugin": "12.0.2", + "cross-env": "7.0.3", + "css-loader": "7.1.2", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", + "eslint-webpack-plugin": "4.2.0", + "html-webpack-plugin": "5.6.3", + "json5": "2.2.3", + "mini-css-extract-plugin": "2.9.2", + "nodemon": "3.1.9", + "postcss": "8.5.1", + "postcss-import": "16.1.0", + "postcss-loader": "8.1.1", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", + "typescript": "5.5.4", + "vue-loader": "17.4.2", + "vuepress": "2.0.0-rc.15", + "webpack": "5.97.1", + "webpack-bundle-analyzer": "4.10.2", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", + "webpack-merge": "6.0.1" + }, + "dependencies": { + "@codemirror/autocomplete": "6.18.6", + "@codemirror/commands": "6.8.1", + "@codemirror/lang-html": "6.4.9", + "@codemirror/lang-java": "6.0.1", + "@codemirror/lang-javascript": "6.2.3", + "@codemirror/lang-json": "6.0.1", + "@codemirror/lang-sql": "6.8.0", + "@codemirror/lang-xml": "6.1.0", + "@codemirror/language": "6.11.0", + "@codemirror/search": "6.5.10", + "@codemirror/state": "6.5.2", + "@codemirror/view": "6.36.5", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@quasar/quasar-ui-qmarkdown": "2.0.5", + "@univerjs/core": "0.10.5", + "@univerjs/design": "0.10.5", + "@univerjs/docs": "0.10.5", + "@univerjs/docs-ui": "0.10.5", + "@univerjs/engine-formula": "0.10.5", + "@univerjs/engine-render": "0.10.5", + "@univerjs/sheets": "0.10.5", + "@univerjs/sheets-formula": "0.10.5", + "@univerjs/sheets-formula-ui": "0.10.5", + "@univerjs/sheets-numfmt": "0.10.5", + "@univerjs/sheets-numfmt-ui": "0.10.5", + "@univerjs/sheets-ui": "0.10.5", + "@univerjs/ui": "0.10.5", + "@vueuse/core": "12.4.0", + "axios": "1.8.2", + "codemirror": "6.0.1", + "dayjs": "1.11.13", + "echarts": "5.6.0", + "exceljs": "4.4.0", + "file-saver": "2.0.5", + "luckyexcel": "1.0.1", + "mockjs": "1.1.0", + "pinia": "2.3.0", + "quasar": "2.17.6", + "sort-array": "5.0.0", + "svg-path-commander": "2.1.7", + "vue": "3.5.13", + "vue-dompurify-html": "5.2.0", + "vue-i18n": "11.0.1", + "vue-router": "4.5.0", + "xml-formatter": "3.6.3", + "node-sql-parser": "5.3.6" + } +} diff --git a/io.sc.platform.core.frontend/src/views/testcase/excel/Excel copy.vue b/io.sc.platform.core.frontend/src/views/testcase/excel/Excel copy.vue index d1b80251..6be7dc4b 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/excel/Excel copy.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/excel/Excel copy.vue @@ -8,6 +8,7 @@ // import '@univerjs/sheets-ui/lib/index.css'; // import '@univerjs/sheets-formula/lib/index.css'; +/* import { ref, onMounted } from 'vue'; import { eventBus } from '@/platform'; @@ -60,9 +61,6 @@ onMounted(() => { }, }); - /** - * 语言改变事件 - */ eventBus.on('onLocaleChanged', (locale) => { if (locale === 'en') { univer.setLocale(LocaleType.EN_US); @@ -89,4 +87,5 @@ onMounted(() => { univer.createUnit(UniverInstanceType.UNIVER_SHEET, {}); }); +*/ diff --git a/io.sc.platform.core.frontend/src/views/testcase/excel/Excel.vue b/io.sc.platform.core.frontend/src/views/testcase/excel/Excel.vue index 6e7bf304..aad20ec4 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/excel/Excel.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/excel/Excel.vue @@ -2,30 +2,61 @@
diff --git a/io.sc.platform.core.frontend/src/views/testcase/word/Word.vue b/io.sc.platform.core.frontend/src/views/testcase/word/Word.vue index ecaa2b98..4c7929e3 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/word/Word.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/word/Word.vue @@ -9,53 +9,4 @@
text-subtitle1
- + diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverExcelGenerator.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverExcelGenerator.java index be6efd91..d90d29f0 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverExcelGenerator.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverExcelGenerator.java @@ -1,8 +1,8 @@ package io.sc.platform.poi.generator; -import io.sc.platform.poi.univer.model.CellValueType; -import io.sc.platform.poi.univer.model.ICellData; -import io.sc.platform.poi.univer.model.IWorksheetData; +import io.sc.platform.poi.univerjs.model.CellValueType; +import io.sc.platform.poi.univerjs.model.ICellData; +import io.sc.platform.poi.univerjs.model.IWorksheetData; import io.sc.platform.util.TypeConvertor; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverTemplate.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverTemplate.java index 25bf131f..6269e1e3 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverTemplate.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/generator/UniverTemplate.java @@ -1,6 +1,6 @@ package io.sc.platform.poi.generator; -import io.sc.platform.poi.univer.model.IWorkbookData; +import io.sc.platform.poi.univerjs.model.IWorkbookData; public class UniverTemplate { private String outputFilePath; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/HorizontalAlign.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/HorizontalAlign.java deleted file mode 100644 index e331a9b2..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/HorizontalAlign.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.sc.platform.poi.univer.model; - -public enum HorizontalAlign { - UNSPECIFIED(0), // The horizontal alignment is not specified. Do not use this. - LEFT(1), // The text is explicitly aligned to the left of the cell. - CENTER(2), // The text is explicitly aligned to the center of the cell. - RIGHT(3), // The text is explicitly aligned to the right of the cell. - JUSTIFIED(4), // The paragraph is justified. - BOTH(5), // The paragraph is justified. - DISTRIBUTED(6); - - private int value; - - HorizontalAlign(int value){ - this.value =value; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocsBorder.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocsBorder.java deleted file mode 100644 index e147fbdd..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocsBorder.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.sc.platform.poi.univer.model; - -public class IDocsBorder { - private IColorStyle color; - private Integer width; - private DashStyleType dashStyle; - - public IColorStyle getColor() { - return color; - } - - public void setColor(IColorStyle color) { - this.color = color; - } - - public Integer getWidth() { - return width; - } - - public void setWidth(Integer width) { - this.width = width; - } - - public DashStyleType getDashStyle() { - return dashStyle; - } - - public void setDashStyle(DashStyleType dashStyle) { - this.dashStyle = dashStyle; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFreeze.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFreeze.java deleted file mode 100644 index 67029974..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFreeze.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.sc.platform.poi.univer.model; - -public class IFreeze { - private Integer xSplit; // count of fixed cols - private Integer ySplit; // count of fixed rows - private Integer startRow; // scrollable start row - private Integer startColumn; // scrollable start column - - public Integer getxSplit() { - return xSplit; - } - - public void setxSplit(Integer xSplit) { - this.xSplit = xSplit; - } - - public Integer getySplit() { - return ySplit; - } - - public void setySplit(Integer ySplit) { - this.ySplit = ySplit; - } - - public Integer getStartRow() { - return startRow; - } - - public void setStartRow(Integer startRow) { - this.startRow = startRow; - } - - public Integer getStartColumn() { - return startColumn; - } - - public void setStartColumn(Integer startColumn) { - this.startColumn = startColumn; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IPaddingData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IPaddingData.java deleted file mode 100644 index 0b803549..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IPaddingData.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.sc.platform.poi.univer.model; - -public class IPaddingData { - private Integer t; - private Integer r; - private Integer b; - private Integer l; - - public Integer getT() { - return t; - } - - public void setT(Integer t) { - this.t = t; - } - - public Integer getR() { - return r; - } - - public void setR(Integer r) { - this.r = r; - } - - public Integer getB() { - return b; - } - - public void setB(Integer b) { - this.b = b; - } - - public Integer getL() { - return l; - } - - public void setL(Integer l) { - this.l = l; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRange.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRange.java deleted file mode 100644 index fe2f3425..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRange.java +++ /dev/null @@ -1,112 +0,0 @@ -package io.sc.platform.poi.univer.model; - -public class IRange { - private RangeType rangeType; - private AbsoluteRefType startAbsoluteRefType; - private AbsoluteRefType endAbsoluteRefType; - - /** - * Id of the Workbook the range belongs to. - * When this field is not defined, it should be considered as the range in the currently activated worksheet. - */ - private String unitId; - /** - * Id of the Worksheet the range belongs to. - * When this field is not defined, it should be considered as the range in the currently activated worksheet. - */ - private String sheetId; - - /** - * The start row (inclusive) of the range - * startRow - */ - private int startRow; - /** - * The end row (exclusive) of the range - * endRow - */ - private int endRow; - - /** - * The start column (inclusive) of the range - * startColumn - */ - private int startColumn; - /** - * The end column (exclusive) of the range - * endColumn - */ - private int endColumn; - - public RangeType getRangeType() { - return rangeType; - } - - public void setRangeType(RangeType rangeType) { - this.rangeType = rangeType; - } - - public AbsoluteRefType getStartAbsoluteRefType() { - return startAbsoluteRefType; - } - - public void setStartAbsoluteRefType(AbsoluteRefType startAbsoluteRefType) { - this.startAbsoluteRefType = startAbsoluteRefType; - } - - public AbsoluteRefType getEndAbsoluteRefType() { - return endAbsoluteRefType; - } - - public void setEndAbsoluteRefType(AbsoluteRefType endAbsoluteRefType) { - this.endAbsoluteRefType = endAbsoluteRefType; - } - - public String getUnitId() { - return unitId; - } - - public void setUnitId(String unitId) { - this.unitId = unitId; - } - - public String getSheetId() { - return sheetId; - } - - public void setSheetId(String sheetId) { - this.sheetId = sheetId; - } - - public int getStartRow() { - return startRow; - } - - public void setStartRow(int startRow) { - this.startRow = startRow; - } - - public int getEndRow() { - return endRow; - } - - public void setEndRow(int endRow) { - this.endRow = endRow; - } - - public int getStartColumn() { - return startColumn; - } - - public void setStartColumn(int startColumn) { - this.startColumn = startColumn; - } - - public int getEndColumn() { - return endColumn; - } - - public void setEndColumn(int endColumn) { - this.endColumn = endColumn; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRangeLocation.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRangeLocation.java deleted file mode 100644 index a3cccf5e..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRangeLocation.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.sc.platform.poi.univer.model; - -public class IRangeLocation { - /** - * Id of the Workbook the range belongs to. - * When this field is not defined, it should be considered as the range in the currently activated worksheet. - */ - private String unitId; - /** - * Id of the Worksheet the range belongs to. - * When this field is not defined, it should be considered as the range in the currently activated worksheet. - */ - private String sheetId; - - public String getUnitId() { - return unitId; - } - - public void setUnitId(String unitId) { - this.unitId = unitId; - } - - public String getSheetId() { - return sheetId; - } - - public void setSheetId(String sheetId) { - this.sheetId = sheetId; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorkbookData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorkbookData.java deleted file mode 100644 index 44f3ac3b..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorkbookData.java +++ /dev/null @@ -1,78 +0,0 @@ -package io.sc.platform.poi.univer.model; - -import java.util.Map; - -public class IWorkbookData { - private String id; //Unique identifier of the Univer Sheets. - private String name; //Name of the Univer Sheets. - private String appVersion; //Version of the Univer model definition. - private LocaleType locale; //Locale of the document. - private Map styles; //Style references for the workbook. - private String[] sheetOrder; //Array of sheet IDs representing the order of worksheets. - private Map sheets; //Record containing data for each worksheet. - private IResource[] resources; //Store the data of plugins - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAppVersion() { - return appVersion; - } - - public void setAppVersion(String appVersion) { - this.appVersion = appVersion; - } - - public LocaleType getLocale() { - return locale; - } - - public void setLocale(LocaleType locale) { - this.locale = locale; - } - - public Map getStyles() { - return styles; - } - - public void setStyles(Map styles) { - this.styles = styles; - } - - public String[] getSheetOrder() { - return sheetOrder; - } - - public void setSheetOrder(String[] sheetOrder) { - this.sheetOrder = sheetOrder; - } - - public Map getSheets() { - return sheets; - } - - public void setSheets(Map sheets) { - this.sheets = sheets; - } - - public IResource[] getResources() { - return resources; - } - - public void setResources(IResource[] resources) { - this.resources = resources; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlign.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlign.java deleted file mode 100644 index 22361c0c..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlign.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.sc.platform.poi.univer.model; - -public enum VerticalAlign { - UNSPECIFIED(0), - TOP(1), // The text is explicitly aligned to the top of the cell. - MIDDLE(2), // The text is explicitly aligned to the middle of the cell. - BOTTOM(3); - - private int value; - - VerticalAlign(int value){ - this.value =value; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlignmentType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlignmentType.java deleted file mode 100644 index befe3bec..00000000 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/VerticalAlignmentType.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.sc.platform.poi.univer.model; - -public enum VerticalAlignmentType { - CONTENT_ALIGNMENT_UNSPECIFIED(0),// An unspecified content alignment. The content alignment is inherited from the parent if one exists. - BOTH(1), - TOP(2),// An alignment that aligns the content to the top of the content holder. Corresponds to ECMA-376 ST_TextAnchoringType 't'. - CENTER(3),// An alignment that aligns the content to the middle of the content holder. Corresponds to ECMA-376 ST_TextAnchoringType 'ctr'. - BOTTOM(4); - - private int value; - - VerticalAlignmentType(int value){ - this.value =value; - } -} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AbsoluteRefType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AbsoluteRefType.java similarity index 62% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AbsoluteRefType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AbsoluteRefType.java index 19550f3c..ba14ae7a 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AbsoluteRefType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AbsoluteRefType.java @@ -1,5 +1,11 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * none: A1 + * row: A$1 + * column: $A1 + * all: $A$1 + */ public enum AbsoluteRefType { NONE(0), ROW(1), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeH.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AlignTypeH.java similarity index 83% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeH.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AlignTypeH.java index a552810c..e23426c4 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeH.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AlignTypeH.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum AlignTypeH { CENTER(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeV.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AlignTypeV.java similarity index 81% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeV.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AlignTypeV.java index c497d193..99ab6c61 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/AlignTypeV.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/AlignTypeV.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum AlignTypeV { BOTTOM(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BaselineOffset.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BaselineOffset.java similarity index 80% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BaselineOffset.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BaselineOffset.java index 3b4e0fe3..8d89a92a 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BaselineOffset.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BaselineOffset.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum BaselineOffset { NORMAL(1), @@ -11,4 +11,3 @@ public enum BaselineOffset { this.value =value; } } - diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BlockType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BlockType.java similarity index 67% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BlockType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BlockType.java index a70f9f76..ad8ea5f4 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BlockType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BlockType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Type of block + */ public enum BlockType { DRAWING(0), CUSTOM(1); diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BorderStyleTypes.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BorderStyleTypes.java similarity index 82% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BorderStyleTypes.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BorderStyleTypes.java index 9a03cd6c..e31101fd 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BorderStyleTypes.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BorderStyleTypes.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Border style types enum + */ public enum BorderStyleTypes { NONE(0), THIN(1), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BulletAlignment.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BulletAlignment.java similarity index 87% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BulletAlignment.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BulletAlignment.java index 4c67402f..62c5afac 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/BulletAlignment.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/BulletAlignment.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * The types of alignment for a bullet. + */ public enum BulletAlignment { BULLET_ALIGNMENT_UNSPECIFIED(0),// The bullet alignment is unspecified. START(1),// The bullet is aligned to the start of the space allotted for rendering the bullet. Left-aligned for LTR text), right-aligned otherwise. diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CellValueType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CellValueType.java similarity index 71% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CellValueType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CellValueType.java index 1072767c..4a0ed683 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CellValueType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CellValueType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * General Boolean Enum + */ public enum CellValueType { STRING(1), NUMBER(2), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CharacterSpacingControlType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CharacterSpacingControlType.java similarity index 84% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CharacterSpacingControlType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CharacterSpacingControlType.java index 3cf4f56d..77fe82cd 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CharacterSpacingControlType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CharacterSpacingControlType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum CharacterSpacingControlType { compressPunctuation(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ColumnSeparatorType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ColumnSeparatorType.java similarity index 74% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ColumnSeparatorType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ColumnSeparatorType.java index 0515483d..f4a88927 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ColumnSeparatorType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ColumnSeparatorType.java @@ -1,10 +1,13 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * The style of column separators between columns. + */ public enum ColumnSeparatorType { COLUMN_SEPARATOR_STYLE_UNSPECIFIED(0),// An unspecified column separator style. NONE(1),// No column separator lines between columns. BETWEEN_EACH_COLUMN(2); - + private int value; ColumnSeparatorType(int value){ diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomDecorationType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CustomDecorationType.java similarity index 79% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomDecorationType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CustomDecorationType.java index 190e07b1..ed96902c 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomDecorationType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CustomDecorationType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum CustomDecorationType { COMMENT(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomRangeType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CustomRangeType.java similarity index 88% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomRangeType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CustomRangeType.java index 516ca8d5..8461ca63 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/CustomRangeType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/CustomRangeType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum CustomRangeType { HYPERLINK(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DashStyleType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DashStyleType.java similarity index 76% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DashStyleType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DashStyleType.java index edb51b14..6cf161a1 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DashStyleType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DashStyleType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * The kinds of dashes with which linear geometry can be rendered. + */ public enum DashStyleType { DASH_STYLE_UNSPECIFIED(0),// Unspecified dash style. SOLID(1),// Solid line. Corresponds to ECMA-376 ST_PresetLineDashVal value 'solid'. This is the default dash style. diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DocumentFlavor.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DocumentFlavor.java similarity index 79% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DocumentFlavor.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DocumentFlavor.java index 2ce018af..528f9077 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DocumentFlavor.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DocumentFlavor.java @@ -1,10 +1,10 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum DocumentFlavor { UNSPECIFIED(0), TRADITIONAL(1), MODERN(2); - + private int value; DocumentFlavor(int value){ diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DrawingType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DrawingType.java similarity index 84% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DrawingType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DrawingType.java index 4baca382..3d147a10 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/DrawingType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/DrawingType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Types of drawings, used to distinguish between images, shapes, charts, tables, SmartArt, videos, DrawingGroup, Unit, Dom, etc. + */ public enum DrawingType { /** * Unrecognized drawing type), requires user to determine diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/GridType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/GridType.java similarity index 80% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/GridType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/GridType.java index 542fe919..e2a258a9 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/GridType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/GridType.java @@ -1,11 +1,11 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum GridType { DEFAULT(0), LINES(1), LINES_AND_CHARS(2), SNAP_TO_CHARS(3); - + private int value; GridType(int value){ diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/HorizontalAlign.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/HorizontalAlign.java new file mode 100644 index 00000000..727aa850 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/HorizontalAlign.java @@ -0,0 +1,20 @@ +package io.sc.platform.poi.univerjs.model; + +/** + * An enum that specifies the horizontal alignment of text. + */ +public enum HorizontalAlign { + UNSPECIFIED(0),// The horizontal alignment is not specified. Do not use this. + LEFT(1),// The text is explicitly aligned to the left of the cell. + CENTER(2),// text is explicitly aligned to the center of the cell. + RIGHT(3),// The text is explicitly aligned to the right of the cell. + JUSTIFIED(4),// The paragraph is justified. + BOTH(5),// The paragraph is justified. + DISTRIBUTED(6); + + private int value; + + HorizontalAlign(int value){ + this.value =value; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IAbsoluteTransform.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IAbsoluteTransform.java new file mode 100644 index 00000000..adc9b598 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IAbsoluteTransform.java @@ -0,0 +1,63 @@ +package io.sc.platform.poi.univerjs.model; + +public class IAbsoluteTransform { + // extends from ISize + private Integer width; + private Integer height; + + // extends from IOffset + private Double left; + private Double top; + + // extends from IScale + private Double scaleX; + private Double scaleY; + + public Integer getWidth() { + return width; + } + + public void setWidth(Integer width) { + this.width = width; + } + + public Integer getHeight() { + return height; + } + + public void setHeight(Integer height) { + this.height = height; + } + + public Double getLeft() { + return left; + } + + public void setLeft(Double left) { + this.left = left; + } + + public Double getTop() { + return top; + } + + public void setTop(Double top) { + this.top = top; + } + + public Double getScaleX() { + return scaleX; + } + + public void setScaleX(Double scaleX) { + this.scaleX = scaleX; + } + + public Double getScaleY() { + return scaleY; + } + + public void setScaleY(Double scaleY) { + this.scaleY = scaleY; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBorderData.java similarity index 80% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBorderData.java index 39a672d6..d4228629 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBorderData.java @@ -1,6 +1,19 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Style properties of top, bottom, left and right border + * + * TLBR = 'tlbr', //START_TOP_LEFT_END_BOTTOM_RIGHT + * TLBC = 'tlbc', // START_TOP_LEFT_END_BOTTOM_CENTER + * TLMR = 'tlmr', // START_TOP_LEFT_END_MIDDLE_RIGHT + + * BLTR = 'bltr', // START_BOTTOM_LEFT_END_TOP_RIGHT + + * MLTR = 'mltr', // START_MIDDLE_LEFT_END_TOP_RIGHT + + * BCTR = 'bctr', // START_BOTTOM_CENTER_END_TOP_RIGHT + */ public class IBorderData { private IBorderStyleData t; private IBorderStyleData r; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderStyleData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBorderStyleData.java similarity index 81% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderStyleData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBorderStyleData.java index 4cb9b2f3..d8588baf 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBorderStyleData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBorderStyleData.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Style properties of border + */ public class IBorderStyleData { private BorderStyleTypes s; private IColorStyle cl; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBullet.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBullet.java similarity index 91% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBullet.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBullet.java index ca5ab572..64ab1e5c 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IBullet.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IBullet.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Properties of list + */ public class IBullet { private String listType; private String listId; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICellData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICellData.java similarity index 80% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICellData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICellData.java index ac8418a2..da21e7a9 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICellData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICellData.java @@ -1,18 +1,19 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import java.util.Map; +/** + * Cell data + */ public class ICellData { /** * The unique key, a random string, is used for the plug-in to associate the cell. When the cell information changes, * the plug-in does not need to change the data, reducing the pressure on the back-end interface id?: string. */ private IDocumentData p; - /** - * style id, IStyleData | String - */ - private Object s; + /** style id */ + private Object s;//(IStyleData | String) /** * Origin value, string | number | boolean */ @@ -22,6 +23,11 @@ public class ICellData { * Raw formula string. For example `=SUM(A1:B4)`. */ private String f; + /** + * If the formula is a formula array, this field is used to store the referencing range. + * @ignore + */ + private String ref; /** * Id of the formula. */ @@ -71,6 +77,14 @@ public class ICellData { this.f = f; } + public String getRef() { + return ref; + } + + public void setRef(String ref) { + this.ref = ref; + } + public String getSi() { return si; } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColorStyle.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColorStyle.java similarity index 81% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColorStyle.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColorStyle.java index 8c0e47c3..e4e1cb2c 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColorStyle.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColorStyle.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * RGB color or theme color + */ public class IColorStyle { private String rgb; private ThemeColorType th; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColumnData.java similarity index 95% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColumnData.java index 8fcfab82..c006278f 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColumnData.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnHeader.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColumnHeader.java similarity index 71% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnHeader.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColumnHeader.java index c4c43623..8fb02bca 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IColumnHeader.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IColumnHeader.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; @@ -6,7 +6,7 @@ public class IColumnHeader { private Integer height; @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean hidden; + private Boolean hidden; public Integer getHeight() { return height; @@ -16,11 +16,11 @@ public class IColumnHeader { this.height = height; } - public boolean isHidden() { + public Boolean getHidden() { return hidden; } - public void setHidden(boolean hidden) { + public void setHidden(Boolean hidden) { this.hidden = hidden; } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomBlock.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomBlock.java similarity index 90% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomBlock.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomBlock.java index 206f03fe..7d061a05 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomBlock.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomBlock.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Custom Block + */ public class ICustomBlock { private Integer startIndex; private BlockType blockType; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomDecoration.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomDecoration.java similarity index 94% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomDecoration.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomDecoration.java index 0af84ed1..c4565f8d 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomDecoration.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomDecoration.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class ICustomDecoration { private Integer startIndex; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomRange.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomRange.java similarity index 83% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomRange.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomRange.java index 949035b2..32bdbc47 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomRange.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomRange.java @@ -1,12 +1,15 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import java.util.Map; +/** + * Block element, link like, disabled to self nested + */ public class ICustomRange { private Integer startIndex; private Integer endIndex; private String rangeId; - private CustomRangeType rangeType; + private Object rangeType; //CustomRangeType | number /** * display as a whole-entity */ @@ -41,11 +44,11 @@ public class ICustomRange { this.rangeId = rangeId; } - public CustomRangeType getRangeType() { + public Object getRangeType() { return rangeType; } - public void setRangeType(CustomRangeType rangeType) { + public void setRangeType(Object rangeType) { this.rangeType = rangeType; } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomTable.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomTable.java similarity index 93% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomTable.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomTable.java index 49f40d49..0a592cf7 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ICustomTable.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ICustomTable.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class ICustomTable { private Integer startIndex; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDistFromText.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDistFromText.java similarity index 94% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDistFromText.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDistFromText.java index 78f7d45c..679587b7 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDistFromText.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDistFromText.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IDistFromText { private Integer distT; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingBase.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocDrawingBase.java similarity index 66% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingBase.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocDrawingBase.java index 26edd6b0..73a92e69 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingBase.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocDrawingBase.java @@ -1,7 +1,17 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; +/** + * Properties of Drawing + * 20.4.2.8 inline (Inline DrawingML Object) + * 20.4.2.15 wrapNone (No Text Wrapping) + * 20.4.2.16 wrapPolygon (Wrapping Polygon) + * 20.4.2.17 wrapSquare (Square Wrapping) + * 20.4.2.18 wrapThrough (Through Wrapping) + * 20.4.2.19 wrapTight (Tight Wrapping) + * 20.4.2.20 wrapTopAndBottom (Top and Bottom Wrapping) + */ public class IDocDrawingBase extends IDrawingParam { private String drawingId; private String title; @@ -11,20 +21,18 @@ public class IDocDrawingBase extends IDrawingParam { @JsonFormat(shape = JsonFormat.Shape.NUMBER) private boolean behindDoc; - private int[] start; - private int[][] lineTo; + private Integer[] start; + private Integer[][] lineTo; private WrapTextType wrapText; - private int distL; - private int distR; - private int distT; - private int distB; + private Integer distL; + private Integer distR; + private Integer distT; + private Integer distB; - @Override public String getDrawingId() { return drawingId; } - @Override public void setDrawingId(String drawingId) { this.drawingId = drawingId; } @@ -69,19 +77,19 @@ public class IDocDrawingBase extends IDrawingParam { this.behindDoc = behindDoc; } - public int[] getStart() { + public Integer[] getStart() { return start; } - public void setStart(int[] start) { + public void setStart(Integer[] start) { this.start = start; } - public int[][] getLineTo() { + public Integer[][] getLineTo() { return lineTo; } - public void setLineTo(int[][] lineTo) { + public void setLineTo(Integer[][] lineTo) { this.lineTo = lineTo; } @@ -93,35 +101,35 @@ public class IDocDrawingBase extends IDrawingParam { this.wrapText = wrapText; } - public int getDistL() { + public Integer getDistL() { return distL; } - public void setDistL(int distL) { + public void setDistL(Integer distL) { this.distL = distL; } - public int getDistR() { + public Integer getDistR() { return distR; } - public void setDistR(int distR) { + public void setDistR(Integer distR) { this.distR = distR; } - public int getDistT() { + public Integer getDistT() { return distT; } - public void setDistT(int distT) { + public void setDistT(Integer distT) { this.distT = distT; } - public int getDistB() { + public Integer getDistB() { return distB; } - public void setDistB(int distB) { + public void setDistB(Integer distB) { this.distB = distB; } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingPosition.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocDrawingPosition.java similarity index 90% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingPosition.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocDrawingPosition.java index a5fcc664..f8bf3b23 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocDrawingPosition.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocDrawingPosition.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Properties of a draw object + */ public class IDocDrawingPosition { private ISize size; private IObjectPositionH positionH; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocStyleBase.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocStyleBase.java new file mode 100644 index 00000000..13cb176c --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocStyleBase.java @@ -0,0 +1,70 @@ +package io.sc.platform.poi.univerjs.model; + +/** + * Basics properties of doc style + */ +public class IDocStyleBase extends IMargin { + private Integer pageNumberStart; + private ISize pageSize; + private PageOrientType pageOrient; + private DocumentFlavor documentFlavor; + private Integer marginHeader; + private Integer marginFooter; + private IDocumentRenderConfig renderConfig; + + public Integer getPageNumberStart() { + return pageNumberStart; + } + + public void setPageNumberStart(Integer pageNumberStart) { + this.pageNumberStart = pageNumberStart; + } + + public ISize getPageSize() { + return pageSize; + } + + public void setPageSize(ISize pageSize) { + this.pageSize = pageSize; + } + + public PageOrientType getPageOrient() { + return pageOrient; + } + + public void setPageOrient(PageOrientType pageOrient) { + this.pageOrient = pageOrient; + } + + public DocumentFlavor getDocumentFlavor() { + return documentFlavor; + } + + public void setDocumentFlavor(DocumentFlavor documentFlavor) { + this.documentFlavor = documentFlavor; + } + + public Integer getMarginHeader() { + return marginHeader; + } + + public void setMarginHeader(Integer marginHeader) { + this.marginHeader = marginHeader; + } + + public Integer getMarginFooter() { + return marginFooter; + } + + public void setMarginFooter(Integer marginFooter) { + this.marginFooter = marginFooter; + } + + public IDocumentRenderConfig getRenderConfig() { + return renderConfig; + } + + public void setRenderConfig(IDocumentRenderConfig renderConfig) { + this.renderConfig = renderConfig; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentBody.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentBody.java similarity index 75% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentBody.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentBody.java index fb100430..c32ba3f8 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentBody.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentBody.java @@ -1,7 +1,33 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import java.util.Map; +/** + * Properties of document body + * Contain three update types: range overlay, range mutual exclusion, and placeholder + * \v COLUMN_BREAK + * \f PAGE_BREAK + * \0 DOCS_END + * \t TAB + * + * Needs to be changed： + * \r PARAGRAPH + * \n SECTION_BREAK + * + * \b customBlock: Scenarios where customBlock, images, mentions, etc. do not participate in the document flow. + * + * Table + * \x1A table start + * \x1B table row start + * \x1C table cell start + * \x1D table cell end + * \x1E table row end + * \x1F table end + * + * Special ranges within the document flow:：hyperlinks，field，structured document tags， bookmark，comment + * \x1F customRange start + * \x1E customRange end + */ public class IDocumentBody { private String dataStream; private ITextRun[] textRuns; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentData.java similarity index 81% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentData.java index 98c93470..a447ba8c 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentData.java @@ -1,5 +1,10 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +import java.util.List; + +/** + * Properties of document + */ public class IDocumentData extends IReferenceSource { /** unit ID */ private String id; @@ -10,8 +15,8 @@ public class IDocumentData extends IReferenceSource { private IDocumentBody body; private IDocumentStyle documentStyle; private IDocumentSettings settings; - private IResource[] resources; - private boolean disabled; + private List resources; + private Boolean disabled; public String getId() { return id; @@ -69,19 +74,19 @@ public class IDocumentData extends IReferenceSource { this.settings = settings; } - public IResource[] getResources() { + public List getResources() { return resources; } - public void setResources(IResource[] resources) { + public void setResources(List resources) { this.resources = resources; } - public boolean isDisabled() { + public Boolean getDisabled() { return disabled; } - public void setDisabled(boolean disabled) { + public void setDisabled(Boolean disabled) { this.disabled = disabled; } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentLayout.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentLayout.java new file mode 100644 index 00000000..01239d19 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentLayout.java @@ -0,0 +1,81 @@ +package io.sc.platform.poi.univerjs.model; + +import com.fasterxml.jackson.annotation.JsonFormat; + +public class IDocumentLayout { + private Integer defaultTabStop; + private CharacterSpacingControlType characterSpacingControl; + private Integer paragraphLineGapDefault; + @JsonFormat(shape = JsonFormat.Shape.NUMBER) + private Boolean spaceWidthEastAsian; + @JsonFormat(shape = JsonFormat.Shape.NUMBER) + private Boolean autoHyphenation; + private Integer consecutiveHyphenLimit; + @JsonFormat(shape = JsonFormat.Shape.NUMBER) + private Boolean doNotHyphenateCaps; + private Integer hyphenationZone; + + public Integer getDefaultTabStop() { + return defaultTabStop; + } + + public void setDefaultTabStop(Integer defaultTabStop) { + this.defaultTabStop = defaultTabStop; + } + + public CharacterSpacingControlType getCharacterSpacingControl() { + return characterSpacingControl; + } + + public void setCharacterSpacingControl(CharacterSpacingControlType characterSpacingControl) { + this.characterSpacingControl = characterSpacingControl; + } + + public Integer getParagraphLineGapDefault() { + return paragraphLineGapDefault; + } + + public void setParagraphLineGapDefault(Integer paragraphLineGapDefault) { + this.paragraphLineGapDefault = paragraphLineGapDefault; + } + + public Boolean getSpaceWidthEastAsian() { + return spaceWidthEastAsian; + } + + public void setSpaceWidthEastAsian(Boolean spaceWidthEastAsian) { + this.spaceWidthEastAsian = spaceWidthEastAsian; + } + + public Boolean getAutoHyphenation() { + return autoHyphenation; + } + + public void setAutoHyphenation(Boolean autoHyphenation) { + this.autoHyphenation = autoHyphenation; + } + + public Integer getConsecutiveHyphenLimit() { + return consecutiveHyphenLimit; + } + + public void setConsecutiveHyphenLimit(Integer consecutiveHyphenLimit) { + this.consecutiveHyphenLimit = consecutiveHyphenLimit; + } + + public Boolean getDoNotHyphenateCaps() { + return doNotHyphenateCaps; + } + + public void setDoNotHyphenateCaps(Boolean doNotHyphenateCaps) { + this.doNotHyphenateCaps = doNotHyphenateCaps; + } + + public Integer getHyphenationZone() { + return hyphenationZone; + } + + public void setHyphenationZone(Integer hyphenationZone) { + this.hyphenationZone = hyphenationZone; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentRenderConfig.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentRenderConfig.java similarity index 75% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentRenderConfig.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentRenderConfig.java index fa9ba07b..081a7641 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentRenderConfig.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentRenderConfig.java @@ -1,7 +1,20 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; +/** + * the alignment mode is returned with respect to the offset of the sheet cell, + * because the document needs to render the layout for cells and + * support alignment across multiple cells (e.g., horizontal alignment of long text in overflow mode). + * The alignment mode of the document itself cannot meet this requirement, + * so an additional renderConfig needs to be added during the rendering of the document component. + * This means that there are two coexisting alignment modes. + * In certain cases, such as in an editor, conflicts may arise, + * requiring only one alignment mode to be retained. + * By removing the relevant configurations in renderConfig, + * the alignment mode of the sheet cell can be modified. + * The alternative alignment mode is applied to paragraphs within the document. + */ public class IDocumentRenderConfig { private VerticalAlign verticalAlign; private Integer centerAngle; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentSettings.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentSettings.java similarity index 84% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentSettings.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentSettings.java index 37c2e8da..641a217c 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentSettings.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentSettings.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IDocumentSettings { private Integer zoomRatio; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentStyle.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentStyle.java similarity index 54% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentStyle.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentStyle.java index 04115d12..441e95dd 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDocumentStyle.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDocumentStyle.java @@ -1,50 +1,34 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; -public class IDocumentStyle { +public class IDocumentStyle extends IDocStyleBase { private ITextStyle textStyle; - private Integer pageNumberStart; - private ISize pageSize; - private PageOrientType pageOrient; - private DocumentFlavor documentFlavor; - private Integer marginHeader; - private Integer marginFooter; - private IDocumentRenderConfig renderConfig; - - private Integer margIntegerop; - private Integer marginBottom; - private Integer marginRight; - private Integer marginLeft; - + // extends from IDocumentLayout private Integer defaultTabStop; private CharacterSpacingControlType characterSpacingControl; private Integer paragraphLineGapDefault; - @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean spaceWidthEastAsian; - + private Boolean spaceWidthEastAsian; @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean autoHyphenation; + private Boolean autoHyphenation; private Integer consecutiveHyphenLimit; - @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean doNotHyphenateCaps; + private Boolean doNotHyphenateCaps; private Integer hyphenationZone; + // extends from IHeaderAndFooterBase private String defaultHeaderId; private String defaultFooterId; private String evenPageHeaderId; private String evenPageFooterId; private String firstPageHeaderId; private String firstPageFooterId; - @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean useFirstPageHeaderFooter; - + private Boolean useFirstPageHeaderFooter; @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean evenAndOddHeaders; + private Boolean evenAndOddHeaders; public ITextStyle getTextStyle() { return textStyle; @@ -54,94 +38,6 @@ public class IDocumentStyle { this.textStyle = textStyle; } - public Integer getPageNumberStart() { - return pageNumberStart; - } - - public void setPageNumberStart(Integer pageNumberStart) { - this.pageNumberStart = pageNumberStart; - } - - public ISize getPageSize() { - return pageSize; - } - - public void setPageSize(ISize pageSize) { - this.pageSize = pageSize; - } - - public PageOrientType getPageOrient() { - return pageOrient; - } - - public void setPageOrient(PageOrientType pageOrient) { - this.pageOrient = pageOrient; - } - - public DocumentFlavor getDocumentFlavor() { - return documentFlavor; - } - - public void setDocumentFlavor(DocumentFlavor documentFlavor) { - this.documentFlavor = documentFlavor; - } - - public Integer getMarginHeader() { - return marginHeader; - } - - public void setMarginHeader(Integer marginHeader) { - this.marginHeader = marginHeader; - } - - public Integer getMarginFooter() { - return marginFooter; - } - - public void setMarginFooter(Integer marginFooter) { - this.marginFooter = marginFooter; - } - - public IDocumentRenderConfig getRenderConfig() { - return renderConfig; - } - - public void setRenderConfig(IDocumentRenderConfig renderConfig) { - this.renderConfig = renderConfig; - } - - public Integer getMargIntegerop() { - return margIntegerop; - } - - public void setMargIntegerop(Integer margIntegerop) { - this.margIntegerop = margIntegerop; - } - - public Integer getMarginBottom() { - return marginBottom; - } - - public void setMarginBottom(Integer marginBottom) { - this.marginBottom = marginBottom; - } - - public Integer getMarginRight() { - return marginRight; - } - - public void setMarginRight(Integer marginRight) { - this.marginRight = marginRight; - } - - public Integer getMarginLeft() { - return marginLeft; - } - - public void setMarginLeft(Integer marginLeft) { - this.marginLeft = marginLeft; - } - public Integer getDefaultTabStop() { return defaultTabStop; } @@ -166,19 +62,19 @@ public class IDocumentStyle { this.paragraphLineGapDefault = paragraphLineGapDefault; } - public boolean isSpaceWidthEastAsian() { + public Boolean getSpaceWidthEastAsian() { return spaceWidthEastAsian; } - public void setSpaceWidthEastAsian(boolean spaceWidthEastAsian) { + public void setSpaceWidthEastAsian(Boolean spaceWidthEastAsian) { this.spaceWidthEastAsian = spaceWidthEastAsian; } - public boolean isAutoHyphenation() { + public Boolean getAutoHyphenation() { return autoHyphenation; } - public void setAutoHyphenation(boolean autoHyphenation) { + public void setAutoHyphenation(Boolean autoHyphenation) { this.autoHyphenation = autoHyphenation; } @@ -190,11 +86,11 @@ public class IDocumentStyle { this.consecutiveHyphenLimit = consecutiveHyphenLimit; } - public boolean isDoNotHyphenateCaps() { + public Boolean getDoNotHyphenateCaps() { return doNotHyphenateCaps; } - public void setDoNotHyphenateCaps(boolean doNotHyphenateCaps) { + public void setDoNotHyphenateCaps(Boolean doNotHyphenateCaps) { this.doNotHyphenateCaps = doNotHyphenateCaps; } @@ -254,19 +150,19 @@ public class IDocumentStyle { this.firstPageFooterId = firstPageFooterId; } - public boolean isUseFirstPageHeaderFooter() { + public Boolean getUseFirstPageHeaderFooter() { return useFirstPageHeaderFooter; } - public void setUseFirstPageHeaderFooter(boolean useFirstPageHeaderFooter) { + public void setUseFirstPageHeaderFooter(Boolean useFirstPageHeaderFooter) { this.useFirstPageHeaderFooter = useFirstPageHeaderFooter; } - public boolean isEvenAndOddHeaders() { + public Boolean getEvenAndOddHeaders() { return evenAndOddHeaders; } - public void setEvenAndOddHeaders(boolean evenAndOddHeaders) { + public void setEvenAndOddHeaders(Boolean evenAndOddHeaders) { this.evenAndOddHeaders = evenAndOddHeaders; } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingParam.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingParam.java similarity index 81% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingParam.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingParam.java index 55181639..c688ac6d 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingParam.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingParam.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; @@ -10,6 +10,7 @@ public class IDrawingParam extends IDrawingSearch { @JsonFormat(shape = JsonFormat.Shape.NUMBER) private boolean isMultiTransform; private String groupId; + private Boolean allowTransform; public DrawingType getDrawingType() { return drawingType; @@ -50,4 +51,12 @@ public class IDrawingParam extends IDrawingSearch { public void setGroupId(String groupId) { this.groupId = groupId; } + + public Boolean getAllowTransform() { + return allowTransform; + } + + public void setAllowTransform(Boolean allowTransform) { + this.allowTransform = allowTransform; + } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSearch.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingSearch.java similarity index 85% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSearch.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingSearch.java index 92cc0e5d..2f10e248 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSearch.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingSearch.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IDrawingSearch extends IDrawingSpace { private String drawingId; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSpace.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingSpace.java similarity index 90% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSpace.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingSpace.java index cd4113f6..5da4005f 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IDrawingSpace.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IDrawingSpace.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IDrawingSpace { private String unitId; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFooterData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IFooterData.java similarity index 90% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFooterData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IFooterData.java index 2bd90f27..7a40226b 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IFooterData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IFooterData.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IFooterData { private String footerId; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IFreeze.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IFreeze.java new file mode 100644 index 00000000..3e523ce9 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IFreeze.java @@ -0,0 +1,52 @@ +package io.sc.platform.poi.univerjs.model; + +public class IFreeze { + /** + * count of fixed cols + */ + private int xSplit; + /** + * count of fixed rows + */ + private int ySplit; + /** + * scrollable start row(viewMain start row) + */ + private int startRow; + /** + * scrollable start column(viewMain start column) + */ + private int startColumn; + + public int getxSplit() { + return xSplit; + } + + public void setxSplit(int xSplit) { + this.xSplit = xSplit; + } + + public int getySplit() { + return ySplit; + } + + public void setySplit(int ySplit) { + this.ySplit = ySplit; + } + + public int getStartRow() { + return startRow; + } + + public void setStartRow(int startRow) { + this.startRow = startRow; + } + + public int getStartColumn() { + return startColumn; + } + + public void setStartColumn(int startColumn) { + this.startColumn = startColumn; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IHeaderAndFooterBase.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IHeaderAndFooterBase.java new file mode 100644 index 00000000..eae873fe --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IHeaderAndFooterBase.java @@ -0,0 +1,80 @@ +package io.sc.platform.poi.univerjs.model; + +import com.fasterxml.jackson.annotation.JsonFormat; + +public class IHeaderAndFooterBase { + private String defaultHeaderId; + private String defaultFooterId; + private String evenPageHeaderId; + private String evenPageFooterId; + private String firstPageHeaderId; + private String firstPageFooterId; + @JsonFormat(shape = JsonFormat.Shape.NUMBER) + private Boolean useFirstPageHeaderFooter; + @JsonFormat(shape = JsonFormat.Shape.NUMBER) + private Boolean evenAndOddHeaders; + + public String getDefaultHeaderId() { + return defaultHeaderId; + } + + public void setDefaultHeaderId(String defaultHeaderId) { + this.defaultHeaderId = defaultHeaderId; + } + + public String getDefaultFooterId() { + return defaultFooterId; + } + + public void setDefaultFooterId(String defaultFooterId) { + this.defaultFooterId = defaultFooterId; + } + + public String getEvenPageHeaderId() { + return evenPageHeaderId; + } + + public void setEvenPageHeaderId(String evenPageHeaderId) { + this.evenPageHeaderId = evenPageHeaderId; + } + + public String getEvenPageFooterId() { + return evenPageFooterId; + } + + public void setEvenPageFooterId(String evenPageFooterId) { + this.evenPageFooterId = evenPageFooterId; + } + + public String getFirstPageHeaderId() { + return firstPageHeaderId; + } + + public void setFirstPageHeaderId(String firstPageHeaderId) { + this.firstPageHeaderId = firstPageHeaderId; + } + + public String getFirstPageFooterId() { + return firstPageFooterId; + } + + public void setFirstPageFooterId(String firstPageFooterId) { + this.firstPageFooterId = firstPageFooterId; + } + + public Boolean getUseFirstPageHeaderFooter() { + return useFirstPageHeaderFooter; + } + + public void setUseFirstPageHeaderFooter(Boolean useFirstPageHeaderFooter) { + this.useFirstPageHeaderFooter = useFirstPageHeaderFooter; + } + + public Boolean getEvenAndOddHeaders() { + return evenAndOddHeaders; + } + + public void setEvenAndOddHeaders(Boolean evenAndOddHeaders) { + this.evenAndOddHeaders = evenAndOddHeaders; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IHeaderData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IHeaderData.java similarity index 90% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IHeaderData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IHeaderData.java index 03cfaf30..3ea5a398 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IHeaderData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IHeaderData.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IHeaderData { private String headerId; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IIndentStart.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IIndentStart.java similarity index 96% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IIndentStart.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IIndentStart.java index 379f2bbd..b46336da 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IIndentStart.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IIndentStart.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IIndentStart { private INumberUnit indentFirstLine; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IListData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IListData.java similarity index 72% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IListData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IListData.java index b402ee40..91874e7b 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IListData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IListData.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * The properties of a list which describe the look and feel of bullets belonging to paragraphs associated with a list. + */ public class IListData { private String listType; private INestingLevel[] nestingLevel; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IMargin.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IMargin.java new file mode 100644 index 00000000..f54ae325 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IMargin.java @@ -0,0 +1,40 @@ +package io.sc.platform.poi.univerjs.model; + +public class IMargin { + private Integer marginTop; + private Integer marginBottom; + private Integer marginRight; + private Integer marginLeft; + + public Integer getMarginTop() { + return marginTop; + } + + public void setMarginTop(Integer marginTop) { + this.marginTop = marginTop; + } + + public Integer getMarginBottom() { + return marginBottom; + } + + public void setMarginBottom(Integer marginBottom) { + this.marginBottom = marginBottom; + } + + public Integer getMarginRight() { + return marginRight; + } + + public void setMarginRight(Integer marginRight) { + this.marginRight = marginRight; + } + + public Integer getMarginLeft() { + return marginLeft; + } + + public void setMarginLeft(Integer marginLeft) { + this.marginLeft = marginLeft; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INestingLevel.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/INestingLevel.java similarity index 91% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INestingLevel.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/INestingLevel.java index e2cc13b7..b939d46c 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INestingLevel.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/INestingLevel.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Contains properties describing the look and feel of a list bullet at a given level of nesting. + */ public class INestingLevel { private IParagraphStyle paragraphProperties; private BulletAlignment bulletAlignment; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INumberUnit.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/INumberUnit.java similarity index 88% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INumberUnit.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/INumberUnit.java index fb314883..fc714228 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/INumberUnit.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/INumberUnit.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class INumberUnit { private Integer v; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionH.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IObjectPositionH.java similarity index 95% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionH.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IObjectPositionH.java index 20ff088f..8101ee4a 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionH.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IObjectPositionH.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IObjectPositionH { private ObjectRelativeFromH relativeFrom; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionV.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IObjectPositionV.java similarity index 95% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionV.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IObjectPositionV.java index 7a774d41..f6199502 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IObjectPositionV.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IObjectPositionV.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IObjectPositionV { private ObjectRelativeFromV relativeFrom; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IOffset.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IOffset.java new file mode 100644 index 00000000..52cf8b9a --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IOffset.java @@ -0,0 +1,22 @@ +package io.sc.platform.poi.univerjs.model; + +public class IOffset { + private Double left; + private Double top; + + public Double getLeft() { + return left; + } + + public void setLeft(Double left) { + this.left = left; + } + + public Double getTop() { + return top; + } + + public void setTop(Double top) { + this.top = top; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IPaddingData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IPaddingData.java new file mode 100644 index 00000000..f0e8ecb4 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IPaddingData.java @@ -0,0 +1,43 @@ +package io.sc.platform.poi.univerjs.model; + +/** + * Top,right,bottom,left padding + */ +public class IPaddingData { + private double t; + private double r; + private double b; + private double l; + + public double getT() { + return t; + } + + public void setT(double t) { + this.t = t; + } + + public double getR() { + return r; + } + + public void setR(double r) { + this.r = r; + } + + public double getB() { + return b; + } + + public void setB(double b) { + this.b = b; + } + + public double getL() { + return l; + } + + public void setL(double l) { + this.l = l; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraph.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraph.java similarity index 93% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraph.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraph.java index f8aff134..17d40372 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraph.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraph.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IParagraph { private Integer startIndex; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphBorder.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphBorder.java similarity index 66% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphBorder.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphBorder.java index 1255c299..0e9f7400 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphBorder.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphBorder.java @@ -1,6 +1,6 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; -public class IParagraphBorder extends IDocsBorder { +public class IParagraphBorder { private Integer padding; public Integer getPadding() { diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphProperties.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphProperties.java similarity index 99% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphProperties.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphProperties.java index 1d0a5da0..52c27d8c 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphProperties.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphProperties.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphStyle.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphStyle.java similarity index 58% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphStyle.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphStyle.java index b7cebfbe..a11326da 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IParagraphStyle.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IParagraphStyle.java @@ -1,6 +1,9 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; -public class IParagraphStyle extends IParagraphProperties { +/** + * Properties of paragraph style + */ +public class IParagraphStyle extends IParagraphProperties{ private ITextStyle textStyle; public ITextStyle getTextStyle() { diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRange.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRange.java new file mode 100644 index 00000000..cd4935dc --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRange.java @@ -0,0 +1,46 @@ +package io.sc.platform.poi.univerjs.model; + +/** + * Range data structure + * + * One of the range types, + * + * e.g., + * { + * startRow:0 , + * startColumn:0, + * endRow:1, + * endColumn:1, + * } + * + * means "A1:B2" + */ +public class IRange { + private RangeType rangeType; + private AbsoluteRefType startAbsoluteRefType; + private AbsoluteRefType endAbsoluteRefType; + + public RangeType getRangeType() { + return rangeType; + } + + public void setRangeType(RangeType rangeType) { + this.rangeType = rangeType; + } + + public AbsoluteRefType getStartAbsoluteRefType() { + return startAbsoluteRefType; + } + + public void setStartAbsoluteRefType(AbsoluteRefType startAbsoluteRefType) { + this.startAbsoluteRefType = startAbsoluteRefType; + } + + public AbsoluteRefType getEndAbsoluteRefType() { + return endAbsoluteRefType; + } + + public void setEndAbsoluteRefType(AbsoluteRefType endAbsoluteRefType) { + this.endAbsoluteRefType = endAbsoluteRefType; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IReferenceSource.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IReferenceSource.java similarity index 87% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IReferenceSource.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IReferenceSource.java index 7bfcb294..137437a8 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IReferenceSource.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IReferenceSource.java @@ -1,13 +1,14 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; + import java.util.Map; public class IReferenceSource { - private Map tableSource; + private Map tableSource; private Map footers; - private Map headers; - private Map lists; - private Map drawings; + private Map headers; + private Map lists; + private Map drawings; private String[] drawingsOrder; private String[] headerFooterDrawingsOrder; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IResource.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IResource.java similarity index 91% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IResource.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IResource.java index 397bb838..405fa6cd 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IResource.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IResource.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IResource { private String id; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRotationSkewFlipTransform.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRotationSkewFlipTransform.java new file mode 100644 index 00000000..fd94d067 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRotationSkewFlipTransform.java @@ -0,0 +1,50 @@ +package io.sc.platform.poi.univerjs.model; + +public class IRotationSkewFlipTransform { + private Double angle; + private Double skewX; + private Double skewY; + private Boolean flipX; + private Boolean flipY; + + public Double getAngle() { + return angle; + } + + public void setAngle(Double angle) { + this.angle = angle; + } + + public Double getSkewX() { + return skewX; + } + + public void setSkewX(Double skewX) { + this.skewX = skewX; + } + + public Double getSkewY() { + return skewY; + } + + public void setSkewY(Double skewY) { + this.skewY = skewY; + } + + public Boolean getFlipX() { + return flipX; + } + + public void setFlipX(Boolean flipX) { + this.flipX = flipX; + } + + public Boolean getFlipY() { + return flipY; + } + + public void setFlipY(Boolean flipY) { + this.flipY = flipY; + } +} + diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRowData.java similarity index 97% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRowData.java index aeb5542c..7d55a415 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRowData.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowHeader.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRowHeader.java similarity index 71% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowHeader.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRowHeader.java index c365ca90..d5d51248 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IRowHeader.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IRowHeader.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; @@ -6,7 +6,7 @@ public class IRowHeader { private Integer width; @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean hidden; + private Boolean hidden; public Integer getWidth() { return width; @@ -16,11 +16,11 @@ public class IRowHeader { this.width = width; } - public boolean isHidden() { + public Boolean getHidden() { return hidden; } - public void setHidden(boolean hidden) { + public void setHidden(Boolean hidden) { this.hidden = hidden; } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IScale.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IScale.java new file mode 100644 index 00000000..ae792c61 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IScale.java @@ -0,0 +1,22 @@ +package io.sc.platform.poi.univerjs.model; + +public class IScale { + private Double scaleX; + private Double scaleY; + + public Double getScaleX() { + return scaleX; + } + + public void setScaleX(Double scaleX) { + this.scaleX = scaleX; + } + + public Double getScaleY() { + return scaleY; + } + + public void setScaleY(Double scaleY) { + this.scaleY = scaleY; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionBreak.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionBreak.java similarity index 67% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionBreak.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionBreak.java index 64de3111..b9faa2b1 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionBreak.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionBreak.java @@ -1,15 +1,18 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; -public class ISectionBreak { +/** + * Properties of section break + */ +public class ISectionBreak extends ISectionBreakBase { private Integer startIndex; + // extends from IDocStyleBase private Integer marginTop; private Integer marginBottom; private Integer marginRight; private Integer marginLeft; - private Integer pageNumberStart; private ISize pageSize; private PageOrientType pageOrient; @@ -18,26 +21,15 @@ public class ISectionBreak { private Integer marginFooter; private IDocumentRenderConfig renderConfig; - private Integer charSpace; - private Integer linePitch; - private GridType gridType; - private ISectionColumnProperties[] columnProperties; - private ColumnSeparatorType columnSeparatorType; - private TextDirection contentDirection; - private SectionType sectionType; - private SectionType sectionTypeNext; - private TextDirectionType textDirection; - + // extends from IHeaderAndFooterBase private String defaultHeaderId; private String defaultFooterId; private String evenPageHeaderId; private String evenPageFooterId; private String firstPageHeaderId; private String firstPageFooterId; - @JsonFormat(shape = JsonFormat.Shape.NUMBER) private boolean useFirstPageHeaderFooter; - @JsonFormat(shape = JsonFormat.Shape.NUMBER) private boolean evenAndOddHeaders; @@ -137,78 +129,6 @@ public class ISectionBreak { this.renderConfig = renderConfig; } - public Integer getCharSpace() { - return charSpace; - } - - public void setCharSpace(Integer charSpace) { - this.charSpace = charSpace; - } - - public Integer getLinePitch() { - return linePitch; - } - - public void setLinePitch(Integer linePitch) { - this.linePitch = linePitch; - } - - public GridType getGridType() { - return gridType; - } - - public void setGridType(GridType gridType) { - this.gridType = gridType; - } - - public ISectionColumnProperties[] getColumnProperties() { - return columnProperties; - } - - public void setColumnProperties(ISectionColumnProperties[] columnProperties) { - this.columnProperties = columnProperties; - } - - public ColumnSeparatorType getColumnSeparatorType() { - return columnSeparatorType; - } - - public void setColumnSeparatorType(ColumnSeparatorType columnSeparatorType) { - this.columnSeparatorType = columnSeparatorType; - } - - public TextDirection getContentDirection() { - return contentDirection; - } - - public void setContentDirection(TextDirection contentDirection) { - this.contentDirection = contentDirection; - } - - public SectionType getSectionType() { - return sectionType; - } - - public void setSectionType(SectionType sectionType) { - this.sectionType = sectionType; - } - - public SectionType getSectionTypeNext() { - return sectionTypeNext; - } - - public void setSectionTypeNext(SectionType sectionTypeNext) { - this.sectionTypeNext = sectionTypeNext; - } - - public TextDirectionType getTextDirection() { - return textDirection; - } - - public void setTextDirection(TextDirectionType textDirection) { - this.textDirection = textDirection; - } - public String getDefaultHeaderId() { return defaultHeaderId; } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionBreakBase.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionBreakBase.java new file mode 100644 index 00000000..2b8298cd --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionBreakBase.java @@ -0,0 +1,85 @@ +package io.sc.platform.poi.univerjs.model; + +public class ISectionBreakBase { + private Integer charSpace; + private Integer linePitch; + private GridType gridType; + private ISectionColumnProperties[] columnProperties; + private ColumnSeparatorType columnSeparatorType; + private TextDirection contentDirection; + private SectionType sectionType; + private SectionType sectionTypeNext; + private TextDirectionType textDirection; + + public Integer getCharSpace() { + return charSpace; + } + + public void setCharSpace(Integer charSpace) { + this.charSpace = charSpace; + } + + public Integer getLinePitch() { + return linePitch; + } + + public void setLinePitch(Integer linePitch) { + this.linePitch = linePitch; + } + + public GridType getGridType() { + return gridType; + } + + public void setGridType(GridType gridType) { + this.gridType = gridType; + } + + public ISectionColumnProperties[] getColumnProperties() { + return columnProperties; + } + + public void setColumnProperties(ISectionColumnProperties[] columnProperties) { + this.columnProperties = columnProperties; + } + + public ColumnSeparatorType getColumnSeparatorType() { + return columnSeparatorType; + } + + public void setColumnSeparatorType(ColumnSeparatorType columnSeparatorType) { + this.columnSeparatorType = columnSeparatorType; + } + + public TextDirection getContentDirection() { + return contentDirection; + } + + public void setContentDirection(TextDirection contentDirection) { + this.contentDirection = contentDirection; + } + + public SectionType getSectionType() { + return sectionType; + } + + public void setSectionType(SectionType sectionType) { + this.sectionType = sectionType; + } + + public SectionType getSectionTypeNext() { + return sectionTypeNext; + } + + public void setSectionTypeNext(SectionType sectionTypeNext) { + this.sectionTypeNext = sectionTypeNext; + } + + public TextDirectionType getTextDirection() { + return textDirection; + } + + public void setTextDirection(TextDirectionType textDirection) { + this.textDirection = textDirection; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionColumnProperties.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionColumnProperties.java similarity index 83% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionColumnProperties.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionColumnProperties.java index 28c6a401..10b0f526 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISectionColumnProperties.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISectionColumnProperties.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Properties of section column + */ public class ISectionColumnProperties { private Integer width; private Integer paddingEnd; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IShading.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IShading.java similarity index 78% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IShading.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IShading.java index d12b920f..dbc4a1d9 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IShading.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IShading.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Properties of shading + */ public class IShading { private IColorStyle backgroundColor; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISize.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISize.java similarity index 89% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISize.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISize.java index 8b0e208d..7ce2301f 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ISize.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ISize.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class ISize { private Integer width; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleBase.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IStyleBase.java similarity index 71% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleBase.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IStyleBase.java index d65386b5..c1fa9fb8 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleBase.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IStyleBase.java @@ -1,25 +1,26 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; +/** + * Basics properties of cell style + */ public class IStyleBase { - private String ff; // fontFamily - private Integer fs; //fontSize pt - + private String ff;//fontFamily + private double pt;//fontSize @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean it; // italic - + private boolean it;//italic @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean bl; //bold - private ITextDecoration ul; //underline + private boolean bl;//bold + private ITextDecoration ul;//underline private ITextDecoration bbl;//bottomBorerLine - private ITextDecoration st; //strikethrough - private ITextDecoration ol; //overline - private IColorStyle bg; //background - private IBorderData bd; //border - private IColorStyle cl; //foreground - private BaselineOffset va; //Subscript 下标 /Superscript上标 Text - private String n; //Numfmt pattern + private ITextDecoration st;//strikethrough + private ITextDecoration ol;//overline + private IColorStyle bg;//background + private IBorderData bd;//border + private IColorStyle cl;//foreground + private BaselineOffset va;//(Subscript 下标 /Superscript上标 Text) + private String n;//Numfmt pattern public String getFf() { return ff; @@ -29,12 +30,12 @@ public class IStyleBase { this.ff = ff; } - public Integer getFs() { - return fs; + public double getPt() { + return pt; } - public void setFs(Integer fs) { - this.fs = fs; + public void setPt(double pt) { + this.pt = pt; } public boolean isIt() { diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IStyleData.java similarity index 66% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IStyleData.java index 0cf8d89c..3b434667 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IStyleData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IStyleData.java @@ -1,12 +1,15 @@ -package io.sc.platform.poi.univer.model; - -public class IStyleData { - private ITextRotation tr; //textRotation - private TextDirection td; //textDirection - private HorizontalAlign ht; //horizontalAlignment - private VerticalAlign vt; //verticalAlignment - private WrapStrategy tb; //wrapStrategy - private IPaddingData pd; //padding +package io.sc.platform.poi.univerjs.model; + +/** + * Properties of cell style + */ +public class IStyleData extends IStyleBase{ + private ITextRotation tr;//textRotation + private TextDirection td;//textDirection + private HorizontalAlign ht;//horizontalAlignment + private VerticalAlign vt;//verticalAlignment + private WrapStrategy tb;//wrapStrategy + private IPaddingData pd;//padding public ITextRotation getTr() { return tr; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITabStop.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITabStop.java similarity index 90% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITabStop.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITabStop.java index f07f52de..de9bff92 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITabStop.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITabStop.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class ITabStop { private Integer offset; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITable.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITable.java similarity index 97% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITable.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITable.java index 9c83f8d6..1933cf91 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITable.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITable.java @@ -1,7 +1,10 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; +/** + * Properties of table + */ public class ITable { private ITableRow[] tableRows; private ITableColumn[] tableColumns; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableAnchor.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableAnchor.java similarity index 91% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableAnchor.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableAnchor.java index aaed58c2..8c3f6492 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableAnchor.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableAnchor.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class ITableAnchor { private IObjectPositionH positionH; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCell.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCell.java similarity index 96% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCell.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCell.java index fe92555b..566e2a4b 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCell.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCell.java @@ -1,7 +1,10 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; +/** + * Properties of table cell + */ public class ITableCell { private ITableCellMargin margin; private Integer rowSpan; @@ -12,7 +15,6 @@ public class ITableCell { private ITableCellBorder borderTop; private ITableCellBorder borderBottom; private IWidthInTableSize size; - @JsonFormat(shape = JsonFormat.Shape.NUMBER) private boolean tcFitText; private VerticalAlignmentType vAlign; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellBorder.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCellBorder.java similarity index 88% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellBorder.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCellBorder.java index 15b37131..cf79b00d 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellBorder.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCellBorder.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Properties of cell border + */ public class ITableCellBorder { private IColorStyle color; private INumberUnit width; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellMargin.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCellMargin.java similarity index 94% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellMargin.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCellMargin.java index 4b9cf366..f347e33a 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableCellMargin.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableCellMargin.java @@ -1,4 +1,5 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; + public class ITableCellMargin { private INumberUnit start; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableColumn.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableColumn.java similarity index 83% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableColumn.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableColumn.java index 0d9bd154..e13aa355 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableColumn.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableColumn.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class ITableColumn { private IWidthInTableSize size; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRow.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableRow.java similarity index 93% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRow.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableRow.java index 0cc5346e..4cd51bc2 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRow.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableRow.java @@ -1,7 +1,10 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; +/** + * Properties of row of table + */ public class ITableRow { private ITableCell[] tableCells; private ITableRowSize trHeight; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRowSize.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableRowSize.java similarity index 89% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRowSize.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableRowSize.java index 2f40f262..e9dc3830 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITableRowSize.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITableRowSize.java @@ -1,4 +1,5 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; + public class ITableRowSize { private INumberUnit val; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextDecoration.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextDecoration.java similarity index 60% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextDecoration.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextDecoration.java index 69b89a36..8da23d16 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextDecoration.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextDecoration.java @@ -1,14 +1,32 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; +/** + * Properties of text decoration + */ public class ITextDecoration { + /** + * show + */ @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean s; // show + private boolean s; + + /** + * color is follow the font color. the default value is TRUE, it's also TRUE if it is undefined. the cl has no effect when `c` is TRUE. + */ @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean c; // color is follow the font color. the default value is TRUE, it's also TRUE if it is undefined. the cl has no effect when `c` is TRUE. - private IColorStyle cl; // color - private TextDecoration t; // lineType + private boolean c; + + /** + * color + */ + private IColorStyle cl; + + /** + * lineType + */ + private TextDecoration t; public boolean isS() { return s; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRotation.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextRotation.java similarity index 63% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRotation.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextRotation.java index 03f44e6d..09c4b910 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRotation.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextRotation.java @@ -1,17 +1,17 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; public class ITextRotation { - private Integer a; //angle + private double a;//angle @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean v; //vertical + private boolean v;//vertical - public Integer getA() { + public double getA() { return a; } - public void setA(Integer a) { + public void setA(double a) { this.a = a; } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRun.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextRun.java similarity index 82% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRun.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextRun.java index ff7ecf88..1029405e 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextRun.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextRun.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * A ParagraphElement that represents a run of text that all has the same styling. + */ public class ITextRun { private Integer st; private Integer ed; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextStyle.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextStyle.java similarity index 78% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextStyle.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextStyle.java index 776d4fc2..ec1048e0 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITextStyle.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITextStyle.java @@ -1,6 +1,9 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; -public class ITextStyle { +/** + * Properties of text style + */ +public class ITextStyle extends IStyleBase { private Integer sc; private Integer pos; private Integer sa; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITransformState.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITransformState.java similarity index 52% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITransformState.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITransformState.java index eb64d5d0..2823df75 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ITransformState.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ITransformState.java @@ -1,17 +1,12 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; -public class ITransformState { +public class ITransformState extends IRotationSkewFlipTransform{ private Integer width; private Integer height; private Integer left; private Integer top; private Integer scaleX; private Integer scaleY; - private Integer angle; - private Integer skewX; - private Integer skewY; - private boolean flipX; - private boolean flipY; public Integer getWidth() { return width; @@ -60,44 +55,4 @@ public class ITransformState { public void setScaleY(Integer scaleY) { this.scaleY = scaleY; } - - public Integer getAngle() { - return angle; - } - - public void setAngle(Integer angle) { - this.angle = angle; - } - - public Integer getSkewX() { - return skewX; - } - - public void setSkewX(Integer skewX) { - this.skewX = skewX; - } - - public Integer getSkewY() { - return skewY; - } - - public void setSkewY(Integer skewY) { - this.skewY = skewY; - } - - public boolean isFlipX() { - return flipX; - } - - public void setFlipX(boolean flipX) { - this.flipX = flipX; - } - - public boolean isFlipY() { - return flipY; - } - - public void setFlipY(boolean flipY) { - this.flipY = flipY; - } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWidthInTableSize.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWidthInTableSize.java similarity index 90% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWidthInTableSize.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWidthInTableSize.java index 72c5d56b..fad30946 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWidthInTableSize.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWidthInTableSize.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public class IWidthInTableSize { private TableSizeType type; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWorkbookData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWorkbookData.java new file mode 100644 index 00000000..245d0402 --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWorkbookData.java @@ -0,0 +1,109 @@ +package io.sc.platform.poi.univerjs.model; + +import java.util.List; +import java.util.Map; + +/** + * Snapshot of a workbook. + */ +public class IWorkbookData { + private String id;//Id of the Univer Sheet + private Integer rev;//Revision of this spreadsheet. Used in collaborated editing. Starts from one + private String name;//Name of the Univer Sheet + private String appVersion;//Version of Univer model definition + private LocaleType locale;//Locale of the document + private Map styles;//Style references + private String[] sheetOrder;//Ids of {@link IWorksheetData}s of this Univer Sheet in sequence order + private Map sheets;//Data of each {@link IWorksheetData} in this Univer Sheet + private Object defaultStyle;//(IStyleData | String)Default style id or style data of Workbook + private List resources;//Resources of the Univer Sheet. It is used to store the data of other plugins + private Map custom;//User stored custom fields + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getRev() { + return rev; + } + + public void setRev(Integer rev) { + this.rev = rev; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAppVersion() { + return appVersion; + } + + public void setAppVersion(String appVersion) { + this.appVersion = appVersion; + } + + public LocaleType getLocale() { + return locale; + } + + public void setLocale(LocaleType locale) { + this.locale = locale; + } + + public Map getStyles() { + return styles; + } + + public void setStyles(Map styles) { + this.styles = styles; + } + + public String[] getSheetOrder() { + return sheetOrder; + } + + public void setSheetOrder(String[] sheetOrder) { + this.sheetOrder = sheetOrder; + } + + public Map getSheets() { + return sheets; + } + + public void setSheets(Map sheets) { + this.sheets = sheets; + } + + public Object getDefaultStyle() { + return defaultStyle; + } + + public void setDefaultStyle(Object defaultStyle) { + this.defaultStyle = defaultStyle; + } + + public List getResources() { + return resources; + } + + public void setResources(List resources) { + this.resources = resources; + } + + public Map getCustom() { + return custom; + } + + public void setCustom(Map custom) { + this.custom = custom; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorksheetData.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWorksheetData.java similarity index 55% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorksheetData.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWorksheetData.java index 1126cc85..4fcf2a18 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/IWorksheetData.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/IWorksheetData.java @@ -1,30 +1,36 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Map; +/** + * Snapshot of a worksheet. + */ public class IWorksheetData { - private String id; // Unique identifier for the worksheet. - private String name; // Name of the worksheet. - private String tabColor; // Color of the worksheet tab. + private String id;//Id of the worksheet. This should be unique and immutable across the lifecycle of the worksheet + private String name;//Name of the sheet + private String tabColor;// @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean hidden; // Whether the sheet is hidden. Default: false. - private IFreeze freeze; // Freeze pane settings. - private Integer rowCount; // Total number of rows. - private Integer columnCount; // Total number of columns. - private Integer defaultColumnWidth; // Default width for columns, unit px. - private Integer defaultRowHeight; // Default height for rows, unit px. - private IRange[] mergeData; // Array of merged cell ranges. - private Map> cellData; // Matrix of cell contents. More details. - private Map rowData; // Array of row data objects. - private Map columnData; // Array of column data objects. - private IRowHeader rowHeader; // Row header configuration. - private IColumnHeader columnHeader; // Column header configuration. + private boolean hidden;//Determine whether the sheet is hidden. + private IFreeze freeze; + private int rowCount; + private int columnCount; + private double defaultColumnWidth; + private double defaultRowHeight; + private IRange[] mergeData;//All merged cells in this worksheet + private Map> cellData;//A matrix storing cell contents by row and column index + private Map rowData;//Array of row data objects + private Map columnData;// Array of column data objects + private Object defaultStyle;//(IStyleData | String)Default style id or style data of Worksheet + private IRowHeader rowHeader;// Row header configuration + private IColumnHeader columnHeader;// Column header configuration @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean showGridlines; // Whether gridlines are visible. + private boolean showGridlines;// Whether gridlines are visible + private String gridlinesColor;//Color of the gridlines @JsonFormat(shape = JsonFormat.Shape.NUMBER) - private boolean rightToLeft; // Whether the worksheet is in right-to-left mode. + private boolean rightToLeft; + private Map custom;//User stored custom fields public String getId() { return id; @@ -66,35 +72,35 @@ public class IWorksheetData { this.freeze = freeze; } - public Integer getRowCount() { + public int getRowCount() { return rowCount; } - public void setRowCount(Integer rowCount) { + public void setRowCount(int rowCount) { this.rowCount = rowCount; } - public Integer getColumnCount() { + public int getColumnCount() { return columnCount; } - public void setColumnCount(Integer columnCount) { + public void setColumnCount(int columnCount) { this.columnCount = columnCount; } - public Integer getDefaultColumnWidth() { + public double getDefaultColumnWidth() { return defaultColumnWidth; } - public void setDefaultColumnWidth(Integer defaultColumnWidth) { + public void setDefaultColumnWidth(double defaultColumnWidth) { this.defaultColumnWidth = defaultColumnWidth; } - public Integer getDefaultRowHeight() { + public double getDefaultRowHeight() { return defaultRowHeight; } - public void setDefaultRowHeight(Integer defaultRowHeight) { + public void setDefaultRowHeight(double defaultRowHeight) { this.defaultRowHeight = defaultRowHeight; } @@ -130,6 +136,14 @@ public class IWorksheetData { this.columnData = columnData; } + public Object getDefaultStyle() { + return defaultStyle; + } + + public void setDefaultStyle(Object defaultStyle) { + this.defaultStyle = defaultStyle; + } + public IRowHeader getRowHeader() { return rowHeader; } @@ -154,6 +168,14 @@ public class IWorksheetData { this.showGridlines = showGridlines; } + public String getGridlinesColor() { + return gridlinesColor; + } + + public void setGridlinesColor(String gridlinesColor) { + this.gridlinesColor = gridlinesColor; + } + public boolean isRightToLeft() { return rightToLeft; } @@ -161,4 +183,12 @@ public class IWorksheetData { public void setRightToLeft(boolean rightToLeft) { this.rightToLeft = rightToLeft; } + + public Map getCustom() { + return custom; + } + + public void setCustom(Map custom) { + this.custom = custom; + } } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ListGlyphType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ListGlyphType.java similarity index 95% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ListGlyphType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ListGlyphType.java index 79bb5d96..86791656 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ListGlyphType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ListGlyphType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * An enumeration of the supported glyph types. + */ public enum ListGlyphType { BULLET(0),// The glyph type is unspecified or unsupported. NONE(1),// An empty string. diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/LocaleType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/LocaleType.java similarity index 61% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/LocaleType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/LocaleType.java index f5d34345..24717241 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/LocaleType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/LocaleType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Built-in locales. + */ public enum LocaleType { EN_US("enUS"), FR_FR("frFR"), @@ -7,7 +10,10 @@ public enum LocaleType { RU_RU("ruRU"), ZH_TW("zhTW"), VI_VN("viVN"), - FA_IR("faIR"); + FA_IR("faIR"), + KO_KR("koKR"), + ES_ES("esES"), + CA_ES("caES"); private String value; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NamedStyleType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/NamedStyleType.java similarity index 63% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NamedStyleType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/NamedStyleType.java index 3a363a0d..3942a411 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NamedStyleType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/NamedStyleType.java @@ -1,16 +1,15 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum NamedStyleType { NAMED_STYLE_TYPE_UNSPECIFIED(0),// The type of named style is unspecified. NORMAL_TEXT(1),// Normal text. TITLE(2),// Title. SUBTITLE(3),// Subtitle. - HEADING_1(4),// Heading 1. + HEADING_1(4),// Heading 1. HEADING_2(5),// Heading 2. - HEADING_3(6),// Heading 3. - HEADING_4(7),// Heading 4. - HEADING_5(8),// Heading 5. - HEADING_6(9); + HEADING_3(6),// Heading 3. + HEADING_4(7),// Heading 4. + HEADING_5(8); private int value; diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NumberUnitType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/NumberUnitType.java similarity index 82% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NumberUnitType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/NumberUnitType.java index 50a17a4b..34485c1e 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/NumberUnitType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/NumberUnitType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum NumberUnitType { POINT(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromH.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ObjectRelativeFromH.java similarity index 86% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromH.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ObjectRelativeFromH.java index d2eca17e..5f09a0b2 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromH.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ObjectRelativeFromH.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum ObjectRelativeFromH { PAGE(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromV.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ObjectRelativeFromV.java similarity index 86% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromV.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ObjectRelativeFromV.java index ec94bfa3..c9f6758f 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ObjectRelativeFromV.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ObjectRelativeFromV.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum ObjectRelativeFromV { PAGE(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PageOrientType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/PageOrientType.java similarity index 54% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PageOrientType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/PageOrientType.java index 91800b07..58b10040 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PageOrientType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/PageOrientType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Paper orientation, whether it's portrait (vertical) or landscape (horizontal) + */ public enum PageOrientType { PORTRAIT(0), LANDSCAPE(1); diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PositionedObjectLayoutType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/PositionedObjectLayoutType.java similarity index 62% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PositionedObjectLayoutType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/PositionedObjectLayoutType.java index b6ba6387..0534250d 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/PositionedObjectLayoutType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/PositionedObjectLayoutType.java @@ -1,6 +1,9 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; -public enum PositionedObjectLayoutType {INLINE(0), +/** + * The possible layouts of a [PositionedObject] + */ +public enum PositionedObjectLayoutType { WRAP_NONE(1), WRAP_POLYGON(2), WRAP_SQUARE(3), @@ -13,5 +16,4 @@ public enum PositionedObjectLayoutType {INLINE(0), PositionedObjectLayoutType(int value){ this.value =value; } - } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/RangeType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/RangeType.java similarity index 79% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/RangeType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/RangeType.java index a1eadb92..7ed5fc1c 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/RangeType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/RangeType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum RangeType { NORMAL(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SectionType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/SectionType.java similarity index 73% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SectionType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/SectionType.java index 4cb6b30b..5192e125 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SectionType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/SectionType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Represents how the start of the current section is positioned relative to the previous section. + */ public enum SectionType { SECTION_TYPE_UNSPECIFIED(0),// The section type is unspecified. CONTINUOUS(1),// The section starts immediately after the last paragraph of the previous section. diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SpacingRule.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/SpacingRule.java similarity index 93% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SpacingRule.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/SpacingRule.java index 36d88339..beb973e5 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/SpacingRule.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/SpacingRule.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum SpacingRule { /** diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TabStopAlignment.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TabStopAlignment.java similarity index 81% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TabStopAlignment.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TabStopAlignment.java index 19931b17..91507fea 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TabStopAlignment.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TabStopAlignment.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * The alignment of the tab stop. + */ public enum TabStopAlignment { TAB_STOP_ALIGNMENT_UNSPECIFIED(0),// The tab stop alignment is unspecified. START(1),// The tab stop is aligned to the start of the line. This is the default. @@ -7,7 +10,7 @@ public enum TabStopAlignment { END(3); private int value; - + TabStopAlignment(int value){ this.value =value; } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableAlignmentType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableAlignmentType.java similarity index 79% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableAlignmentType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableAlignmentType.java index 4fa62ffb..2f0c2c31 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableAlignmentType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableAlignmentType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum TableAlignmentType { START(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableLayoutType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableLayoutType.java similarity index 78% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableLayoutType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableLayoutType.java index 1726fb5f..2a8766d2 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableLayoutType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableLayoutType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum TableLayoutType { AUTO_FIT(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableRowHeightRule.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableRowHeightRule.java similarity index 80% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableRowHeightRule.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableRowHeightRule.java index 8446f7ce..f1d6bbec 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableRowHeightRule.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableRowHeightRule.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum TableRowHeightRule { AUTO(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableSizeType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableSizeType.java similarity index 78% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableSizeType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableSizeType.java index 31c1da61..c339c100 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableSizeType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableSizeType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum TableSizeType { UNSPECIFIED(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableTextWrapType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableTextWrapType.java similarity index 78% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableTextWrapType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableTextWrapType.java index 69982317..00599b4f 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TableTextWrapType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TableTextWrapType.java @@ -1,4 +1,4 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; public enum TableTextWrapType { NONE(0), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDecoration.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDecoration.java similarity index 85% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDecoration.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDecoration.java index db952646..6e054aee 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDecoration.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDecoration.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Types of text decoration + */ public enum TextDecoration { DASH(0), DASH_DOT_DOT_HEAVY(1), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirection.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDirection.java similarity index 63% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirection.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDirection.java index a1b1b211..863f5964 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirection.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDirection.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * An enum that specifies the text direction of a cell. + */ public enum TextDirection { UNSPECIFIED(0), LEFT_TO_RIGHT(1), diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirectionType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDirectionType.java similarity index 72% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirectionType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDirectionType.java index f0a31b3e..c7eb641e 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/TextDirectionType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/TextDirectionType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Direction of text + */ public enum TextDirectionType { NORMAL(0),// Horizontal TBRL(1),// Vertical @@ -10,5 +13,4 @@ public enum TextDirectionType { TextDirectionType(int value){ this.value =value; } - } diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ThemeColorType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ThemeColorType.java similarity index 81% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ThemeColorType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ThemeColorType.java index 0df86802..170eb27b 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/ThemeColorType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/ThemeColorType.java @@ -1,5 +1,10 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Theme color type enum + * + * @deprecated + */ public enum ThemeColorType { /** * TEXT diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/VerticalAlign.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/VerticalAlign.java new file mode 100644 index 00000000..aed19dde --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/VerticalAlign.java @@ -0,0 +1,17 @@ +package io.sc.platform.poi.univerjs.model; + +/** + * An enum that specifies the vertical alignment of text. + */ +public enum VerticalAlign { + UNSPECIFIED(0), + TOP(1),// The text is explicitly aligned to the top of the cell. + MIDDLE(2),// The text is explicitly aligned to the middle of the cell. + BOTTOM(3); + + private int value; + + VerticalAlign(int value){ + this.value =value; + } +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/VerticalAlignmentType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/VerticalAlignmentType.java new file mode 100644 index 00000000..937e129d --- /dev/null +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/VerticalAlignmentType.java @@ -0,0 +1,4 @@ +package io.sc.platform.poi.univerjs.model; + +public enum VerticalAlignmentType { +} diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapStrategy.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/WrapStrategy.java similarity index 71% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapStrategy.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/WrapStrategy.java index c5c6784a..d34e91b3 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapStrategy.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/WrapStrategy.java @@ -1,9 +1,12 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * An enumeration of the strategies used to handle cell text wrapping. + */ public enum WrapStrategy { UNSPECIFIED(0), /** - * Lines that are longer than the cell width will be written in the next cell over, so long as that cell is empty. If the next cell over is non-empty, this behaves the same as CLIP . The text will never wrap to the next line unless the user manually inserts a new line. Example: + * Lines that are longer than the cell width will be written in the next cell over), so long as that cell is empty. If the next cell over is non-empty), this behaves the same as CLIP . The text will never wrap to the next line unless the user manually inserts a new line. Example: * | First sentence. | * | Manual newline that is very long. <- Text continues into next cell * | Next newline. | diff --git a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapTextType.java b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/WrapTextType.java similarity index 71% rename from io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapTextType.java rename to io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/WrapTextType.java index 90c9469c..f00dda47 100644 --- a/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univer/model/WrapTextType.java +++ b/io.sc.platform.poi/src/main/java/io/sc/platform/poi/univerjs/model/WrapTextType.java @@ -1,5 +1,8 @@ -package io.sc.platform.poi.univer.model; +package io.sc.platform.poi.univerjs.model; +/** + * Types of wrap text + */ public enum WrapTextType { BOTH_SIDES(0), LEFT(1), diff --git a/io.sc.platform.poi/src/test/java/WordTest.java b/io.sc.platform.poi/src/test/java/WordTest.java index 77cc493d..0ac2b06a 100644 --- a/io.sc.platform.poi/src/test/java/WordTest.java +++ b/io.sc.platform.poi/src/test/java/WordTest.java @@ -1,4 +1,7 @@ import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.data.TextRenderData; +import com.deepoove.poi.data.Texts; +import com.deepoove.poi.data.style.Style; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -10,7 +13,7 @@ import java.util.Map; public class WordTest { public static void main(String[] args) throws IOException { Map context =new HashMap<>(); - context.put("title", "Hi, poi-tl Word模板引擎"); + context.put("title", Texts.of("Hello world").create()); context.put("date", new Date()); XWPFTemplate template = XWPFTemplate.compile("/Users/wangshaoping/Desktop/test/template.docx").render(context);