删除 修改样式

ruoyi-ui/src/api/dragform/tableList.js

@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-
 // 查询动态格列表
 export function listTable(query) {
   return request({
@@ -17,4 +16,13 @@ export function dragTableList(query) {
     params: query,
     baseURL: process.env.VUE_APP_BASE_API3
   })
+}
+// 删除表格列表
+export function removeTableList(data) {
+  return request({
+    url: '/system/table/remove',
+    method: 'delete',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
 }

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -119,7 +119,7 @@
 
     .submenu-title-noDropdown {
       position: relative;
-
+      padding: 0 !important;
       .el-tooltip {
         padding: 0 !important;
 

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div
+    @mouseleave="mouseleaveHandler"
     :class="{ 'has-logo': showLogo }"
     :style="{
       backgroundColor:
@@ -9,7 +10,10 @@
     }"
   >
     <logo v-if="showLogo" :collapse="isCollapse" />
-    <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
+    <el-scrollbar 
+    :class="settings.sideTheme" 
+    wrap-class="scrollbar-wrapper"
+    >
       <el-menu
         :default-active="activeMenu"
         :collapse="isCollapse"
@@ -80,6 +84,9 @@ export default {
     },
   },
   methods: {
+    mouseleaveHandler() {
+      console.log(123);
+    },
     onLayoutResize() {
       // const clientWidth = document.documentElement.clientWidth;
       const rect = document.body.getBoundingClientRect();
@@ -91,7 +98,7 @@ export default {
         this.isCollapse = false;
       }
       console.log(this.isCollapse);
-    },
+    }
   },
   mounted() {
     // window.addEventListener("resize", this.onLayoutResize);

ruoyi-ui/src/views/dragform/tableList.vue

@@ -86,7 +86,7 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
+  
     <el-table
       v-loading="loading"
       :data="tableList"
@@ -107,7 +107,8 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- 修改样式 -->
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -120,7 +121,34 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             >删除</el-button
-          >
+          > -->
+
+          <el-dropdown>
+            <el-button type="warning" plain size="small">
+              处理<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  >修改
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  >删除
+                </el-button>
+              </el-dropdown-item>
+             
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -195,7 +223,8 @@
   </div>
 </template>
 <script>
-import { listTable } from "@/api/dragform/tableList";
+import { listTable, removeTableList } from "@/api/dragform/tableList";
+import DictData from "@/components/DictData";
 
 export default {
   name: "Table",
@@ -205,6 +234,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      Keys: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -295,6 +325,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.tId);
+      this.Keys = selection.map((item) => item.sqlKey);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -347,11 +378,19 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const tIds = row.tId || this.ids;
-      this.$modal
-        .confirm('是否确认删除动态格编号为"' + tIds + '"的数据项？')
-        .then(function () {
-          return delTable(tIds);
+      let data = {};
+      if (row.tId && row.sqlKey) {
+        data.tIds = [row.tId];
+        data.sqlKeys = [row.sqlKey];
+      } else {
+        data.tIds = this.ids;
+        data.sqlKeys = this.Keys;
+      }
+      // console.log(data);
+      this.$modal.confirm('是否确认删除动态格编号为"' + data.tIds.join(',') + '"的数据项？')
+        .then(async function () {
+          const res = await removeTableList(data)
+          // console.log(res);
         })
         .then(() => {
           this.getList();

ruoyi-ui/src/views/system/tenant/index.vue

@@ -238,8 +238,9 @@
         <el-form-item label="数据源类型" prop="databaseType">
           <el-select
             v-model="dataSourceForm.databaseType"
-            placeholder="请选择数据源类型"
+            :placeholder="palcemsg"
             @change="selecthandle"
+            :disabled="dataSourceType"
           >
             <el-option
               v-for="item in dict.type.datasource_type"
@@ -390,6 +391,11 @@ export default {
       },
     };
   },
+  computed: {
+    palcemsg(){
+      return this.dataSourceType ? 'mysql' : '请选择数据源类型'
+    }
+  },
   created() {
     this.getList();
   },

ruoyi-ui/src/views/tableMange/index.vue

@@ -277,11 +277,11 @@
     </el-row>
     <el-dialog title="效果预览" :visible.sync="isShowPreview" width="50%">
       <el-row :gutter="10" class="mb8">
-        <el-col span="18">
+        <el-col :span=18>
           <el-input placeholder="请输入" clearable />
         </el-col>
 
-        <el-col span="6">
+        <el-col :span=6>
           <el-button
             type="primary"
             icon="el-icon-search"
@@ -370,8 +370,8 @@
           class-name="small-padding fixed-width"
         >
           <!-- <template slot-scope="scope"> -->
-          <template>
-            <el-button
+          <template slot-scope="scope">
+            <!-- <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
@@ -384,7 +384,32 @@
               icon="el-icon-delete"
               @click="() => {}"
               >删除
-            </el-button>
+            </el-button> -->
+            <el-dropdown>
+                <el-button type="warning" plain size="small">
+                  处理<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item
+                    ><el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-edit"
+                      @click="() => {}"
+                      >修改</el-button
+                    ></el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    ><el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="() => {}"
+                      >删除</el-button
+                    >
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
           </template>
         </el-table-column>
       </el-table>

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -131,6 +131,7 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+<<<<<<< HEAD
           <el-button
             size="mini"
             type="text"
@@ -145,6 +146,32 @@
             @click="handleDelete(scope.row)"
           >删除
           </el-button>
+=======
+          <el-dropdown>
+            <el-button type="warning" plain size="small">
+              处理<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item
+                ><el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  >修改</el-button
+                ></el-dropdown-item>
+                <el-dropdown-item
+                  ><el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)"
+                    >删除</el-button
+                  >
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+>>>>>>> 53e53a68 (修改样式和表格删除)
         </template>
       </el-table-column>
     </el-table>