diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index ebd94b9d..45f29f5b 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -1,86 +1,92 @@ -import Vue from 'vue' - -import Cookies from 'js-cookie' - -import Element from 'element-ui' -import './assets/styles/element-variables.scss' - -import '@/assets/styles/index.scss' // global css -import '@/assets/styles/ruoyi.scss' // ruoyi css -import App from './App' -import store from './store' -import router from './router' -import directive from './directive' // directive -import plugins from './plugins' // plugins -import { download } from '@/utils/request' - -import './assets/icons' // icon -import './permission' // permission control -import { getDicts } from "@/api/system/dict/data"; -import { getConfigKey } from "@/api/system/config"; -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; -// 分页组件 -import Pagination from "@/components/Pagination"; -// 自定义表格工具组件 -import RightToolbar from "@/components/RightToolbar" -// 富文本组件 -import Editor from "@/components/Editor" -// 文件上传组件 -import FileUpload from "@/components/FileUpload" -// 图片上传组件 -import ImageUpload from "@/components/ImageUpload" -// 图片预览组件 -import ImagePreview from "@/components/ImagePreview" -// 字典标签组件 -import DictTag from '@/components/DictTag' -// 头部标签组件 -import VueMeta from 'vue-meta' -// 字典数据组件 -import DictData from '@/components/DictData' - -// 全局方法挂载 -Vue.prototype.getDicts = getDicts -Vue.prototype.getConfigKey = getConfigKey -Vue.prototype.parseTime = parseTime -Vue.prototype.resetForm = resetForm -Vue.prototype.addDateRange = addDateRange -Vue.prototype.selectDictLabel = selectDictLabel -Vue.prototype.selectDictLabels = selectDictLabels -Vue.prototype.download = download -Vue.prototype.handleTree = handleTree - -// 全局组件挂载 -Vue.component('DictTag', DictTag) -Vue.component('Pagination', Pagination) -Vue.component('RightToolbar', RightToolbar) -Vue.component('Editor', Editor) -Vue.component('FileUpload', FileUpload) -Vue.component('ImageUpload', ImageUpload) -Vue.component('ImagePreview', ImagePreview) - -Vue.use(directive) -Vue.use(plugins) -Vue.use(VueMeta) -DictData.install() - -/** - * If you don't want to use mock-server - * you want to use MockJs for mock api - * you can execute: mockXHR() - * - * Currently MockJs will be used in the production environment, - * please remove it before going online! ! ! - */ - -Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size -}) - -Vue.config.productionTip = false - -new Vue({ - el: '#app', - router, - store, - render: h => h(App) -}) +import Vue from 'vue' + +import Cookies from 'js-cookie' + +import Element from 'element-ui' +import './assets/styles/element-variables.scss' + +import '@/assets/styles/index.scss' // global css +import '@/assets/styles/ruoyi.scss' // ruoyi css +import App from './App' +import store from './store' +import router from './router' +import directive from './directive' // directive +import plugins from './plugins' // plugins +import { download } from '@/utils/request' + +import './assets/icons' // icon +import './permission' // permission control +import { getDicts } from "@/api/system/dict/data"; +import { getConfigKey } from "@/api/system/config"; +import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; +// 分页组件 +import Pagination from "@/components/Pagination"; +// 自定义表格工具组件 +import RightToolbar from "@/components/RightToolbar" +// 富文本组件 +import Editor from "@/components/Editor" +// 文件上传组件 +import FileUpload from "@/components/FileUpload" +// 图片上传组件 +import ImageUpload from "@/components/ImageUpload" +// 图片预览组件 +import ImagePreview from "@/components/ImagePreview" +// 字典标签组件 +import DictTag from '@/components/DictTag' +// 头部标签组件 +import VueMeta from 'vue-meta' +// 字典数据组件 +import DictData from '@/components/DictData' + +import Tinymce from '@/components/tinymce/index.vue' + + + + +// 全局方法挂载 +Vue.prototype.getDicts = getDicts +Vue.prototype.getConfigKey = getConfigKey +Vue.prototype.parseTime = parseTime +Vue.prototype.resetForm = resetForm +Vue.prototype.addDateRange = addDateRange +Vue.prototype.selectDictLabel = selectDictLabel +Vue.prototype.selectDictLabels = selectDictLabels +Vue.prototype.download = download +Vue.prototype.handleTree = handleTree + +// 全局组件挂载 +Vue.component('DictTag', DictTag) +Vue.component('Pagination', Pagination) +Vue.component('RightToolbar', RightToolbar) +Vue.component('Editor', Editor) +Vue.component('FileUpload', FileUpload) +Vue.component('ImageUpload', ImageUpload) +Vue.component('ImagePreview', ImagePreview) +Vue.component('tinymce', Tinymce) + +Vue.use(directive) +Vue.use(plugins) +Vue.use(VueMeta) +DictData.install() + +/** + * If you don't want to use mock-server + * you want to use MockJs for mock api + * you can execute: mockXHR() + * + * Currently MockJs will be used in the production environment, + * please remove it before going online! ! ! + */ + +Vue.use(Element, { + size: Cookies.get('size') || 'medium' // set element-ui default size +}) + +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/ruoyi-ui/src/utils/generator/config.js b/ruoyi-ui/src/utils/generator/config.js index 872b0237..dd8d5906 100644 --- a/ruoyi-ui/src/utils/generator/config.js +++ b/ruoyi-ui/src/utils/generator/config.js @@ -546,84 +546,84 @@ export const layoutComponents = [ circle: false, disabled: false }, - { - __config__: { - layout: 'colFormItem', - tagIcon: 'table', - tag: 'el-table', - document: 'https://element.eleme.cn/#/zh-CN/component/table', - span: 24, - formId: 101, - renderKey: 1595761764203, - componentName: 'row101', - showLabel: true, - changeTag: true, - labelWidth: null, - label: '表格[开发中]', - dataType: 'dynamic', - method: 'get', - dataPath: 'list', - dataConsumer: 'data', - url: 'https://www.fastmock.site/mock/f8d7a54fb1e60561e2f720d5a810009d/fg/tableData', - children: [{ - __config__: { - layout: 'raw', - tag: 'el-table-column', - renderKey: 15957617660153 - }, - prop: 'date', - label: '日期' - }, { - __config__: { - layout: 'raw', - tag: 'el-table-column', - renderKey: 15957617660152 - }, - prop: 'address', - label: '地址' - }, { - __config__: { - layout: 'raw', - tag: 'el-table-column', - renderKey: 15957617660151 - }, - prop: 'name', - label: '名称' - }, { - __config__: { - layout: 'raw', - tag: 'el-table-column', - renderKey: 1595774496335, - children: [ - { - __config__: { - label: '按钮', - tag: 'el-button', - tagIcon: 'button', - layout: 'raw', - renderKey: 1595779809901 - }, - __slot__: { - default: '主要按钮' - }, - type: 'primary', - icon: 'el-icon-search', - round: false, - size: 'medium' - } - ] - }, - label: '操作' - }] - }, - data: [], - directives: [{ - name: 'loading', - value: true - }], - border: true, - type: 'default', - justify: 'start', - align: 'top' - } + // { + // __config__: { + // layout: 'colFormItem', + // tagIcon: 'table', + // tag: 'el-table', + // document: 'https://element.eleme.cn/#/zh-CN/component/table', + // span: 24, + // formId: 101, + // renderKey: 1595761764203, + // componentName: 'row101', + // showLabel: true, + // changeTag: true, + // labelWidth: null, + // label: '表格[开发中]', + // dataType: 'dynamic', + // method: 'get', + // dataPath: 'list', + // dataConsumer: 'data', + // url: 'https://www.fastmock.site/mock/f8d7a54fb1e60561e2f720d5a810009d/fg/tableData', + // children: [{ + // __config__: { + // layout: 'raw', + // tag: 'el-table-column', + // renderKey: 15957617660153 + // }, + // prop: 'date', + // label: '日期' + // }, { + // __config__: { + // layout: 'raw', + // tag: 'el-table-column', + // renderKey: 15957617660152 + // }, + // prop: 'address', + // label: '地址' + // }, { + // __config__: { + // layout: 'raw', + // tag: 'el-table-column', + // renderKey: 15957617660151 + // }, + // prop: 'name', + // label: '名称' + // }, { + // __config__: { + // layout: 'raw', + // tag: 'el-table-column', + // renderKey: 1595774496335, + // children: [ + // { + // __config__: { + // label: '按钮', + // tag: 'el-button', + // tagIcon: 'button', + // layout: 'raw', + // renderKey: 1595779809901 + // }, + // __slot__: { + // default: '主要按钮' + // }, + // type: 'primary', + // icon: 'el-icon-search', + // round: false, + // size: 'medium' + // } + // ] + // }, + // label: '操作' + // }] + // }, + // data: [], + // directives: [{ + // name: 'loading', + // value: true + // }], + // border: true, + // type: 'default', + // justify: 'start', + // align: 'top' + // } ]