diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js b/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
index 4d5aef92309a8c3ac3de34ebdec09f4b1f0521fa..05c2fd5946f643e006273ab9e80851c10f2e6f82 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
@@ -38,3 +38,11 @@ export function setDel(data) {
data
})
}
+
+export function changeFiledStatus(data) {
+ return request({
+ url: `/admin_menus/changeFiledStatus`,
+ method: 'put',
+ data
+ })
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/components/ErrorLog/index.vue b/app/Modules/Admin/Resources/vue-element-admin/components/ErrorLog/index.vue
index 6119c0374f351b4a8f2286f5ae8cd1dbcf050ed6..9ad758d78c66f294abe7e0dde1aa1af10b1d6304 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/components/ErrorLog/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/components/ErrorLog/index.vue
@@ -37,8 +37,8 @@
-
- {{ scope.row.err.stack }}
+
+ {{ row.err.stack }}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/main.js b/app/Modules/Admin/Resources/vue-element-admin/main.js
index ddf47a202e71c326f58c643e7dab3b48436a5400..0a85d07d6f320babf1c6beb21d2202151bfe429e 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/main.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/main.js
@@ -31,27 +31,22 @@ import * as filters from './filters' // global filters
* please remove it before going online ! ! !
*/
-if (process.env.NODE_ENV === 'production') {
- const { mockXHR } = require('./mock')
- mockXHR()
-}
-
Vue.use(Element, {
- size: Cookies.get('size') || 'medium', // set element-ui default size
- i18n: (key, value) => i18n.t(key, value)
+ size: Cookies.get('size') || 'medium', // set element-ui default size
+ i18n: (key, value) => i18n.t(key, value)
})
// register global utility filters
Object.keys(filters).forEach(key => {
- Vue.filter(key, filters[key])
+ Vue.filter(key, filters[key])
})
Vue.config.productionTip = false
new Vue({
- el: '#app',
- router,
- store,
- i18n,
- render: h => h(App)
+ el: '#app',
+ router,
+ store,
+ i18n,
+ render: h => h(App)
})
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/article.js b/app/Modules/Admin/Resources/vue-element-admin/mock/article.js
deleted file mode 100644
index 23d8ba510567a90a149be2beff5547148d937ccd..0000000000000000000000000000000000000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/article.js
+++ /dev/null
@@ -1,116 +0,0 @@
-const Mock = require('mockjs')
-
-const List = []
-const count = 100
-
-const baseContent = '
I am testing data, I am testing data.

'
-const image_uri = 'https://wpimg.wallstcn.com/e4558086-631c-425c-9430-56ffb46e70b3'
-
-for (let i = 0; i < count; i++) {
- List.push(Mock.mock({
- id: '@increment',
- timestamp: +Mock.Random.date('T'),
- author: '@first',
- reviewer: '@first',
- title: '@title(5, 10)',
- content_short: 'mock data',
- content: baseContent,
- forecast: '@float(0, 100, 2, 2)',
- importance: '@integer(1, 3)',
- 'type|1': ['CN', 'US', 'JP', 'EU'],
- 'status|1': ['published', 'draft'],
- display_time: '@datetime',
- comment_disabled: true,
- pageviews: '@integer(300, 5000)',
- image_uri,
- platforms: ['a-platform']
- }))
-}
-
-module.exports = [
- {
- url: '/vue-element-admin/article/list',
- type: 'get',
- response: config => {
- const { importance, type, title, page = 1, limit = 20, sort } = config.query
-
- let mockList = List.filter(item => {
- if (importance && item.importance !== +importance) return false
- if (type && item.type !== type) return false
- if (title && item.title.indexOf(title) < 0) return false
- return true
- })
-
- if (sort === '-id') {
- mockList = mockList.reverse()
- }
-
- const pageList = mockList.filter((item, index) => index < limit * page && index >= limit * (page - 1))
-
- return {
- code: 20000,
- data: {
- total: mockList.length,
- items: pageList
- }
- }
- }
- },
-
- {
- url: '/vue-element-admin/article/detail',
- type: 'get',
- response: config => {
- const { id } = config.query
- for (const article of List) {
- if (article.id === +id) {
- return {
- code: 20000,
- data: article
- }
- }
- }
- }
- },
-
- {
- url: '/vue-element-admin/article/pv',
- type: 'get',
- response: _ => {
- return {
- code: 20000,
- data: {
- pvData: [
- { key: 'PC', pv: 1024 },
- { key: 'mobile', pv: 1024 },
- { key: 'ios', pv: 1024 },
- { key: 'android', pv: 1024 }
- ]
- }
- }
- }
- },
-
- {
- url: '/vue-element-admin/article/create',
- type: 'post',
- response: _ => {
- return {
- code: 20000,
- data: 'success'
- }
- }
- },
-
- {
- url: '/vue-element-admin/article/update',
- type: 'post',
- response: _ => {
- return {
- code: 20000,
- data: 'success'
- }
- }
- }
-]
-
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/index.js b/app/Modules/Admin/Resources/vue-element-admin/mock/index.js
deleted file mode 100644
index 2eed65db83bc1c539666af7716f9641b23cb6eef..0000000000000000000000000000000000000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-const Mock = require('mockjs')
-const { param2Obj } = require('./utils')
-
-const user = require('./user')
-const role = require('./role')
-const article = require('./article')
-const search = require('./remote-search')
-
-const mocks = [
- ...user,
- ...role,
- ...article,
- ...search
-]
-
-// for front mock
-// please use it cautiously, it will redefine XMLHttpRequest,
-// which will cause many of your third-party libraries to be invalidated(like progress event).
-function mockXHR() {
- // mock patch
- // https://github.com/nuysoft/Mock/issues/300
- Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send
- Mock.XHR.prototype.send = function() {
- if (this.custom.xhr) {
- this.custom.xhr.withCredentials = this.withCredentials || false
-
- if (this.responseType) {
- this.custom.xhr.responseType = this.responseType
- }
- }
- this.proxy_send(...arguments)
- }
-
- function XHR2ExpressReqWrap(respond) {
- return function(options) {
- let result = null
- if (respond instanceof Function) {
- const { body, type, url } = options
- // https://expressjs.com/en/4x/api.html#req
- result = respond({
- method: type,
- body: JSON.parse(body),
- query: param2Obj(url)
- })
- } else {
- result = respond
- }
- return Mock.mock(result)
- }
- }
-
- for (const i of mocks) {
- Mock.mock(new RegExp(i.url), i.type || 'get', XHR2ExpressReqWrap(i.response))
- }
-}
-
-module.exports = {
- mocks,
- mockXHR
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/mock-server.js b/app/Modules/Admin/Resources/vue-element-admin/mock/mock-server.js
deleted file mode 100644
index 8941ec0f8035485e9c432ae7789ffd817e96ef42..0000000000000000000000000000000000000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/mock-server.js
+++ /dev/null
@@ -1,81 +0,0 @@
-const chokidar = require('chokidar')
-const bodyParser = require('body-parser')
-const chalk = require('chalk')
-const path = require('path')
-const Mock = require('mockjs')
-
-const mockDir = path.join(process.cwd(), 'mock')
-
-function registerRoutes(app) {
- let mockLastIndex
- const { mocks } = require('./index.js')
- const mocksForServer = mocks.map(route => {
- return responseFake(route.url, route.type, route.response)
- })
- for (const mock of mocksForServer) {
- app[mock.type](mock.url, mock.response)
- mockLastIndex = app._router.stack.length
- }
- const mockRoutesLength = Object.keys(mocksForServer).length
- return {
- mockRoutesLength: mockRoutesLength,
- mockStartIndex: mockLastIndex - mockRoutesLength
- }
-}
-
-function unregisterRoutes() {
- Object.keys(require.cache).forEach(i => {
- if (i.includes(mockDir)) {
- delete require.cache[require.resolve(i)]
- }
- })
-}
-
-// for mock server
-const responseFake = (url, type, respond) => {
- return {
- url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
- type: type || 'get',
- response(req, res) {
- console.log('request invoke:' + req.path)
- res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
- }
- }
-}
-
-module.exports = app => {
- // parse app.body
- // https://expressjs.com/en/4x/api.html#req.body
- app.use(bodyParser.json())
- app.use(bodyParser.urlencoded({
- extended: true
- }))
-
- const mockRoutes = registerRoutes(app)
- var mockRoutesLength = mockRoutes.mockRoutesLength
- var mockStartIndex = mockRoutes.mockStartIndex
-
- // watch files, hot reload mock server
- chokidar.watch(mockDir, {
- ignored: /mock-server/,
- ignoreInitial: true
- }).on('all', (event, path) => {
- if (event === 'change' || event === 'add') {
- try {
- // remove mock routes stack
- app._router.stack.splice(mockStartIndex, mockRoutesLength)
-
- // clear routes cache
- unregisterRoutes()
-
- const mockRoutes = registerRoutes(app)
- mockRoutesLength = mockRoutes.mockRoutesLength
- mockStartIndex = mockRoutes.mockStartIndex
-
- console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed ${path}`))
- } catch (error) {
- console.log(chalk.redBright(error))
- }
- }
- })
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/remote-search.js b/app/Modules/Admin/Resources/vue-element-admin/mock/remote-search.js
deleted file mode 100644
index 8fc4926743d7a160f61fea5e6f90ff0b91bd2c06..0000000000000000000000000000000000000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/remote-search.js
+++ /dev/null
@@ -1,51 +0,0 @@
-const Mock = require('mockjs')
-
-const NameList = []
-const count = 100
-
-for (let i = 0; i < count; i++) {
- NameList.push(Mock.mock({
- name: '@first'
- }))
-}
-NameList.push({ name: 'mock-Pan' })
-
-module.exports = [
- // username search
- {
- url: '/vue-element-admin/search/user',
- type: 'get',
- response: config => {
- const { name } = config.query
- const mockNameList = NameList.filter(item => {
- const lowerCaseName = item.name.toLowerCase()
- return !(name && lowerCaseName.indexOf(name.toLowerCase()) < 0)
- })
- return {
- code: 20000,
- data: { items: mockNameList }
- }
- }
- },
-
- // transaction list
- {
- url: '/vue-element-admin/transaction/list',
- type: 'get',
- response: _ => {
- return {
- code: 20000,
- data: {
- total: 20,
- 'items|20': [{
- order_no: '@guid()',
- timestamp: +Mock.Random.date('T'),
- username: '@name()',
- price: '@float(1000, 15000, 0, 2)',
- 'status|1': ['success', 'pending']
- }]
- }
- }
- }
- }
-]
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/role/index.js b/app/Modules/Admin/Resources/vue-element-admin/mock/role/index.js
deleted file mode 100644
index 4643f006d9cb26a1c5a4aee243e0f4d1604ec659..0000000000000000000000000000000000000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/role/index.js
+++ /dev/null
@@ -1,98 +0,0 @@
-const Mock = require('mockjs')
-const { deepClone } = require('../utils')
-const { asyncRoutes, constantRoutes } = require('./routes.js')
-
-const routes = deepClone([...constantRoutes, ...asyncRoutes])
-
-const roles = [
- {
- key: 'admin',
- name: 'admin',
- description: 'Super Administrator. Have access to view all pages.',
- routes: routes
- },
- {
- key: 'editor',
- name: 'editor',
- description: 'Normal Editor. Can see all pages except permission page',
- routes: routes.filter(i => i.path !== '/permission')// just a mock
- },
- {
- key: 'visitor',
- name: 'visitor',
- description: 'Just a visitor. Can only see the home page and the document page',
- routes: [{
- path: '',
- redirect: 'dashboard',
- children: [
- {
- path: 'dashboard',
- name: 'Dashboard',
- meta: { title: 'dashboard', icon: 'dashboard' }
- }
- ]
- }]
- }
-]
-
-module.exports = [
- // mock get all routes form server
- {
- url: '/vue-element-admin/routes',
- type: 'get',
- response: _ => {
- return {
- code: 20000,
- data: routes
- }
- }
- },
-
- // mock get all roles form server
- {
- url: '/vue-element-admin/roles',
- type: 'get',
- response: _ => {
- return {
- code: 20000,
- data: roles
- }
- }
- },
-
- // add role
- {
- url: '/vue-element-admin/role',
- type: 'post',
- response: {
- code: 20000,
- data: {
- key: Mock.mock('@integer(300, 5000)')
- }
- }
- },
-
- // update role
- {
- url: '/vue-element-admin/role/[A-Za-z0-9]',
- type: 'put',
- response: {
- code: 20000,
- data: {
- status: 'success'
- }
- }
- },
-
- // delete role
- {
- url: '/vue-element-admin/role/[A-Za-z0-9]',
- type: 'delete',
- response: {
- code: 20000,
- data: {
- status: 'success'
- }
- }
- }
-]
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/role/routes.js b/app/Modules/Admin/Resources/vue-element-admin/mock/role/routes.js
deleted file mode 100644
index 757aa38b68dc66c39d057f6b9e0f8c18395308e8..0000000000000000000000000000000000000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/role/routes.js
+++ /dev/null
@@ -1,530 +0,0 @@
-// Just a mock data
-
-const constantRoutes = [
- {
- path: '/redirect',
- component: 'layout/Layout',
- hidden: true,
- children: [
- {
- path: '/redirect/:path*',
- component: 'views/redirect/index'
- }
- ]
- },
- {
- path: '/login',
- component: 'views/login/index',
- hidden: true
- },
- {
- path: '/auth-redirect',
- component: 'views/login/auth-redirect',
- hidden: true
- },
- {
- path: '/404',
- component: 'views/error-page/404',
- hidden: true
- },
- {
- path: '/401',
- component: 'views/error-page/401',
- hidden: true
- },
- {
- path: '',
- component: 'layout/Layout',
- redirect: 'dashboard',
- children: [
- {
- path: 'dashboard',
- component: 'views/dashboard/index',
- name: 'Dashboard',
- meta: { title: 'dashboard', icon: 'dashboard', affix: true }
- }
- ]
- },
- {
- path: '/documentation',
- component: 'layout/Layout',
- children: [
- {
- path: 'index',
- component: 'views/documentation/index',
- name: 'Documentation',
- meta: { title: 'documentation', icon: 'documentation', affix: true }
- }
- ]
- },
- {
- path: '/guide',
- component: 'layout/Layout',
- redirect: '/guide/index',
- children: [
- {
- path: 'index',
- component: 'views/guide/index',
- name: 'Guide',
- meta: { title: 'guide', icon: 'guide', noCache: true }
- }
- ]
- }
-]
-
-const asyncRoutes = [
- {
- path: '/permission',
- component: 'layout/Layout',
- redirect: '/permission/index',
- alwaysShow: true,
- meta: {
- title: 'permission',
- icon: 'lock',
- roles: ['admin', 'editor']
- },
- children: [
- {
- path: 'page',
- component: 'views/permission/page',
- name: 'PagePermission',
- meta: {
- title: 'pagePermission',
- roles: ['admin']
- }
- },
- {
- path: 'directive',
- component: 'views/permission/directive',
- name: 'DirectivePermission',
- meta: {
- title: 'directivePermission'
- }
- },
- {
- path: 'role',
- component: 'views/permission/role',
- name: 'RolePermission',
- meta: {
- title: 'rolePermission',
- roles: ['admin']
- }
- }
- ]
- },
-
- {
- path: '/icon',
- component: 'layout/Layout',
- children: [
- {
- path: 'index',
- component: 'views/icons/index',
- name: 'Icons',
- meta: { title: 'icons', icon: 'icon', noCache: true }
- }
- ]
- },
-
- {
- path: '/components',
- component: 'layout/Layout',
- redirect: 'noRedirect',
- name: 'ComponentDemo',
- meta: {
- title: 'components',
- icon: 'component'
- },
- children: [
- {
- path: 'tinymce',
- component: 'views/components-demo/tinymce',
- name: 'TinymceDemo',
- meta: { title: 'tinymce' }
- },
- {
- path: 'markdown',
- component: 'views/components-demo/markdown',
- name: 'MarkdownDemo',
- meta: { title: 'markdown' }
- },
- {
- path: 'json-editor',
- component: 'views/components-demo/json-editor',
- name: 'JsonEditorDemo',
- meta: { title: 'jsonEditor' }
- },
- {
- path: 'split-pane',
- component: 'views/components-demo/split-pane',
- name: 'SplitpaneDemo',
- meta: { title: 'splitPane' }
- },
- {
- path: 'avatar-upload',
- component: 'views/components-demo/avatar-upload',
- name: 'AvatarUploadDemo',
- meta: { title: 'avatarUpload' }
- },
- {
- path: 'dropzone',
- component: 'views/components-demo/dropzone',
- name: 'DropzoneDemo',
- meta: { title: 'dropzone' }
- },
- {
- path: 'sticky',
- component: 'views/components-demo/sticky',
- name: 'StickyDemo',
- meta: { title: 'sticky' }
- },
- {
- path: 'count-to',
- component: 'views/components-demo/count-to',
- name: 'CountToDemo',
- meta: { title: 'countTo' }
- },
- {
- path: 'mixin',
- component: 'views/components-demo/mixin',
- name: 'ComponentMixinDemo',
- meta: { title: 'componentMixin' }
- },
- {
- path: 'back-to-top',
- component: 'views/components-demo/back-to-top',
- name: 'BackToTopDemo',
- meta: { title: 'backToTop' }
- },
- {
- path: 'drag-dialog',
- component: 'views/components-demo/drag-dialog',
- name: 'DragDialogDemo',
- meta: { title: 'dragDialog' }
- },
- {
- path: 'drag-select',
- component: 'views/components-demo/drag-select',
- name: 'DragSelectDemo',
- meta: { title: 'dragSelect' }
- },
- {
- path: 'dnd-list',
- component: 'views/components-demo/dnd-list',
- name: 'DndListDemo',
- meta: { title: 'dndList' }
- },
- {
- path: 'drag-kanban',
- component: 'views/components-demo/drag-kanban',
- name: 'DragKanbanDemo',
- meta: { title: 'dragKanban' }
- }
- ]
- },
- {
- path: '/charts',
- component: 'layout/Layout',
- redirect: 'noRedirect',
- name: 'Charts',
- meta: {
- title: 'charts',
- icon: 'chart'
- },
- children: [
- {
- path: 'keyboard',
- component: 'views/charts/keyboard',
- name: 'KeyboardChart',
- meta: { title: 'keyboardChart', noCache: true }
- },
- {
- path: 'line',
- component: 'views/charts/line',
- name: 'LineChart',
- meta: { title: 'lineChart', noCache: true }
- },
- {
- path: 'mixchart',
- component: 'views/charts/mixChart',
- name: 'MixChart',
- meta: { title: 'mixChart', noCache: true }
- }
- ]
- },
- {
- path: '/nested',
- component: 'layout/Layout',
- redirect: '/nested/menu1/menu1-1',
- name: 'Nested',
- meta: {
- title: 'nested',
- icon: 'nested'
- },
- children: [
- {
- path: 'menu1',
- component: 'views/nested/menu1/index',
- name: 'Menu1',
- meta: { title: 'menu1' },
- redirect: '/nested/menu1/menu1-1',
- children: [
- {
- path: 'menu1-1',
- component: 'views/nested/menu1/menu1-1',
- name: 'Menu1-1',
- meta: { title: 'menu1-1' }
- },
- {
- path: 'menu1-2',
- component: 'views/nested/menu1/menu1-2',
- name: 'Menu1-2',
- redirect: '/nested/menu1/menu1-2/menu1-2-1',
- meta: { title: 'menu1-2' },
- children: [
- {
- path: 'menu1-2-1',
- component: 'views/nested/menu1/menu1-2/menu1-2-1',
- name: 'Menu1-2-1',
- meta: { title: 'menu1-2-1' }
- },
- {
- path: 'menu1-2-2',
- component: 'views/nested/menu1/menu1-2/menu1-2-2',
- name: 'Menu1-2-2',
- meta: { title: 'menu1-2-2' }
- }
- ]
- },
- {
- path: 'menu1-3',
- component: 'views/nested/menu1/menu1-3',
- name: 'Menu1-3',
- meta: { title: 'menu1-3' }
- }
- ]
- },
- {
- path: 'menu2',
- name: 'Menu2',
- component: 'views/nested/menu2/index',
- meta: { title: 'menu2' }
- }
- ]
- },
-
- {
- path: '/example',
- component: 'layout/Layout',
- redirect: '/example/list',
- name: 'Example',
- meta: {
- title: 'example',
- icon: 'example'
- },
- children: [
- {
- path: 'create',
- component: 'views/example/create',
- name: 'CreateArticle',
- meta: { title: 'createArticle', icon: 'edit' }
- },
- {
- path: 'edit/:id(\\d+)',
- component: 'views/example/edit',
- name: 'EditArticle',
- meta: { title: 'editArticle', noCache: true },
- hidden: true
- },
- {
- path: 'list',
- component: 'views/example/list',
- name: 'ArticleList',
- meta: { title: 'articleList', icon: 'list' }
- }
- ]
- },
-
- {
- path: '/tab',
- component: 'layout/Layout',
- children: [
- {
- path: 'index',
- component: 'views/tab/index',
- name: 'Tab',
- meta: { title: 'tab', icon: 'tab' }
- }
- ]
- },
-
- {
- path: '/error',
- component: 'layout/Layout',
- redirect: 'noRedirect',
- name: 'ErrorPages',
- meta: {
- title: 'errorPages',
- icon: '404'
- },
- children: [
- {
- path: '401',
- component: 'views/error-page/401',
- name: 'Page401',
- meta: { title: 'page401', noCache: true }
- },
- {
- path: '404',
- component: 'views/error-page/404',
- name: 'Page404',
- meta: { title: 'page404', noCache: true }
- }
- ]
- },
-
- {
- path: '/error-log',
- component: 'layout/Layout',
- redirect: 'noRedirect',
- children: [
- {
- path: 'log',
- component: 'views/error-log/index',
- name: 'ErrorLog',
- meta: { title: 'errorLog', icon: 'bug' }
- }
- ]
- },
-
- {
- path: '/excel',
- component: 'layout/Layout',
- redirect: '/excel/export-excel',
- name: 'Excel',
- meta: {
- title: 'excel',
- icon: 'excel'
- },
- children: [
- {
- path: 'export-excel',
- component: 'views/excel/export-excel',
- name: 'ExportExcel',
- meta: { title: 'exportExcel' }
- },
- {
- path: 'export-selected-excel',
- component: 'views/excel/select-excel',
- name: 'SelectExcel',
- meta: { title: 'selectExcel' }
- },
- {
- path: 'export-merge-header',
- component: 'views/excel/merge-header',
- name: 'MergeHeader',
- meta: { title: 'mergeHeader' }
- },
- {
- path: 'upload-excel',
- component: 'views/excel/upload-excel',
- name: 'UploadExcel',
- meta: { title: 'uploadExcel' }
- }
- ]
- },
-
- {
- path: '/zip',
- component: 'layout/Layout',
- redirect: '/zip/download',
- alwaysShow: true,
- meta: { title: 'zip', icon: 'zip' },
- children: [
- {
- path: 'download',
- component: 'views/zip/index',
- name: 'ExportZip',
- meta: { title: 'exportZip' }
- }
- ]
- },
-
- {
- path: '/pdf',
- component: 'layout/Layout',
- redirect: '/pdf/index',
- children: [
- {
- path: 'index',
- component: 'views/pdf/index',
- name: 'PDF',
- meta: { title: 'pdf', icon: 'pdf' }
- }
- ]
- },
- {
- path: '/pdf/download',
- component: 'views/pdf/download',
- hidden: true
- },
-
- {
- path: '/theme',
- component: 'layout/Layout',
- redirect: 'noRedirect',
- children: [
- {
- path: 'index',
- component: 'views/theme/index',
- name: 'Theme',
- meta: { title: 'theme', icon: 'theme' }
- }
- ]
- },
-
- {
- path: '/clipboard',
- component: 'layout/Layout',
- redirect: 'noRedirect',
- children: [
- {
- path: 'index',
- component: 'views/clipboard/index',
- name: 'ClipboardDemo',
- meta: { title: 'clipboardDemo', icon: 'clipboard' }
- }
- ]
- },
-
- {
- path: '/i18n',
- component: 'layout/Layout',
- children: [
- {
- path: 'index',
- component: 'views/i18n-demo/index',
- name: 'I18n',
- meta: { title: 'i18n', icon: 'international' }
- }
- ]
- },
-
- {
- path: 'external-link',
- component: 'layout/Layout',
- children: [
- {
- path: 'https://github.com/PanJiaChen/vue-element-admin',
- meta: { title: 'externalLink', icon: 'link' }
- }
- ]
- },
-
- { path: '*', redirect: '/404', hidden: true }
-]
-
-module.exports = {
- constantRoutes,
- asyncRoutes
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/user.js b/app/Modules/Admin/Resources/vue-element-admin/mock/user.js
deleted file mode 100644
index d82e079d58c4a9292c07e43505599e14fd704ed7..0000000000000000000000000000000000000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/user.js
+++ /dev/null
@@ -1,84 +0,0 @@
-
-const tokens = {
- admin: {
- token: 'admin-token'
- },
- editor: {
- token: 'editor-token'
- }
-}
-
-const users = {
- 'admin-token': {
- roles: ['admin'],
- introduction: 'I am a super administrator',
- avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
- name: 'Super Admin'
- },
- 'editor-token': {
- roles: ['editor'],
- introduction: 'I am an editor',
- avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
- name: 'Normal Editor'
- }
-}
-
-module.exports = [
- // user login
- {
- url: '/vue-element-admin/user/login',
- type: 'post',
- response: config => {
- const { username } = config.body
- const token = tokens[username]
-
- // mock error
- if (!token) {
- return {
- code: 60204,
- message: 'Account and password are incorrect.'
- }
- }
-
- return {
- code: 20000,
- data: token
- }
- }
- },
-
- // get user info
- {
- url: '/vue-element-admin/user/info\.*',
- type: 'get',
- response: config => {
- const { token } = config.query
- const info = users[token]
-
- // mock error
- if (!info) {
- return {
- code: 50008,
- message: 'Login failed, unable to get user details.'
- }
- }
-
- return {
- code: 20000,
- data: info
- }
- }
- },
-
- // user logout
- {
- url: '/vue-element-admin/user/logout',
- type: 'post',
- response: _ => {
- return {
- code: 20000,
- data: 'success'
- }
- }
- }
-]
diff --git a/app/Modules/Admin/Resources/vue-element-admin/mock/utils.js b/app/Modules/Admin/Resources/vue-element-admin/mock/utils.js
deleted file mode 100644
index f909a29362aea40dfdf7d2a46c665c64cea7b70a..0000000000000000000000000000000000000000
--- a/app/Modules/Admin/Resources/vue-element-admin/mock/utils.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @param {string} url
- * @returns {Object}
- */
-function param2Obj(url) {
- const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
- if (!search) {
- return {}
- }
- const obj = {}
- const searchArr = search.split('&')
- searchArr.forEach(v => {
- const index = v.indexOf('=')
- if (index !== -1) {
- const name = v.substring(0, index)
- const val = v.substring(index + 1, v.length)
- obj[name] = val
- }
- })
- return obj
-}
-
-/**
- * This is just a simple version of deep copy
- * Has a lot of edge cases bug
- * If you want to use a perfect deep copy, use lodash's _.cloneDeep
- * @param {Object} source
- * @returns {Object}
- */
-function deepClone(source) {
- if (!source && typeof source !== 'object') {
- throw new Error('error arguments', 'deepClone')
- }
- const targetObj = source.constructor === Array ? [] : {}
- Object.keys(source).forEach(keys => {
- if (source[keys] && typeof source[keys] === 'object') {
- targetObj[keys] = deepClone(source[keys])
- } else {
- targetObj[keys] = source[keys]
- }
- })
- return targetObj
-}
-
-module.exports = {
- param2Obj,
- deepClone
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/router/index.js b/app/Modules/Admin/Resources/vue-element-admin/router/index.js
index 235ab8d271873a3503029ee4a5d9a8815e74f5d8..3ffbeb32346f807ff8c6d2615eb8662cabf39cb7 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/router/index.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/router/index.js
@@ -44,7 +44,7 @@ export const constantRoutes = [
children: [
{
path: '/redirect/:path(.*)',
- component: () => import('@/views/sundry/redirect/index')
+ component: () => import('@/views/demo/redirect/index')
}
]
},
@@ -101,7 +101,7 @@ export const constantRoutes = [
children: [
{
path: 'index',
- component: () => import('@/views/sundry/icons/index'),
+ component: () => import('@/views/demo/icons/index'),
name: 'Icons',
meta: {title: 'icons', icon: 'icon', noCache: true}
}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/router/modules/charts.js b/app/Modules/Admin/Resources/vue-element-admin/router/modules/charts.js
index 42d7d20f252f954454bb22e01ea107e203dfa441..1d3c9442241811ebc5c0210d1ea887e2e9e1e51a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/router/modules/charts.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/router/modules/charts.js
@@ -14,19 +14,19 @@ const chartsRouter = {
children: [
{
path: 'keyboard',
- component: () => import('@/views/charts/keyboard'),
+ component: () => import('@/views/demo/charts/keyboard'),
name: 'KeyboardChart',
meta: {title: 'keyboardChart', noCache: true}
},
{
path: 'line',
- component: () => import('@/views/charts/line'),
+ component: () => import('@/views/demo/charts/line'),
name: 'LineChart',
meta: {title: 'lineChart', noCache: true}
},
{
path: 'mix-chart',
- component: () => import('@/views/charts/mix-chart'),
+ component: () => import('@/views/demo/charts/mix-chart'),
name: 'MixChart',
meta: {title: 'mixChart', noCache: true}
}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/router/modules/components.js b/app/Modules/Admin/Resources/vue-element-admin/router/modules/components.js
index 544769921defd9f0b66f52b4c0cb07adf2156b0d..16da791e8a59586943911922205a7bf08019fa41 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/router/modules/components.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/router/modules/components.js
@@ -14,61 +14,61 @@ const componentsRouter = {
children: [
{
path: 'tinymce',
- component: () => import('@/views/components-demo/tinymce'),
+ component: () => import('@/views/demo/components-demo/tinymce'),
name: 'TinymceDemo',
meta: {title: 'tinymce'}
},
{
path: 'markdown',
- component: () => import('@/views/components-demo/markdown'),
+ component: () => import('@/views/demo/components-demo/markdown'),
name: 'MarkdownDemo',
meta: {title: 'markdown'}
},
{
path: 'json-editor',
- component: () => import('@/views/components-demo/json-editor'),
+ component: () => import('@/views/demo/components-demo/json-editor'),
name: 'JsonEditorDemo',
meta: {title: 'jsonEditor'}
},
{
path: 'avatar-upload',
- component: () => import('@/views/components-demo/avatar-upload'),
+ component: () => import('@/views/demo/components-demo/avatar-upload'),
name: 'AvatarUploadDemo',
meta: {title: 'avatarUpload'}
},
{
path: 'dropzone',
- component: () => import('@/views/components-demo/dropzone'),
+ component: () => import('@/views/demo/components-demo/dropzone'),
name: 'DropzoneDemo',
meta: {title: 'dropzone'}
},
{
path: 'count-to',
- component: () => import('@/views/components-demo/count-to'),
+ component: () => import('@/views/demo/components-demo/count-to'),
name: 'CountToDemo',
meta: {title: 'countTo'}
},
{
path: 'mixin',
- component: () => import('@/views/components-demo/mixin'),
+ component: () => import('@/views/demo/components-demo/mixin'),
name: 'ComponentMixinDemo',
meta: {title: 'componentMixin'}
},
{
path: 'back-to-top',
- component: () => import('@/views/components-demo/back-to-top'),
+ component: () => import('@/views/demo/components-demo/back-to-top'),
name: 'BackToTopDemo',
meta: {title: 'backToTop'}
},
{
path: 'drag-select',
- component: () => import('@/views/components-demo/drag-select'),
+ component: () => import('@/views/demo/components-demo/drag-select'),
name: 'DragSelectDemo',
meta: {title: 'dragSelect'}
},
{
path: 'drag-kanban',
- component: () => import('@/views/components-demo/drag-kanban'),
+ component: () => import('@/views/demo/components-demo/drag-kanban'),
name: 'DragKanbanDemo',
meta: {title: 'dragKanban'}
}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/styles/common.scss b/app/Modules/Admin/Resources/vue-element-admin/styles/common.scss
index b9ca4428288a00ae3a45cc4b90d93937b858a836..4b3d285c77aa358ad892c4c2e26bbe731559bef4 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/styles/common.scss
+++ b/app/Modules/Admin/Resources/vue-element-admin/styles/common.scss
@@ -18,3 +18,7 @@
width:auto!important;
min-width: 500px;
}
+// 表单 下拉框 100%宽度占比
+.el-form .el-select{
+ width: 100%;
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
index 8fd2f42d29bbfbe79a6d57e3782cc33b1ce396c3..da8ef19baeb72edb1a9be9255eaa34db46039316 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
@@ -4,12 +4,12 @@
:visible.sync="dialogFormVisible"
@close="close"
>
-
+
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
index c6d8bd4e94932c4928f1692723bf78746107c850..c4391c6ae02329638159a5ef6c9870b2299bc93f 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
@@ -24,58 +24,81 @@
prop="menu_name"
label="菜单名称"
>
+
+
+
+
-
-
- {{ scope.row.is_hidden == 1 ? "是" : "否" }}
-
+
+
+
+ {{ row.is_hidden == 1 ? "隐藏" : "展示" }}
+
+
+
+
-
-
+
+
+
-
- 编辑
- 删除
+
+
+
+
+
+ 隐藏
+
+
+
+
+
+ 展示
+
+
+
+ 编辑
+ 删除
@@ -85,12 +108,21 @@
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
index 29610c9a29b69e43ab48e6b94c0cfaef167176a0..826f06d52a0e5f0e6977357696677141359a0260 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
@@ -71,36 +71,37 @@
-
-
- {{ scope.row.is_check | checkFilter }}
+
+
+
+ {{ row.is_check | checkFilter }}
-
+
-
+
+
启用
-
+
+
禁用
- 编辑
- 删除
+ 编辑
+ 删除
@@ -118,7 +119,7 @@
-
+
启用
-
+
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
index 6253164396ab4edcddde451d2a8090a771422733..f2430446485cf3d4d643680a2fefcefe3fd2afe7 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
@@ -45,12 +45,14 @@
class="margin-buttom-10"
>
+
+
@@ -60,18 +62,21 @@
+
+
+
+
+
-
-
- {{ scope.row.log_status | checkFilter }}
+
+
+
+ {{ row.log_status | checkFilter }}
+
+
{{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
+
-
- 删除
+
+ 删除
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
index 91389b3fb0f9ab7a45290cf259b8b1b9b034bee5..62daa96d1d21f24c05c3ab90bfab56cdfbe51b56 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
@@ -89,9 +89,10 @@
align="center"
/>
-
-
- {{ scope.row.log_status | checkFilter }}
+
+
+
+ {{ row.log_status | checkFilter }}
@@ -101,12 +102,11 @@
-
- 删除
+
+ 删除
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
index 17086984ca6bf07327d0e70415112d4722b4ac9e..1446b2201c63dff832bbe59af92a044e1e17cff7 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
@@ -4,7 +4,7 @@
:visible.sync="dialogFormVisible"
@close="close"
>
-
+
-
+
-
+
启用
-
+
禁用
- 编辑
- 删除
+ 编辑
+ 删除
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
index e9df2f605827dc62b07e8fd9dbe0805800b271b7..6ff515b0cf4e166362c1ea9c055facca67434adf 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
@@ -4,7 +4,7 @@
:visible.sync="dialogFormVisible"
@close="close"
>
-
+
-
+
禁用
启用
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
index 7734da6668c7b283c57f7ee00cc88e2e15783832..beffdbe9a8c8b2103f880531f761022786ebc7f3 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
@@ -31,9 +31,10 @@
align="center"
>
-
-
- {{ scope.row.is_check | checkFilter }}
+
+
+
+ {{ row.is_check | checkFilter }}
@@ -43,28 +44,28 @@
-
+
-
+
+
启用
-
+
+
禁用
- 编辑
- 删除
+ 编辑
+ 删除
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
index fe96d3f12b88ac7310aac5bdced2cea0c043ab97..a0f5918cf8c30cf2bb3b27287daf662925796f57 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
@@ -1,6 +1,6 @@
-
+
@@ -9,7 +9,7 @@
-
+
Title
@@ -158,10 +158,10 @@
const validateRequire = (rule, value, callback) => {
if (value === '') {
this.$message({
- message: rule.field + '为必传项',
+ message: rule.field + '为必填项',
type: 'error'
})
- callback(new Error(rule.field + '为必传项'))
+ callback(new Error(rule.field + '为必填项'))
} else {
callback();
}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
index 7d45fd0af8c88afa7fa5baae92d729032797f854..1f7c561c89a1519cfe384e5ded2cd3e4269d7075 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
@@ -46,8 +46,8 @@
-
- {{ scope.row.article_id }}
+
+ {{ row.article_id }}
@@ -112,55 +112,55 @@
-
+
-
+
置顶
-
+
取消’置顶‘
-
+
推荐
-
+
取消’推荐‘
-
+
公开
-
+
私密
- 编辑
- 删除
+ 编辑
+ 删除
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
index 036a9f282c9cb812560c5d32a99f3ad0f2b28468..37ec680c7da64491db94925af011cc5b983f8d21 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
@@ -86,36 +86,37 @@
-
-
- {{ scope.row.is_check | checkFilter }}
+
+
+
+ {{ row.is_check | checkFilter }}
-
+
-
+
+
启用
-
+
+
禁用
- 编辑
- 删除
+ 编辑
+ 删除
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
index 7b60e845f7c79019ded3ae4f11ada4a9cac8aa8b..013428611658d656f884e486a70fbcad4d044212 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
@@ -107,37 +107,36 @@
-
-
- {{ scope.row.is_check | checkFilter }}
+
+
+
+ {{ row.is_check | checkFilter }}
-
+
-
+
启用
-
+
禁用
- 编辑
- 删除
+ 编辑
+ 删除
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/charts/keyboard.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/keyboard.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/charts/keyboard.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/keyboard.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/charts/line.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/line.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/charts/line.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/line.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/charts/mix-chart.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/mix-chart.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/charts/mix-chart.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/charts/mix-chart.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/avatar-upload.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/avatar-upload.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/avatar-upload.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/avatar-upload.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/back-to-top.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/back-to-top.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/back-to-top.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/back-to-top.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/count-to.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/count-to.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/count-to.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/count-to.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/drag-kanban.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/drag-kanban.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/drag-kanban.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/drag-kanban.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/drag-select.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/drag-select.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/drag-select.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/drag-select.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/dropzone.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/dropzone.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/dropzone.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/dropzone.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/json-editor.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/json-editor.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/json-editor.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/json-editor.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/markdown.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/markdown.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/markdown.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/markdown.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/mixin.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/mixin.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/mixin.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/mixin.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/tinymce.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/tinymce.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/components-demo/tinymce.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/tinymce.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/element-icons.js b/app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/element-icons.js
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/element-icons.js
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/element-icons.js
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/index.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/index.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/index.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/svg-icons.js b/app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/svg-icons.js
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/sundry/icons/svg-icons.js
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/icons/svg-icons.js
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/sundry/redirect/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/redirect/index.vue
similarity index 100%
rename from app/Modules/Admin/Resources/vue-element-admin/views/sundry/redirect/index.vue
rename to app/Modules/Admin/Resources/vue-element-admin/views/demo/redirect/index.vue
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
index c161d69b81a2dd911f8d2e97858a36c271be9f9a..ede0a59ca6e764044dfca8163ff3aa78167cd5bf 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
@@ -86,36 +86,37 @@
-
-
- {{ scope.row.is_check | checkFilter }}
+
+
+
+ {{ row.is_check | checkFilter }}
-
+
-
+
+
启用
-
+
+
禁用
- 编辑
- 删除
+ 编辑
+ 删除