diff --git a/.env.base b/.env.base index fdb26d850..ad0d53135 100644 --- a/.env.base +++ b/.env.base @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://192.168.2.132:48080' # 上传路径 VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' diff --git a/package.json b/package.json index 7a00c122e..9ba0e2148 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,23 @@ "@element-plus/icons-vue": "^2.1.0", "@form-create/designer": "^3.1.0", "@form-create/element-ui": "^3.1.17", + "@grapecity/spread-excelio": "^16.1.0", + "@grapecity/spread-sheets": "^16.1.0", + "@grapecity/spread-sheets-barcode": "^16.1.0", + "@grapecity/spread-sheets-charts": "^16.1.0", + "@grapecity/spread-sheets-designer": "^16.1.0", + "@grapecity/spread-sheets-designer-resources-cn": "^16.1.0", + "@grapecity/spread-sheets-designer-vue": "^16.1.0", + "@grapecity/spread-sheets-io": "^16.1.0", + "@grapecity/spread-sheets-languagepackages": "^16.1.0", + "@grapecity/spread-sheets-pdf": "^16.1.0", + "@grapecity/spread-sheets-pivot-addon": "^16.1.0", + "@grapecity/spread-sheets-print": "^16.1.0", + "@grapecity/spread-sheets-resources-zh": "^16.1.0", + "@grapecity/spread-sheets-shapes": "^16.1.0", + "@grapecity/spread-sheets-slicers": "^16.1.0", + "@grapecity/spread-sheets-tablesheet": "^16.1.0", + "@grapecity/spread-sheets-vue": "^16.1.0", "@iconify/iconify": "^3.1.0", "@videojs-player/vue": "^1.0.0", "@vueuse/core": "^10.1.0", diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue index 5c43e52d0..88f727fbf 100644 --- a/src/layout/Layout.vue +++ b/src/layout/Layout.vue @@ -38,6 +38,9 @@ const renderLayout = () => { case 'cutMenu': const { renderCutMenu } = useRenderLayout() return renderCutMenu() + case 'desgin': + const { renderDesign } = useRenderLayout() + return renderDesign() default: break } diff --git a/src/layout/components/Setting/src/components/LayoutRadioPicker.vue b/src/layout/components/Setting/src/components/LayoutRadioPicker.vue index b500683a5..bd055a39e 100644 --- a/src/layout/components/Setting/src/components/LayoutRadioPicker.vue +++ b/src/layout/components/Setting/src/components/LayoutRadioPicker.vue @@ -55,6 +55,18 @@ const layout = computed(() => appStore.getLayout) >
+
+
+
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx index ab42e43f4..2cfd434ac 100644 --- a/src/layout/components/useRenderLayout.tsx +++ b/src/layout/components/useRenderLayout.tsx @@ -268,11 +268,23 @@ export const useRenderLayout = () => { ) } - + const renderDesign = () => { + return ( + <> +
+ {logo.value ? : undefined} +
+
+ 243 +
+ + ) + } return { renderClassic, renderTopLeft, renderTop, - renderCutMenu + renderCutMenu, + renderDesign } } diff --git a/src/types/layout.d.ts b/src/types/layout.d.ts index cad3e2af0..60316fbd3 100644 --- a/src/types/layout.d.ts +++ b/src/types/layout.d.ts @@ -1 +1 @@ -export type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu' +export type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu' | 'desgin' diff --git a/src/views/spread/excel/index.vue b/src/views/spread/excel/index.vue new file mode 100644 index 000000000..09d63e8bf --- /dev/null +++ b/src/views/spread/excel/index.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/src/views/spread/excel/index1.vue b/src/views/spread/excel/index1.vue new file mode 100644 index 000000000..2bf4c6c98 --- /dev/null +++ b/src/views/spread/excel/index1.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/views/spread/excel/index2.vue b/src/views/spread/excel/index2.vue new file mode 100644 index 000000000..a13b6066e --- /dev/null +++ b/src/views/spread/excel/index2.vue @@ -0,0 +1,42 @@ + + + + +