From cd5fc3e6c0d8eff54ea6b7619ee1a73c616b750c Mon Sep 17 00:00:00 2001
From: panzhenglong <panzhenglong@chandashi.com>
Date: Thu, 28 Oct 2021 11:20:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3echarts=E5=92=8Cvue?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/dashboard/dashbordCharts/echartsLine.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/view/dashboard/dashbordCharts/echartsLine.vue b/web/src/view/dashboard/dashbordCharts/echartsLine.vue
index 6e2f5055..99270db8 100644
--- a/web/src/view/dashboard/dashbordCharts/echartsLine.vue
+++ b/web/src/view/dashboard/dashbordCharts/echartsLine.vue
@@ -11,6 +11,7 @@
 </template>
 <script>
 import echarts from 'echarts'
+import { toRaw } from 'vue'
 import 'echarts/theme/macarons'
 
 var dataAxis = []
@@ -64,7 +65,7 @@ export default {
       this.setOptions()
     },
     setOptions() {
-      this.chart.setOption({
+      toRaw(this.chart).setOption({
         grid: {
           left: '40',
           right: '20',

From 5e18f94f9a72763b8a4f5e2e8ddeb607b9859702 Mon Sep 17 00:00:00 2001
From: piexl <303176530@qq.com>
Date: Mon, 8 Nov 2021 14:36:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=80=A7=E5=88=AB?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=88=9D=E5=A7=8B=E6=95=B0=E6=8D=AE=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BD=9C=E5=BA=9F=E6=97=A0=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20#791=20=E5=8F=98=E6=9B=B4=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=80=BC=E4=B8=BAundefined=20#792?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/template/web/form.vue.tpl  | 2 +-
 server/resource/template/web/table.vue.tpl | 4 ++--
 server/service/system/sys_dictionary.go    | 2 +-
 server/source/dictionary_details.go        | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/resource/template/web/form.vue.tpl b/server/resource/template/web/form.vue.tpl
index c3486c13..dc607dae 100644
--- a/server/resource/template/web/form.vue.tpl
+++ b/server/resource/template/web/form.vue.tpl
@@ -63,7 +63,7 @@ export default {
         {{.FieldJson}}: '',
           {{- end }}
           {{- if eq .FieldType "int" }}
-        {{.FieldJson}}: 0,
+        {{.FieldJson}}: {{- if .DictType }} undefined{{ else }} 0{{- end }},
           {{- end }}
           {{- if eq .FieldType "time.Time" }}
         {{.FieldJson}}: new Date(),
diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl
index 5b0c1fa5..2999607e 100644
--- a/server/resource/template/web/table.vue.tpl
+++ b/server/resource/template/web/table.vue.tpl
@@ -158,7 +158,7 @@ export default {
         {{.FieldJson}}: '',
       {{- end }}
       {{- if eq .FieldType "int" }}
-        {{.FieldJson}}: 0,
+        {{.FieldJson}}: {{- if .DictType}} undefined{{ else }} 0{{- end }},
       {{- end }}
       {{- if eq .FieldType "time.Time" }}
         {{.FieldJson}}: new Date(),
@@ -249,7 +249,7 @@ export default {
         {{.FieldJson}}: '',
         {{- end }}
         {{- if eq .FieldType "int" }}
-        {{.FieldJson}}: 0,
+        {{.FieldJson}}: {{- if .DictType }} undefined{{ else }} 0{{- end }},
         {{- end }}
         {{- if eq .FieldType "time.Time" }}
         {{.FieldJson}}: new Date(),
diff --git a/server/service/system/sys_dictionary.go b/server/service/system/sys_dictionary.go
index 4dfc9601..d2be5bfe 100644
--- a/server/service/system/sys_dictionary.go
+++ b/server/service/system/sys_dictionary.go
@@ -68,7 +68,7 @@ func (dictionaryService *DictionaryService) UpdateSysDictionary(sysDictionary *s
 //@return: err error, sysDictionary model.SysDictionary
 
 func (dictionaryService *DictionaryService) GetSysDictionary(Type string, Id uint) (err error, sysDictionary system.SysDictionary) {
-	err = global.GVA_DB.Where("type = ? OR id = ?", Type, Id).Preload("SysDictionaryDetails").First(&sysDictionary).Error
+	err = global.GVA_DB.Where("type = ? OR id = ? and status = ?", Type, Id, true).Preload("SysDictionaryDetails", "status = ?", true).First(&sysDictionary).Error
 	return
 }
 
diff --git a/server/source/dictionary_details.go b/server/source/dictionary_details.go
index 96066a32..254fbe5e 100644
--- a/server/source/dictionary_details.go
+++ b/server/source/dictionary_details.go
@@ -41,6 +41,8 @@ func (d *dictionaryDetail) Init() error {
 		{global.GVA_MODEL{ID: 21, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "longblob", 8, status, 8, 5},
 		{global.GVA_MODEL{ID: 22, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "longtext", 9, status, 9, 5},
 		{global.GVA_MODEL{ID: 23, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "tinyint", 0, status, 0, 6},
+		{global.GVA_MODEL{ID: 24, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "男", 0, status, 0, 1},
+		{global.GVA_MODEL{ID: 25, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "女", 1, status, 1, 1},
 	}
 	return global.GVA_DB.Transaction(func(tx *gorm.DB) error {
 		if tx.Where("id IN ?", []int{1, 23}).Find(&[]system.SysDictionaryDetail{}).RowsAffected == 2 {