+
\ No newline at end of file
diff --git a/apps/web-test/src/views/dashboard/home/components/Output2/index.vue b/apps/web-test/src/views/dashboard/home/components/Output2/index.vue
index 2a5570f1..41e52090 100644
--- a/apps/web-test/src/views/dashboard/home/components/Output2/index.vue
+++ b/apps/web-test/src/views/dashboard/home/components/Output2/index.vue
@@ -79,6 +79,9 @@ import { preferences } from '@vben/preferences';
watch(() => preferences.theme.mode, (n: any) => {
VxeUI.setTheme(n)
+},{
+ deep: true,
+ immediate: true
})
interface RowVO {
@@ -171,9 +174,15 @@ watch(
overflow: hidden; //超出隐藏
white-space: nowrap; //超出不换行
overflow-x: auto; //出现水平滚动条
+ padding-bottom: 3px;
+ margin-bottom: 10px;
li {
display: inline-block;
margin-right: 10px;
}
}
+
+.f-btn-box::-webkit-scrollbar {
+ height: 5px !important;
+}
\ No newline at end of file
diff --git a/apps/web-test/src/views/dashboard/home/components/Output5/index.vue b/apps/web-test/src/views/dashboard/home/components/Output5/index.vue
index c7010af7..bbc2975e 100644
--- a/apps/web-test/src/views/dashboard/home/components/Output5/index.vue
+++ b/apps/web-test/src/views/dashboard/home/components/Output5/index.vue
@@ -1,7 +1,7 @@
@@ -347,11 +278,11 @@ let goPage = (item) => {
+ :row-height="70" :vertical-compact="true">
+ :x="item.x" :y="item.y" :dragAllowFrom="item && item.dom ? item.dom : null"
+ :isResizable="tilesIsMove && item && item.isResize ? item.isResize : false" @resized="resizedEvent">
@@ -371,7 +302,7 @@ let goPage = (item) => {
-
+
@@ -396,7 +327,7 @@ let goPage = (item) => {
-
{{ item.name + '(' + item.size + ')' }}
@@ -407,7 +338,7 @@ let goPage = (item) => {
-
{{ item.name + '(' + item.size + ')' }}
@@ -419,7 +350,7 @@ let goPage = (item) => {
-
{{ item.name + '(' + item.size + ')' }}
@@ -431,7 +362,7 @@ let goPage = (item) => {
-
{{ item.name + '(' + item.size + ')' }}
@@ -443,7 +374,7 @@ let goPage = (item) => {
-
{{ item.name + '(' + item.size + ')' }}
@@ -455,9 +386,10 @@ let goPage = (item) => {
-
+
{{ item.name + '(' + item.size + ')' }}
{
-
+
{{ item.name + '(' + item.size + ')' }}
{
min-width: 1000px;
position: relative;
overflow-x: auto;
+ max-width: unset !important;
}
.grid-box {
@@ -520,7 +454,6 @@ let goPage = (item) => {
height: 130px;
padding: 12px;
// margin-top: 20px;
- background: #ecf1f3;
user-select: none;
flex-direction: column;
border-radius: 10px;
@@ -570,7 +503,8 @@ let goPage = (item) => {
overflow: auto;
background: transparent;
// border: 1px solid rgb(66 66 66 / 100%);
- width: 1200px;
+ // width: 1200px;
+ margin: 0 auto;
.vue-grid-item {
// padding: 12px 20px;
diff --git a/apps/web-test/src/views/dashboard/home/operation.vue b/apps/web-test/src/views/dashboard/home/operation.vue
new file mode 100644
index 00000000..f1503997
--- /dev/null
+++ b/apps/web-test/src/views/dashboard/home/operation.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
总共{{ tableData.length }}条数据
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/web-test/src/views/dashboard/home/portal.vue b/apps/web-test/src/views/dashboard/home/portal.vue
index f72d1787..4a1f6ef9 100644
--- a/apps/web-test/src/views/dashboard/home/portal.vue
+++ b/apps/web-test/src/views/dashboard/home/portal.vue
@@ -1,9 +1,9 @@
-
+
磁贴管理
-
注册磁贴
+
注册磁贴
@@ -21,7 +21,8 @@ import CardTitle from './components/CardTiles/index.vue';
import { UnorderedListOutlined, ExpandOutlined } from '@ant-design/icons-vue';
import { Button, Form, FormItem, Input, Select, Card, Pagination} from 'ant-design-vue';
import { tilesList } from './tiles'
-
+import { useRouter } from "vue-router";
+const router = useRouter();
let list: any[] = []
for (let i = 0; i < tilesList.length; i++) {
let obj: any = {}
@@ -32,4 +33,9 @@ for (let i = 0; i < tilesList.length; i++) {
list.push(obj);
obj = null
}
+
+let goToReg = () => {
+ router.push("/register");
+
+}
\ No newline at end of file
diff --git a/apps/web-test/src/views/dashboard/home/register.vue b/apps/web-test/src/views/dashboard/home/register.vue
new file mode 100644
index 00000000..8e0edfac
--- /dev/null
+++ b/apps/web-test/src/views/dashboard/home/register.vue
@@ -0,0 +1,305 @@
+
+
+
+
+
+
+
+
请选择业务域
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
请选择磁贴模板
+
+
+
+
{{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/web-test/src/views/dashboard/home/tiles.ts b/apps/web-test/src/views/dashboard/home/tiles.ts
index 31791080..ba432051 100644
--- a/apps/web-test/src/views/dashboard/home/tiles.ts
+++ b/apps/web-test/src/views/dashboard/home/tiles.ts
@@ -1,4 +1,59 @@
let tilesList = [
+ {
+ "name1": "WORKBENCH_USER_TMPL.png",
+ "name2": "WORKBENCH_USER_TMPL_C用户模板.png",
+ "size": "2x2",
+ "name": "用户模板",
+ "w": 1,
+ "h": 2,
+ "component": "./components/Output1/index.vue",
+ "i": 131,
+ "path": "/usertemplate"
+ },
+ {
+ "name1": "WORKBENCH_BUSINESS.png",
+ "name2": "WORKBENCH_BUSINESS_C业务域.png",
+ "size": "2x2",
+ "name": "业务域",
+ "w": 1,
+ "h": 2,
+ "component": "./components/Output1/index.vue",
+ "i": 128,
+ "path": "/operation"
+ },
+ {
+ "name1": "WORKBENCH_MANAGER.png",
+ "name2": "WORKBENCH_MANAGER_C磁贴管理.png",
+ "size": "2x2",
+ "name": "磁贴管理",
+ "w": 1,
+ "h": 2,
+ "component": "./components/Output1/index.vue",
+ "i": 129,
+ "path": "/portal"
+ },
+ {
+ "name1": "WORKBENCH_AUDIT.png",
+ "name2": "WORKBENCH_AUDIT_C磁贴审核.png",
+ "size": "2x2",
+ "name": "磁贴审核",
+ "w": 1,
+ "h": 2,
+ "component": "./components/Output1/index.vue",
+ "i": 127,
+ "path": "/audit"
+ },
+ {
+ "name1": "AUTO_1612255706920.png",
+ "name2": "AUTO_1612255706920_C待办管理.png",
+ "size": "2x2",
+ "name": "待办管理",
+ "w": 1,
+ "h": 2,
+ "component": "./components/Output1/index.vue",
+ "i": 27,
+ "path": "/todo"
+ },
{
"name1": "AUTO_1612155980933.png",
"name2": "AUTO_1612155980933_C会议管理.png",
@@ -8,7 +63,6 @@ let tilesList = [
"h": 2,
"component": "./components/Output1/index.vue",
"i": 0,
- "path": "/portal"
},
{
"name1": "AUTO_1612158921536.png",
@@ -19,6 +73,7 @@ let tilesList = [
"h": 6,
"component": "./components/Output5/index.vue",
"dom": '.titlt-top',
+ "isResize": true,
"childer": [
{
"name1": "AUTO_1612159241967.png",
@@ -44,7 +99,8 @@ let tilesList = [
"h": 5,
"component": "./components/Output2/index.vue",
"i": 2,
- "dom": '.titlt-top'
+ "dom": '.titlt-top',
+ "isResize": true
},
{
"name1": "AUTO_1612159773503.png",
@@ -287,16 +343,6 @@ let tilesList = [
"component": "./components/Output1/index.vue",
"i": 26
},
- {
- "name1": "AUTO_1612255706920.png",
- "name2": "AUTO_1612255706920_C待办管理.png",
- "size": "2x2",
- "name": "待办管理",
- "w": 1,
- "h": 2,
- "component": "./components/Output1/index.vue",
- "i": 27
- },
{
"name1": "AUTO_1615449162971.png",
"name2": "AUTO_1615449162971_C日志服务.png",
@@ -1287,36 +1333,6 @@ let tilesList = [
"component": "./components/Output1/index.vue",
"i": 126
},
- {
- "name1": "WORKBENCH_AUDIT.png",
- "name2": "WORKBENCH_AUDIT_C磁贴审核.png",
- "size": "2x2",
- "name": "磁贴审核",
- "w": 1,
- "h": 2,
- "component": "./components/Output1/index.vue",
- "i": 127
- },
- {
- "name1": "WORKBENCH_BUSINESS.png",
- "name2": "WORKBENCH_BUSINESS_C业务域.png",
- "size": "2x2",
- "name": "业务域",
- "w": 1,
- "h": 2,
- "component": "./components/Output1/index.vue",
- "i": 128
- },
- {
- "name1": "WORKBENCH_MANAGER.png",
- "name2": "WORKBENCH_MANAGER_C磁贴管理.png",
- "size": "2x2",
- "name": "磁贴管理",
- "w": 1,
- "h": 2,
- "component": "./components/Output1/index.vue",
- "i": 129
- },
{
"name1": "WORKBENCH_USER_AUTH.png",
"name2": "WORKBENCH_USER_AUTH_C用户授权.png",
@@ -1327,16 +1343,6 @@ let tilesList = [
"component": "./components/Output1/index.vue",
"i": 130
},
- {
- "name1": "WORKBENCH_USER_TMPL.png",
- "name2": "WORKBENCH_USER_TMPL_C用户模板.png",
- "size": "2x2",
- "name": "用户模板",
- "w": 1,
- "h": 2,
- "component": "./components/Output1/index.vue",
- "i": 131
- }
]
export { tilesList }
\ No newline at end of file
diff --git a/apps/web-test/src/views/dashboard/home/todo.vue b/apps/web-test/src/views/dashboard/home/todo.vue
new file mode 100644
index 00000000..4a1a34a9
--- /dev/null
+++ b/apps/web-test/src/views/dashboard/home/todo.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 清空
+
+
+
+
+ 添加应用
+ 一键导入
+ 配置待办清单
+
+
+
+
+
+
+
+
+
+ 告警管理
+ 编辑
+ 删除
+ 导出
+
+
+
+
+
+
总共{{ tableData.length }}条数据
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/web-test/src/views/dashboard/home/usertemplate.vue b/apps/web-test/src/views/dashboard/home/usertemplate.vue
new file mode 100644
index 00000000..9b277984
--- /dev/null
+++ b/apps/web-test/src/views/dashboard/home/usertemplate.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
总共{{ tableData.length }}条数据
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue b/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
index 0c820a4f..ee2c0931 100644
--- a/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
+++ b/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
@@ -163,7 +163,7 @@ if (enableShortcutKey.value) {
@@ -171,7 +171,7 @@ if (enableShortcutKey.value) {