From 951754f887630d912390a6a97302d243af04af30 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Mon, 21 Oct 2024 14:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/main.ts | 69 ++++++++--------
frontend/src/styles/element.scss | 30 ++++---
frontend/src/utils/elementBind.ts | 2 +-
.../src/views/demo/proTable/doubleColumn.vue | 80 +++++++++++++++++++
frontend/src/views/demo/proTable/index.vue | 12 ++-
.../src/views/demo/proTable/singleColumn.vue | 80 +++++++++++++++++++
6 files changed, 227 insertions(+), 46 deletions(-)
create mode 100644 frontend/src/views/demo/proTable/doubleColumn.vue
create mode 100644 frontend/src/views/demo/proTable/singleColumn.vue
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index e369960..7095235 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -1,69 +1,70 @@
-import { createApp } from "vue";
-import App from "./App.vue";
+import { createApp } from 'vue'
+import App from './App.vue'
// reset style sheet
-import "@/styles/reset.scss";
+import '@/styles/reset.scss'
// CSS common style sheet
-import "@/styles/common.scss";
+import '@/styles/common.scss'
// iconfont css
-import "@/assets/iconfont/iconfont.scss";
+import '@/assets/iconfont/iconfont.scss'
// font css
-import "@/assets/fonts/font.scss";
+import '@/assets/fonts/font.scss'
// element css
-import "element-plus/dist/index.css";
+import 'element-plus/dist/index.css'
// element dark css
-import "element-plus/theme-chalk/dark/css-vars.css";
+import 'element-plus/theme-chalk/dark/css-vars.css'
// custom element dark css
-import "@/styles/element-dark.scss";
+import '@/styles/element-dark.scss'
// custom element css
-import "@/styles/element.scss";
+import '@/styles/element.scss'
// svg icons
-import "virtual:svg-icons-register";
+import 'virtual:svg-icons-register'
// element plus
-import ElementPlus from "element-plus";
+import ElementPlus from 'element-plus'
// element icons
-import * as Icons from "@element-plus/icons-vue";
+import * as Icons from '@element-plus/icons-vue'
// custom directives
-import directives from "@/directives/index";
+import directives from '@/directives/index'
// vue Router
-import router from "@/routers";
+import router from '@/routers'
// vue i18n
-import I18n from "@/languages/index";
+import I18n from '@/languages/index'
// pinia store
-import pinia from "@/stores";
+import pinia from '@/stores'
// errorHandler
-import errorHandler from "@/utils/errorHandler";
+import errorHandler from '@/utils/errorHandler'
import registerGlobComp from '@/components'
-const app = createApp(App);
+const app = createApp(App)
// 自定义警告处理程序，忽略所有警告
-if (import.meta.env.VUE_APP_SILENCE_WARNINGS === true) {
- app.config.warnHandler = () => {};
+app.config.warnHandler = () => {
}
+// if (import.meta.env.VUE_APP_SILENCE_WARNINGS === true) {
+// }
-app.config.errorHandler = errorHandler;
+app.config.errorHandler = errorHandler
// register the element Icons component
Object.keys(Icons).forEach(key => {
- app.component(key, Icons[key as keyof typeof Icons]);
-});
+ app.component(key, Icons[key as keyof typeof Icons])
+})
const setupAll = async () => {
- app
- .use(ElementPlus)
- .use(directives)
- .use(router) // 使用路由
- .use(I18n)
- .use(pinia)
- .use(registerGlobComp) // 使用全局自定义组件
+ app
+ .use(ElementPlus)
+ .use(directives)
+ .use(router) // 使用路由
+ .use(I18n)
+ .use(pinia)
+ .use(registerGlobComp) // 使用全局自定义组件
- //待路由初始化完毕后，挂载app
- await router.isReady()
+ //待路由初始化完毕后，挂载app
+ await router.isReady()
}
//挂载app
setupAll().then(() => {
- app.mount('#app')
+ app.mount('#app')
})
diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss
index cdfeab1..3537753 100644
--- a/frontend/src/styles/element.scss
+++ b/frontend/src/styles/element.scss
@@ -297,7 +297,7 @@
//全局dialog修改
.el-dialog {
padding: 0px !important;
- border: 2px solid #3665a0;
+ border: 0 solid #3665a0;
.el-dialog__header {
background: var(--el-color-primary);
@@ -434,16 +434,9 @@
}
}
-.el-dialog {
-
-
-
-}
.dialog-small{
.el-dialog__body{
-
-
- max-height: 250px;
+ max-height: 280px;
}
}
.dialog-middle{
@@ -455,4 +448,23 @@
.el-dialog__body{
max-height: 620px;
}
+}
+
+.form-two {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ .el-form-item {
+ display: flex;
+ width: 48%;
+ .el-form-item__content {
+ flex: 1;
+ .el-select,
+ .el-cascader,
+ .el-input__inner,
+ .el-date-editor {
+ width: 100%;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/frontend/src/utils/elementBind.ts b/frontend/src/utils/elementBind.ts
index d4acf8e..cd7036e 100644
--- a/frontend/src/utils/elementBind.ts
+++ b/frontend/src/utils/elementBind.ts
@@ -1,5 +1,5 @@
export const dialogSmall = {
- width:'520px',
+ width:'400px',
closeOnClickModal:false,
draggable:true,
class:'dialog-small'
diff --git a/frontend/src/views/demo/proTable/doubleColumn.vue b/frontend/src/views/demo/proTable/doubleColumn.vue
new file mode 100644
index 0000000..e9ec209
--- /dev/null
+++ b/frontend/src/views/demo/proTable/doubleColumn.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/src/views/demo/proTable/index.vue b/frontend/src/views/demo/proTable/index.vue
index 00ba1e4..5040a51 100644
--- a/frontend/src/views/demo/proTable/index.vue
+++ b/frontend/src/views/demo/proTable/index.vue
@@ -26,6 +26,8 @@
+
+
\ No newline at end of file
diff --git a/frontend/src/views/demo/proTable/singleColumn.vue b/frontend/src/views/demo/proTable/singleColumn.vue
new file mode 100644
index 0000000..4bbf43f
--- /dev/null
+++ b/frontend/src/views/demo/proTable/singleColumn.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file