From 158be4a5174f16c0df2463b51d537d0dba6ff913 Mon Sep 17 00:00:00 2001
From: FE_Daizhen <934621328@qq.com>
Date: Tue, 10 May 2022 23:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86-05102344?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/content-edit.vue | 9 ++++-----
 src/views/content/content-list.vue | 8 +++++++-
 src/views/content/create_form.js   | 8 ++++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/content/content-edit.vue b/src/views/content/content-edit.vue
index 60f562a..440ee5d 100644
--- a/src/views/content/content-edit.vue
+++ b/src/views/content/content-edit.vue
@@ -60,19 +60,18 @@ import TinymceEditor from '@/components/TinymceEditor';
             const formVal = {}
             const formNull = {}
             if (data) {
-              // this.formArr = []
               for(let i in data){
                 let flag = Object.keys(this.formApi.form).includes(i);
                 if (flag) {
-                  let iStr = i + '_str'
-                  if (Object.keys(data).includes(iStr)) {
-                    formVal[i] = data[iStr]
+                  let eRule = this.formApi.getRule(i)
+                  if (eRule.type === 'select') {
+                    formVal[i] = data[i].toString()
                   } else {
                     formVal[i] = data[i]
                   }
+                  // formVal[i] = data[i].toString()
                   this.formApi.setValue(formVal)
                   formNull[i] = ''
-                  // this.formArr.push(i)
                 }
               }
               this.isUpdate = true;
diff --git a/src/views/content/content-list.vue b/src/views/content/content-list.vue
index b4d865b..339760c 100644
--- a/src/views/content/content-list.vue
+++ b/src/views/content/content-list.vue
@@ -129,6 +129,8 @@ export default {
       },
       // 编辑弹窗配置
       edit_rule: null,
+      // 表单规则存储
+      ruleStorage: {},
       // 当前编辑数据
       current: null,
       // 是否显示编辑弹窗
@@ -174,7 +176,9 @@ export default {
       })
       // console.log(res.data.content_data);
       // console.log(res.data.field_info.editFields);
-      this.edit_rule = getForm(res.data.field_info.editFields);
+      this.ruleStorage.add = getForm(res.data.field_info.add_fields)
+      this.ruleStorage.edit = getForm(res.data.field_info.editFields)
+      // this.edit_rule = getForm(res.data.field_info.editFields)
       return {
         // 默认code为0是成功，比如接口code: 200是成功，可以这样改为0
         code: res.code === 200 ? 0 : res.code,
@@ -193,8 +197,10 @@ export default {
     openEdit(row) {
       if (row) {
         this.current = row;
+        this.edit_rule = this.ruleStorage.edit
       } else {
         this.current = null;
+        this.edit_rule = this.ruleStorage.add
       }
       this.showEdit = true;
     },
diff --git a/src/views/content/create_form.js b/src/views/content/create_form.js
index 3a3ff78..320b5c8 100644
--- a/src/views/content/create_form.js
+++ b/src/views/content/create_form.js
@@ -14,8 +14,12 @@ export function getForm(valNew) {
     }
     eItem.props = {
       type: 'text',
+      clearable: true,
       placeholder: e.placeholder,
     }
+    if (e.disabled) {
+      eItem.props.disabled = true
+    }
     if (e.type === 'hidden') {
       eItem.type = 'hidden'
     }
@@ -28,8 +32,8 @@ export function getForm(valNew) {
     if (e.type === 'radio') {
       eItem.type = 'switch'
       eItem.props = {
-        activeValue: '1',
-        inactiveValue: '0'
+        activeValue: 1,
+        inactiveValue: 0
       }
     }
     if (e.type === 'number') {