赵殿龙 vor 1 Jahr
Ursprung
Commit
a63ed4ea5b

+ 5 - 0
src/main.js

@@ -39,6 +39,11 @@ Vue.component('Pagination', Pagination)
 //   const { mockXHR } = require('../mock')
 //   mockXHR()
 // }
+
+// 注册全局指令
+import elDragDialog from './directive/el-drag-dialog'
+Vue.use(elDragDialog, { directiveName: 'el-drag-dialog' })
+
 Vue.use(Element, {
   size: Cookies.get('size') || 'small', // set element-ui default size
   i18n: (key, value) => i18n.t(key, value)

+ 1 - 0
src/views/dict/blml/components/CreateDialog.vue

@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-el-drag-dialog
     title="新增"
     :visible.sync="data.bSwitch"
     width="30%"

+ 2 - 1
src/views/dict/blml/components/DictDialog.vue

@@ -105,7 +105,7 @@ export default {
       const { field_name } = this.form
       get_field_detail({ id, parent_field, field_name }).then(res => {
         const { p } = res
-        this.tableData = p
+        this.tableData = Array.isArray(p) ? p : []
       })
     },
     onCreate() {
@@ -124,6 +124,7 @@ export default {
       }).then(() => {
         del_dict({ id: row.id }).then((res) => {
           this.$message.success(res.m || '操作成功')
+          this.$emit('refresh')
         })
       })
     },

+ 4 - 0
src/views/dict/blml/components/EditDictDialog.vue

@@ -1,10 +1,14 @@
 <template>
   <el-dialog
+    v-el-drag-dialog
     title="修改字典"
     :visible.sync="data.bSwitch"
     width="30%"
   >
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="名称" prop="field_name">
+        <el-input v-model="ruleForm.field_name" placeholder="请输入" />
+      </el-form-item>
       <el-form-item label="名称" prop="field_name">
         <el-input v-model="ruleForm.field_name" placeholder="请输入" />
       </el-form-item>

+ 8 - 1
src/views/dict/blml/components/EditFieldDialog.vue

@@ -1,10 +1,17 @@
 <template>
   <el-dialog
+    v-el-drag-dialog
     title="修改字段"
     :visible.sync="data.bSwitch"
     width="30%"
   >
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm" label-suffix=":">
+      <el-form-item label="数据表" prop="">
+        <el-input v-model="data.row.parent_field" placeholder="请输入" disabled />
+      </el-form-item>
+      <el-form-item label="表字段" prop="">
+        <el-input v-model="data.row.field" placeholder="请输入" disabled />
+      </el-form-item>
       <el-form-item label="名称" prop="field_name">
         <el-input v-model="ruleForm.field_name" placeholder="请输入" />
       </el-form-item>

+ 4 - 4
src/views/dict/blml/components/SearchBox.vue

@@ -2,18 +2,18 @@
   <div class="app-container">
     <el-form :inline="true" :model="data" class="demo-form-inline">
       <el-form-item label="">
-        <el-select v-model="data.table" filterable clearable placeholder="数据表">
+        <el-select v-model="data.table" filterable clearable placeholder="请选择数据表">
           <el-option v-for="item of table" :key="item.id" :label="item.field" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="">
-        <el-input v-model="data.field" clearable placeholder="数据库表字段" />
+        <el-input v-model="data.field" clearable placeholder="请输入表字段" />
       </el-form-item>
       <el-form-item label="">
-        <el-input v-model="data.field_name" clearable placeholder="字段名称" />
+        <el-input v-model="data.field_name" clearable placeholder="请输入字段名称" />
       </el-form-item>
       <el-form-item label="">
-        <el-input v-model="data.dict" clearable placeholder="数据字典" />
+        <el-input v-model="data.dict" clearable placeholder="请输入数据字典" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit">查询</el-button>

+ 5 - 4
src/views/dict/blml/components/TableBox.vue

@@ -18,22 +18,22 @@
       />
       <el-table-column
         prop="parent_field"
-        label="数据表"
+        label="数据表"
         align="center"
       />
       <el-table-column
         prop="parent_fildname"
-        label="数据表名称"
+        label="数据表名称"
         align="center"
       />
       <el-table-column
         prop="field"
-        label="数据字段"
+        label="字段"
         align="center"
       />
       <el-table-column
         prop="field_name"
-        label="字段含义"
+        label="字段名称"
         align="center"
       />
       <el-table-column
@@ -147,6 +147,7 @@ export default {
       }).then(() => {
         del_dict({ id: row.id }).then((res) => {
           this.$message.success(res.m || '操作成功')
+          this.$emit('refresh')
         })
       })
     },