Pre Merge pull request !403 from zhoudev/N/A

Signed-off-by: zhoudev <15321072+zhoudev@user.noreply.gitee.com>

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: nacos:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: nacos:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -33,7 +33,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: nacos:8848
             dataId: sentinel-ruoyi-gateway
             groupId: DEFAULT_GROUP
             data-type: json

ruoyi-ui/src/components/FileUpload/index.vue

@@ -28,7 +28,7 @@
     </el-upload>
 
     <!-- 文件列表 -->
-    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+    <transition-group ref="uploadFileList" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
       <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
         <el-link :href="file.url" :underline="false" target="_blank">
           <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
@@ -104,7 +104,7 @@ export default {
   mounted() {
     if (this.drag) {
       this.$nextTick(() => {
-        const element = document.querySelector('.upload-file-list')
+        const element = this.$refs.uploadFileList?.$el || this.$refs.uploadFileList
         Sortable.create(element, {
           ghostClass: 'file-upload-darg',
           onEnd: (evt) => {

ruoyi-ui/src/components/ImageUpload/index.vue

@@ -102,7 +102,7 @@ export default {
   mounted() {
     if (this.drag) {
       this.$nextTick(() => {
-        const element = document.querySelector('.el-upload-list')
+        const element = this.$refs.imageUpload?.$el?.querySelector('.el-upload-list')
         Sortable.create(element, {
           onEnd: (evt) => {
             const movedItem = this.fileList.splice(evt.oldIndex, 1)[0]

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -6,13 +6,8 @@
       </el-tab-pane>
       <el-tab-pane label="字段信息" name="columnInfo">
         <el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
-          <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
+          <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag"/>
-          <el-table-column
+          <el-table-column label="字段列名" prop="columnName" min-width="10%" :show-overflow-tooltip="true" class-name="allowDrag"/>
-            label="字段列名"
-            prop="columnName"
-            min-width="10%"
-            :show-overflow-tooltip="true"
-          />
           <el-table-column label="字段描述" min-width="10%">
             <template slot-scope="scope">
               <el-input v-model="scope.row.columnComment"></el-input>