数据字典加入表单设计器中

BoBoooooo · Feb 5, 2019 · 4b3af31 · 4b3af31
1 parent deb24a3
commit 4b3af31
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 28 deletions.
diff --git a/src/api/system/dicttype.js b/src/api/system/dicttype.js
@@ -1,10 +1,9 @@
 import fetch from '@/utils/fetch'
 
-export function DictTypeList(params) {
+export function DictTypeList() {
   return fetch({
     url: '/dicttype/list',
     method: 'post',
-    params,
   })
 }
 

diff --git a/src/components/FormDesigner/GenerateFormItem.vue b/src/components/FormDesigner/GenerateFormItem.vue
@@ -205,15 +205,30 @@ export default {
     //   })
     // }
     if (this.widget.options.remote && this.widget.options.remoteOptions) {
-      this.axios({
-        url: this.widget.options.remoteFunc,
-        method: 'post',
-      }).then((res) => {
-        this.widget.options.remoteOptions = res.data.list.map(item => ({
-          value: item[this.widget.options.props.value],
-          label: item[this.widget.options.props.label],
-        }))
-      })
+      if (this.widget.options.remoteFunc !== '') {
+        this.axios({
+          url: this.widget.options.remoteFunc,
+          method: 'post',
+        }).then((res) => {
+          this.widget.options.remoteOptions = res.data.list.map(item => ({
+            value: item[this.widget.options.props.value],
+            label: item[this.widget.options.props.label],
+          }))
+        })
+      } else {
+        this.axios({
+          url: '/dict/getDictByKey',
+          method: 'post',
+          params: {
+            DictID: this.widget.options.dictID,
+          },
+        }).then((res) => {
+          this.widget.options.remoteOptions = res.data.map(item => ({
+            value: item.value,
+            label: item.title,
+          }))
+        })
+      }
     }
   },
 }

diff --git a/src/components/FormDesigner/WidgetConfig.vue b/src/components/FormDesigner/WidgetConfig.vue
@@ -136,6 +136,17 @@
               style="">
               <template slot="prepend">标签</template>
             </el-input>
+
+            <el-select
+              v-model="data.options.dictID"
+              filterable>
+                <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+                </el-option>
+            </el-select>
           </div>
         </template>
         <template v-else>
@@ -334,22 +345,6 @@
         </el-form-item>
       </template>
 
-      <template v-if="data.type=='blank'">
-        <el-form-item label="绑定数据类型">
-          <el-select v-model="data.options.defaultType">
-            <el-option
-              value="String"
-              label="字符"/>
-            <el-option
-              value="Object"
-              label="对象"/>
-            <el-option
-              value="Array"
-              label="数组"/>
-          </el-select>
-        </el-form-item>
-      </template>
-
       <template v-if="data.type == 'grid'">
         <el-form-item label="栅格间隔">
           <el-input
@@ -516,6 +511,7 @@ import 'vue-awesome/icons/toggle-off'
 import 'vue-awesome/icons/sliders-h'
 import 'vue-awesome/icons/regular/image'
 import 'vue-awesome/icons/chalkboard'
+import { DictTypeList } from '@/api/system/dicttype'
 
 export default {
   components: {
@@ -532,8 +528,14 @@ export default {
         range: null,
         length: null,
       },
+      options: [],
     }
   },
+  created() {
+    DictTypeList().then((res) => {
+      this.options = res.data.filter(item => item.name !== '数据字典')
+    })
+  },
   computed: {
     show() {
       if (this.data && Object.keys(this.data).length > 0) {

diff --git a/src/components/FormDesigner/WidgetForm.vue b/src/components/FormDesigner/WidgetForm.vue
@@ -153,7 +153,7 @@ export default {
         ...this.data.list[newIndex],
         options: {
           ...this.data.list[newIndex].options,
-          remoteFunc: `func_${key}`,
+          remoteFunc: '',
         },
         key,
         // 绑定键值

diff --git a/src/components/FormDesigner/componentsConfig.js b/src/components/FormDesigner/componentsConfig.js
@@ -186,6 +186,7 @@ export const basicComponents = [
         label: 'label',
       },
       remoteFunc: '',
+      dictID: '',
     },
   },
   {