Merge branch 'master' of http://121.40.234.130:8899/root/nladmin

nladmin-ui/src/main.js

@@ -46,6 +46,13 @@ import { Menu } from '@logicflow/extension'
 import '@logicflow/extension/lib/style/index.css'
 LogicFlow.use(Menu)
 
+// Form Generator 组件需要使用到 tinymce
+import Tinymce from '@/views/system/build/tinymce/index.vue'
+Vue.component('tinymce', Tinymce)
+// import '@/views/system/build/icons'
+import request from '@/utils/request' // 实现 form generator 使用自己定义的 axios request 对象
+Vue.prototype.$axios = request
+
 Vue.use(scroll)
 
 Vue.use(AFTableColumn)