diff --git a/package-lock.json b/package-lock.json index 2d208776..c0ba46db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9436,8 +9436,8 @@ }, "jszip": { "version": "3.7.1", - "resolved": "https://registry.nlark.com/jszip/download/jszip-3.7.1.tgz", - "integrity": "sha1-vWNAEiHBViWhIoxVbKimjab9o9k=", + "resolved": "https://registry.npmmirror.com/jszip/download/jszip-3.7.1.tgz", + "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", "requires": { "lie": "~3.3.0", "pako": "~1.0.2", @@ -12520,9 +12520,9 @@ "dev": true }, "pptxgenjs": { - "version": "3.8.0", - "resolved": "https://registry.npmmirror.com/pptxgenjs/download/pptxgenjs-3.8.0.tgz", - "integrity": "sha1-L9jkU0anmNNjypdv3erzhgcGKDg=", + "version": "3.9.0", + "resolved": "https://registry.npmmirror.com/pptxgenjs/download/pptxgenjs-3.9.0.tgz", + "integrity": "sha512-ar1Qrj+FtjcgUDtPX2gPaihLn1CPLnmuun7PRxxnYXbd1XDYofRhtXya68KWGSocw3o2+nOiF+aMeDqiYy3SHA==", "requires": { "@types/node": "^16.10.1", "https": "^1.0.0", @@ -15775,14 +15775,6 @@ "sortablejs": "1.14.0" } }, - "vuex": { - "version": "4.0.2", - "resolved": "https://registry.nlark.com/vuex/download/vuex-4.0.2.tgz", - "integrity": "sha1-+Jbb1b8qDpY/AMZ+m2EN50nMrMk=", - "requires": { - "@vue/devtools-api": "^6.0.0-beta.11" - } - }, "w3c-keyname": { "version": "2.2.4", "resolved": "https://registry.npm.taobao.org/w3c-keyname/download/w3c-keyname-2.2.4.tgz", diff --git a/package.json b/package.json index 8e9dc5c5..4b78ea4b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "lodash": "^4.17.20", "mitt": "^3.0.0", "pinia": "^2.0.4", - "pptxgenjs": "^3.7.1", + "pptxgenjs": "^3.9.0", "prosemirror-commands": "^1.1.7", "prosemirror-dropcursor": "^1.3.2", "prosemirror-gapcursor": "^1.1.5", diff --git a/src/hooks/useExport.ts b/src/hooks/useExport.ts index 36bcd015..62af4b7e 100644 --- a/src/hooks/useExport.ts +++ b/src/hooks/useExport.ts @@ -512,6 +512,7 @@ export default () => { h: el.height / 100, colW: el.colWidths.map(item => el.width * item / 100), } + if (el.theme) options.fill = { color: '#ffffff' } if (el.outline.width && el.outline.color) { options.border = { type: el.outline.style === 'solid' ? 'solid' : 'dash', diff --git a/src/views/Editor/Toolbar/ElementStylePanel/TableStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/TableStylePanel.vue index a2a871f5..e1440080 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/TableStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/TableStylePanel.vue @@ -194,8 +194,6 @@ import { createRandomCode } from '@/utils/common' import { WEB_FONTS } from '@/configs/font' import useHistorySnapshot from '@/hooks/useHistorySnapshot' -import { message } from 'ant-design-vue' - import ElementOutline from '../common/ElementOutline.vue' import ColorButton from '../common/ColorButton.vue' diff --git a/src/views/components/element/TableElement/EditableTable.vue b/src/views/components/element/TableElement/EditableTable.vue index 158d731f..3e355676 100644 --- a/src/views/components/element/TableElement/EditableTable.vue +++ b/src/views/components/element/TableElement/EditableTable.vue @@ -709,13 +709,14 @@ table { border: 0; word-wrap: break-word; user-select: none; - background-color: #fff; --themeColor: $themeColor; --subThemeColor1: $themeColor; --subThemeColor2: $themeColor; &.theme { + background-color: #fff; + tr:nth-child(2n) .cell { background-color: var(--subThemeColor1); } diff --git a/src/views/components/element/TableElement/StaticTable.vue b/src/views/components/element/TableElement/StaticTable.vue index 2211632d..f8f088ff 100644 --- a/src/views/components/element/TableElement/StaticTable.vue +++ b/src/views/components/element/TableElement/StaticTable.vue @@ -120,13 +120,14 @@ table { border: 0; word-wrap: break-word; user-select: none; - background-color: #fff; --themeColor: $themeColor; --subThemeColor1: $themeColor; --subThemeColor2: $themeColor; &.theme { + background-color: #fff; + tr:nth-child(2n) .cell { background-color: var(--subThemeColor1); }