Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Merge pull request #47 from hormers/master
Browse files Browse the repository at this point in the history
feat: 完善grid-layout
  • Loading branch information
hormers authored Feb 17, 2023
2 parents 64dcf97 + 93ff2a5 commit 2a71c51
Show file tree
Hide file tree
Showing 166 changed files with 2,209 additions and 5,022 deletions.
1 change: 1 addition & 0 deletions apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@vben/constants": "workspace:*",
"@vben/demo": "workspace:*",
"@vben/directives": "workspace:*",
"@vben/grid-layouts": "workspace:*",
"@vben/hooks": "workspace:*",
"@vben/layouts": "workspace:*",
"@vben/locale": "workspace:*",
Expand Down
2 changes: 2 additions & 0 deletions apps/admin/src/layout/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<script lang="ts" setup>
import { Layout } from '@vben/layouts'
// import { Layout } from '@vben/grid-layouts'
</script>

<template>
Expand Down
6 changes: 3 additions & 3 deletions apps/admin/src/pages/demo/editor/monaco-editor.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<script lang="ts" setup>
import * as monaco from 'monaco-editor'
import { onMounted } from 'vue'
let editor = $ref(null)
import { onMounted, ref } from 'vue'
let editor = ref(null)
onMounted(() => {
initEditor()
})
const initEditor = () => {
// Initialize editor , Make sure dom Has rendered
editor = monaco.editor.create(document.getElementById('codeEditBox'), {
editor.value = monaco.editor.create(document.getElementById('codeEditBox'), {
value: 'console.log("Hello, world")',
language: 'javascript',
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
</script>
<template>
<div class="p-4">analysis</div>
<div>业务逻辑测试页面</div>
</template>
2 changes: 1 addition & 1 deletion apps/admin/src/router/guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
createTabsGuard,
createParamMenuGuard,
} from '@vben/router'
import { setRouteChange } from '@/logics/mitt/routeChange'
import { setRouteChange } from '@vben/router'
import { useLockStore } from '@/store/lock'

async function setupRouteGuard() {
Expand Down
8 changes: 5 additions & 3 deletions apps/admin/src/router/routes/modules/test/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ const test: RouteRecordItem = {
redirect: '/test/test',
meta: {
orderNo: 1,
icon: 'mdi:monitor-dashboard',
icon: 'ph:code-bold',
title: '测试',
root: true,
},
children: [
{
path: 'test',
name: 'TTTT',
component: () => import('@/pages/dashboard/analysis/index.vue'),
name: 'ttest',
component: () => import('@/pages/test/test.vue'),
meta: {
icon: 'mdi:monitor-dashboard',
title: 'Test',
collapsedShowTitle: true,
},
},
],
Expand Down
9 changes: 0 additions & 9 deletions apps/admin/src/store/test.ts

This file was deleted.

5 changes: 0 additions & 5 deletions apps/grid-admin/.env

This file was deleted.

21 changes: 0 additions & 21 deletions apps/grid-admin/.env.development

This file was deleted.

28 changes: 0 additions & 28 deletions apps/grid-admin/.env.production

This file was deleted.

146 changes: 0 additions & 146 deletions apps/grid-admin/index.html

This file was deleted.

Loading

0 comments on commit 2a71c51

Please sign in to comment.