From c8e8e604d2655735e4e8dbdb6951c9d5d3f05850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 24 Aug 2023 14:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B0=94=E7=B1=BB=E5=9E=8B=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=97=B6=E5=80=99=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9E=9A=E4=B8=BElist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addEditFromApiPop/index.vue    | 20 +------------------
 .../src/components/umyTable/index.vue         | 20 +------------------
 .../src/store/modules/definition.js           |  9 +++++++++
 .../components/addEditFromApiPop/index.vue    | 20 +------------------
 .../src/components/umyTable/index.vue         | 20 +------------------
 .../src/store/modules/definition.js           |  9 +++++++++
 .../components/addEditFromApiPop/index.vue    | 20 +------------------
 .../src/components/umyTable/index.vue         | 20 +------------------
 .../src/store/modules/definition.js           |  9 +++++++++
 9 files changed, 33 insertions(+), 114 deletions(-)

diff --git a/PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue b/PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue
index bac7a2f..29fb3b6 100644
--- a/PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue
+++ b/PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue
@@ -69,7 +69,7 @@
                     :disabled="Boolean(item.disabled)"
                   >
                     <el-option
-                      v-for="item in getItemEnums(item)"
+                      v-for="item in item.enums_list"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -247,24 +247,6 @@ export default {
         }
       })
     },
-    // 获取枚举、布尔
-    getItemEnums(item){
-      let _option = []
-      // 布尔
-      if(item.apiBaseType == 'boolean'){
-        _option = [{
-          value: true,
-          label: '是'
-        },{
-          value: false,
-          label: '否'
-        },]
-      }
-      if(item.isEnums){
-        _option = item.enums_list
-      }
-      return _option
-    },
     // 关闭弹窗
     close() {
       this.show = false
diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue
index 7305eaf..aaad8fc 100644
--- a/PC/InterFace.Dash/src/components/umyTable/index.vue
+++ b/PC/InterFace.Dash/src/components/umyTable/index.vue
@@ -94,7 +94,7 @@
             size="mini"
           >
             <el-option
-              v-for="item in getItemEnums(item)"
+              v-for="item in item.enums_list"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -681,24 +681,6 @@ export default {
       if(type == 'detail')this.showDetailInfo(row)
       if(type == 'json')this.showJsonTable(row)
     },
-    // 可编辑表单：获取枚举、布尔
-    getItemEnums(item){
-      let _option = []
-      // 布尔
-      if(item.apiBaseType == 'boolean'){
-        _option = [{
-          value: true,
-          label: '是'
-        },{
-          value: false,
-          label: '否'
-        },]
-      }
-      if(item.isEnums){
-        _option = item.enums_list
-      }
-      return _option
-    },
     // 可编辑表单：值更改函数
     changeValue(prop,item,val) {
       this.$emit("changeValue", prop, item, val)
diff --git a/PC/InterFace.Dash/src/store/modules/definition.js b/PC/InterFace.Dash/src/store/modules/definition.js
index 1a6dfb4..a016ce9 100644
--- a/PC/InterFace.Dash/src/store/modules/definition.js
+++ b/PC/InterFace.Dash/src/store/modules/definition.js
@@ -63,6 +63,15 @@ export function initDtoTypesAndEnums(res,typeName,apiName) {
                     d.enums_list.push({value:e,label:enums_list.enumNames[key]})
                 })
             }
+        }else if(d.typeSimple.indexOf('boolean') >= 0){
+            d.apiBaseType = 'boolean'
+            d.enums_list = [{
+                value: true,
+                label: '是'
+            },{
+                value: false,
+                label: '否'
+            }]
         }else{
             if(d.typeSimple == 'number' || d.typeSimple == 'number?'){
                 d.apiBaseType='number'
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/addEditFromApiPop/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/addEditFromApiPop/index.vue
index bac7a2f..29fb3b6 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/addEditFromApiPop/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/addEditFromApiPop/index.vue
@@ -69,7 +69,7 @@
                     :disabled="Boolean(item.disabled)"
                   >
                     <el-option
-                      v-for="item in getItemEnums(item)"
+                      v-for="item in item.enums_list"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -247,24 +247,6 @@ export default {
         }
       })
     },
