修改

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

@@ -47,3 +47,25 @@ export function delForm(fId) {
     baseURL: process.env.VUE_APP_BASE_API3
   })
 }
+
+// 获取表名
+export function getFormName(jsonData) {
+  return request({
+    url: `/dataSource/getAllTable?databaseIp=${jsonData.databaseIp}&databaseName=${jsonData.databaseName}&databaseType=${jsonData.databaseType}&id=${jsonData.id}&password=${jsonData.password}&portNumber=${jsonData.portNumber}&username=${jsonData.username}`,
+    method: 'get',
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
+}
+
+// 获取列名
+export function getListName() {
+  return request({
+    url: '/dataSource/getInfoTable',
+    method: 'get',
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
+}
+
+
+
+

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

@@ -1,8 +1,20 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="表单名称
-" prop="dfName">
+  <div
+    class="app-container"
+  >
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item
+        label="表单名称
+"
+        prop="dfName"
+      >
         <el-input
           v-model="queryParams.dfName"
           placeholder="请输入表单名称
@@ -11,8 +23,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="表单别名
-" prop="dfNickname">
+      <el-form-item
+        label="表单别名
+"
+        prop="dfNickname"
+      >
         <el-input
           v-model="queryParams.dfNickname"
           placeholder="请输入表单别名
@@ -37,8 +52,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="数据源名称
-" prop="dfDatabase">
+      <el-form-item
+        label="数据源名称
+"
+        prop="dfDatabase"
+      >
         <el-input
           v-model="queryParams.dfDatabase"
           placeholder="请输入数据源名称
@@ -80,8 +98,16 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -94,7 +120,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['dragform:form:add']"
-        >新增
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -106,7 +132,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['dragform:form:edit']"
-        >修改
+          >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -118,7 +144,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['dragform:form:remove']"
-        >删除
+          >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -129,30 +155,69 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['dragform:form:export']"
-        >导出
+          >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="formList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="表单主键" align="center" prop="fId"/>
-      <el-table-column label="表单名称
-" align="center" prop="dfName"/>
-      <el-table-column label="表单别名
-" align="center" prop="dfNickname"/>
-      <el-table-column label="表单vue模版" align="center" prop="dfVueTemplate"/>
-      <el-table-column label="表单html模版" align="center" prop="dfHtmlTemplate"/>
-      <el-table-column label="表单sql" align="center" prop="dfFormSql"/>
-      <el-table-column label="节点ID" align="center" prop="dfNodeId"/>
-      <el-table-column label="数据源名称
-" align="center" prop="dfDatabase"/>
-      <el-table-column label="绑定表名称" align="center" prop="dfTableName"/>
-      <el-table-column label="表单描述" align="center" prop="dfNotes"/>
-      <el-table-column label="备用列" align="center" prop="spare"/>
-      <el-table-column label="备用列" align="center" prop="spare1"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+    <el-table 
+      tooltip-effect="dark"
+      v-loading="loading"
+      :data="formList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" show-overflow-tooltip/>
+      <el-table-column label="表单主键" align="center" prop="fId" show-overflow-tooltip/>
+      <el-table-column
+        label="表单名称
+"
+        align="center"
+        prop="dfName"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="表单别名
+"
+        align="center"
+        prop="dfNickname"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="表单vue模版"
+        align="center"
+        prop="dfVueTemplate"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="表单html模版"
+        align="center"
+        prop="dfHtmlTemplate"
+        show-overflow-tooltip
+      />
+      <el-table-column label="表单sql" align="center" prop="dfFormSql" show-overflow-tooltip/>
+      <el-table-column label="节点ID" align="center" prop="dfNodeId" show-overflow-tooltip/>
+      <el-table-column
+        label="数据源名称
+"
+        align="center"
+        prop="dfDatabase"
+        show-overflow-tooltip
+      />
+      <el-table-column label="绑定表名称" align="center" prop="dfTableName" show-overflow-tooltip/>
+      <el-table-column label="表单描述" align="center" prop="dfNotes" show-overflow-tooltip/>
+      <el-table-column label="备用列" align="center" prop="spare" show-overflow-tooltip/>
+      <el-table-column label="备用列" align="center" prop="spare1" show-overflow-tooltip/>
+      <el-table-column label="文件路径" align="center" prop="dfFliePath" show-overflow-tooltip/>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -160,7 +225,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['dragform:form:edit']"
-          >修改
+            >修改
           </el-button>
           <el-button
             size="mini"
@@ -168,14 +233,14 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['dragform:form:remove']"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -187,40 +252,48 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="表单名" prop="dfName">
-          <el-input v-model="form.dfName" placeholder="请输入表单名称"/>
+          <el-input v-model="form.dfName" placeholder="请输入表单名称" />
         </el-form-item>
         <el-form-item label="表单别名" prop="dfNickname">
-          <el-input v-model="form.dfNickname" placeholder="请输入表单别名"/>
+          <el-input v-model="form.dfNickname" placeholder="请输入表单别名" />
         </el-form-item>
         <el-form-item label="表单vue模版" prop="dfVueTemplate">
-          <el-input v-model="form.dfVueTemplate" type="textarea" placeholder="请输入内容"/>
+          <el-input
+            v-model="form.dfVueTemplate"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
         <el-form-item label="表单html模版" prop="dfHtmlTemplate">
-          <el-input v-model="form.dfHtmlTemplate" type="textarea" placeholder="请输入内容"/>
+          <el-input
+            v-model="form.dfHtmlTemplate"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
         <el-form-item label="表单sql" prop="dfFormSql">
-          <el-input v-model="form.dfFormSql" placeholder="请输入表单sql"/>
+          <el-input v-model="form.dfFormSql" placeholder="请输入表单sql" />
         </el-form-item>
         <el-form-item label="节点ID" prop="dfNodeId">
-          <el-input v-model="form.dfNodeId" placeholder="请输入节点ID"/>
+          <el-input v-model="form.dfNodeId" placeholder="请输入节点ID" />
         </el-form-item>
         <el-form-item label="数据源名称" prop="dfDatabase">
-          <el-input v-model="form.dfDatabase" placeholder="请输入数据源名称"/>
+          <el-input v-model="form.dfDatabase" placeholder="请输入数据源名称" />
         </el-form-item>
         <el-form-item label="绑定表名称" prop="dfTableName">
-          <el-input v-model="form.dfTableName" placeholder="请输入绑定表名称"/>
+          <el-input v-model="form.dfTableName" placeholder="请输入绑定表名称" />
         </el-form-item>
         <el-form-item label="逻辑删除" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除"/>
+          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除" />
         </el-form-item>
         <el-form-item label="表单描述" prop="dfNotes">
-          <el-input v-model="form.dfNotes" placeholder="请输入表单描述"/>
+          <el-input v-model="form.dfNotes" placeholder="请输入表单描述" />
         </el-form-item>
         <el-form-item label="备用列" prop="spare">
-          <el-input v-model="form.spare" placeholder="请输入备用列"/>
+          <el-input v-model="form.spare" placeholder="请输入备用列" />
         </el-form-item>
         <el-form-item label="备用列" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入备用列"/>
+          <el-input v-model="form.spare1" placeholder="请输入备用列" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -232,11 +305,18 @@
 </template>
 
 <script>
-import {listForm, getForm, delForm, addForm, updateForm} from "@/api/dragform/form";
+import {
+  getListName,
+  getFormName,
+  delForm,
+  addForm,
+  updateForm,
+  listForm
+} from "@/api/dragform/form";
 // import fromModel from '../system/fromModel/index.vue'
 export default {
   name: "Form",
-  
+
   data() {
     return {
       // 遮罩层
@@ -271,23 +351,26 @@ export default {
         dfTableName: null,
         dfNotes: null,
         spare: null,
-        spare1: null
+        spare1: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
     };
   },
   created() {
     this.getList();
+    getFormName(this.$store.state.user.dataSource).then(res=>{
+      console.log(res)
+    });
   },
   methods: {
     /** 查询动态单
      列表 */
     getList() {
       this.loading = true;
-      listForm(this.queryParams).then(response => {
+      listForm(this.queryParams).then((response) => {
         console.log(response);
         this.formList = response.rows;
         this.total = response.total;
@@ -318,7 +401,7 @@ export default {
         updateBy: null,
         updateTime: null,
         spare: null,
-        spare1: null
+        spare1: null,
       };
       this.resetForm("form");
     },
@@ -334,9 +417,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.fId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.fId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -345,22 +428,21 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       const fId = row.fId || this.ids;
-      this.$router.push({name:"fromModel",params:{id:fId}});
+      this.$router.push({ name: "fromModel", params: { id: fId } });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-
-          console.log(this.form)
+          console.log(this.form);
           if (this.form.fId != null) {
-            updateForm(this.form).then(response => {
+            updateForm(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addForm(this.form).then(response => {
+            addForm(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -372,20 +454,28 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const fIds = row.fId || this.ids;
-      this.$modal.confirm('是否确认删除动态单编号为"' + fIds + '"的数据项？').then(function () {
-        return delForm(fIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
+      this.$modal
+        .confirm('是否确认删除动态单编号为"' + fIds + '"的数据项？')
+        .then(function () {
+          return delForm(fIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dragform/form/export', {
-        ...this.queryParams
-      }, `form_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "dragform/form/export",
+        {
+          ...this.queryParams,
+        },
+        `form_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
+