Parcourir la source

全局注册通用组件

RuoYi il y a 4 ans
Parent
commit
ee7607bcca

+ 0 - 36
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -258,46 +258,10 @@
258
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
258
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
259
 import Treeselect from "@riophae/vue-treeselect";
259
 import Treeselect from "@riophae/vue-treeselect";
260
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
260
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
261
-#foreach($column in $columns)
262
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")
263
-import ImageUpload from '@/components/ImageUpload';
264
-#break
265
-#end
266
-#end
267
-#foreach($column in $columns)
268
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
269
-import FileUpload from '@/components/FileUpload';
270
-#break
271
-#end
272
-#end
273
-#foreach($column in $columns)
274
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
275
-import Editor from '@/components/Editor';
276
-#break
277
-#end
278
-#end
279
 
261
 
280
 export default {
262
 export default {
281
   name: "${BusinessName}",
263
   name: "${BusinessName}",
282
   components: {
264
   components: {
283
-#foreach($column in $columns)
284
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")
285
-    ImageUpload,
286
-#break
287
-#end
288
-#end
289
-#foreach($column in $columns)
290
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
291
-    FileUpload,
292
-#break
293
-#end
294
-#end
295
-#foreach($column in $columns)
296
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
297
-    Editor,
298
-#break
299
-#end
300
-#end
301
     Treeselect
265
     Treeselect
302
   },
266
   },
303
   data() {
267
   data() {

+ 0 - 38
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -309,47 +309,9 @@
309
 
309
 
310
 <script>
310
 <script>
311
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
311
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
312
-#foreach($column in $columns)
313
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")
314
-import ImageUpload from '@/components/ImageUpload';
315
-#break
316
-#end
317
-#end
318
-#foreach($column in $columns)
319
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
320
-import FileUpload from '@/components/FileUpload';
321
-#break
322
-#end
323
-#end
324
-#foreach($column in $columns)
325
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
326
-import Editor from '@/components/Editor';
327
-#break
328
-#end
329
-#end
330
 
312
 
331
 export default {
313
 export default {
332
   name: "${BusinessName}",
314
   name: "${BusinessName}",
333
-  components: {
334
-#foreach($column in $columns)
335
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")
336
-    ImageUpload,
337
-#break
338
-#end
339
-#end
340
-#foreach($column in $columns)
341
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
342
-    FileUpload,
343
-#break
344
-#end
345
-#end
346
-#foreach($column in $columns)
347
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
348
-    Editor,
349
-#break
350
-#end
351
-#end
352
-  },
353
   data() {
315
   data() {
354
     return {
316
     return {
355
       // 遮罩层
317
       // 遮罩层

+ 11 - 2
ruoyi-ui/src/main.js

@@ -10,7 +10,7 @@ import '@/assets/styles/ruoyi.scss' // ruoyi css
10
 import App from './App'
10
 import App from './App'
11
 import store from './store'
11
 import store from './store'
12
 import router from './router'
12
 import router from './router'
13
-import permission from './directive/permission'
13
+import directive from './directive' //directive
14
 import { download } from '@/utils/request'
14
 import { download } from '@/utils/request'
15
 
15
 
16
 import './assets/icons' // icon
16
 import './assets/icons' // icon
@@ -21,6 +21,12 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
21
 import Pagination from "@/components/Pagination";
21
 import Pagination from "@/components/Pagination";
22
 // 自定义表格工具组件
22
 // 自定义表格工具组件
23
 import RightToolbar from "@/components/RightToolbar"
23
 import RightToolbar from "@/components/RightToolbar"
24
+// 富文本组件
25
+import Editor from "@/components/Editor"
26
+// 文件上传组件
27
+import FileUpload from "@/components/FileUpload"
28
+// 图片上传组件
29
+import ImageUpload from "@/components/ImageUpload"
24
 // 字典标签组件
30
 // 字典标签组件
25
 import DictTag from '@/components/DictTag'
31
 import DictTag from '@/components/DictTag'
26
 // 头部标签组件
32
 // 头部标签组件
@@ -53,8 +59,11 @@ Vue.prototype.msgInfo = function (msg) {
53
 Vue.component('DictTag', DictTag)
59
 Vue.component('DictTag', DictTag)
54
 Vue.component('Pagination', Pagination)
60
 Vue.component('Pagination', Pagination)
55
 Vue.component('RightToolbar', RightToolbar)
61
 Vue.component('RightToolbar', RightToolbar)
62
+Vue.component('Editor', Editor)
63
+Vue.component('FileUpload', FileUpload)
64
+Vue.component('ImageUpload', ImageUpload)
56
 
65
 
57
-Vue.use(permission)
66
+Vue.use(directive)
58
 Vue.use(VueMeta)
67
 Vue.use(VueMeta)
59
 
68
 
60
 /**
69
 /**

+ 1 - 5
ruoyi-ui/src/views/system/notice/index.vue

@@ -176,14 +176,10 @@
176
 </template>
176
 </template>
177
 
177
 
178
 <script>
178
 <script>
179
-import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
180
-import Editor from '@/components/Editor';
179
+import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
181
 
180
 
182
 export default {
181
 export default {
183
   name: "Notice",
182
   name: "Notice",
184
-  components: {
185
-    Editor
186
-  },
187
   data() {
183
   data() {
188
     return {
184
     return {
189
       // 遮罩层
185
       // 遮罩层