-    // 获取枚举、布尔
-    getItemEnums(item){
-      let _option = []
-      // 布尔
-      if(item.apiBaseType == 'boolean'){
-        _option = [{
-          value: true,
-          label: '是'
-        },{
-          value: false,
-          label: '否'
-        },]
-      }
-      if(item.isEnums){
-        _option = item.enums_list
-      }
-      return _option
-    },
     // 关闭弹窗
     close() {
       this.show = false
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue
index 7305eaf..aaad8fc 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue
@@ -94,7 +94,7 @@
             size="mini"
           >
             <el-option
-              v-for="item in getItemEnums(item)"
+              v-for="item in item.enums_list"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -681,24 +681,6 @@ export default {
       if(type == 'detail')this.showDetailInfo(row)
       if(type == 'json')this.showJsonTable(row)
     },
-    // 可编辑表单：获取枚举、布尔
-    getItemEnums(item){
-      let _option = []
-      // 布尔
-      if(item.apiBaseType == 'boolean'){
-        _option = [{
-          value: true,
-          label: '是'
-        },{
-          value: false,
-          label: '否'
-        },]
-      }
-      if(item.isEnums){
-        _option = item.enums_list
-      }
-      return _option
-    },
     // 可编辑表单：值更改函数
     changeValue(prop,item,val) {
       this.$emit("changeValue", prop, item, val)
diff --git a/PC/UI.WinIn.FasterZ.Job/src/store/modules/definition.js b/PC/UI.WinIn.FasterZ.Job/src/store/modules/definition.js
index 1a6dfb4..a016ce9 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/store/modules/definition.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/store/modules/definition.js
@@ -63,6 +63,15 @@ export function initDtoTypesAndEnums(res,typeName,apiName) {
                     d.enums_list.push({value:e,label:enums_list.enumNames[key]})
                 })
             }
+        }else if(d.typeSimple.indexOf('boolean') >= 0){
+            d.apiBaseType = 'boolean'
+            d.enums_list = [{
+                value: true,
+                label: '是'
+            },{
+                value: false,
+                label: '否'
+            }]
         }else{
             if(d.typeSimple == 'number' || d.typeSimple == 'number?'){
                 d.apiBaseType='number'
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/addEditFromApiPop/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/addEditFromApiPop/index.vue
index bac7a2f..29fb3b6 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/addEditFromApiPop/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/addEditFromApiPop/index.vue
@@ -69,7 +69,7 @@
                     :disabled="Boolean(item.disabled)"
                   >
                     <el-option
-                      v-for="item in getItemEnums(item)"
+                      v-for="item in item.enums_list"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -247,24 +247,6 @@ export default {
         }
       })
     },
-    // 获取枚举、布尔
-    getItemEnums(item){
-      let _option = []
-      // 布尔
-      if(item.apiBaseType == 'boolean'){
-        _option = [{
-          value: true,
-          label: '是'
-        },{
-          value: false,
-          label: '否'
-        },]
-      }
-      if(item.isEnums){
-        _option = item.enums_list
-      }
-      return _option
-    },
     // 关闭弹窗
     close() {
       this.show = false
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue
index 7305eaf..aaad8fc 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue
@@ -94,7 +94,7 @@
             size="mini"
           >
             <el-option
-              v-for="item in getItemEnums(item)"
+              v-for="item in item.enums_list"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -681,24 +681,6 @@ export default {
       if(type == 'detail')this.showDetailInfo(row)
       if(type == 'json')this.showJsonTable(row)
     },
-    // 可编辑表单：获取枚举、布尔
-    getItemEnums(item){
-      let _option = []
-      // 布尔
-      if(item.apiBaseType == 'boolean'){
-        _option = [{
-          value: true,
-          label: '是'
-        },{
-          value: false,
-          label: '否'
-        },]
-      }
-      if(item.isEnums){
-        _option = item.enums_list
-      }
-      return _option
-    },
     // 可编辑表单：值更改函数
     changeValue(prop,item,val) {
       this.$emit("changeValue", prop, item, val)
diff --git a/PC/UI.WinIn.FasterZ.Store/src/store/modules/definition.js b/PC/UI.WinIn.FasterZ.Store/src/store/modules/definition.js
index 1a6dfb4..a016ce9 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/store/modules/definition.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/store/modules/definition.js
@@ -63,6 +63,15 @@ export function initDtoTypesAndEnums(res,typeName,apiName) {
                     d.enums_list.push({value:e,label:enums_list.enumNames[key]})
                 })
             }
+        }else if(d.typeSimple.indexOf('boolean') >= 0){
+            d.apiBaseType = 'boolean'
+            d.enums_list = [{
+                value: true,
+                label: '是'
+            },{
+                value: false,
+                label: '否'
+            }]
         }else{
             if(d.typeSimple == 'number' || d.typeSimple == 'number?'){
                 d.apiBaseType='number'