Merge pull request #793 from flipped-aurora/update

修复字典相关的bug

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(),

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(),

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
 }
 

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 {

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',