From d7f6da403f12395bc5ace3b24879481214744aad Mon Sep 17 00:00:00 2001
From: wangchen147 <30853657+wangchen147@users.noreply.github.com>
Date: Sat, 9 Dec 2023 17:21:44 +0800
Subject: [PATCH] 0.0.8

---
 niucloud/app/service/admin/generator/core/ModelGenerator.php | 2 +-
 .../app/service/admin/generator/core/WebEditGenerator.php    | 3 +++
 .../service/admin/generator/core/WebEditPageGenerator.php    | 5 ++++-
 niucloud/app/service/admin/generator/vm/web_edit.vm          | 2 +-
 niucloud/app/service/admin/generator/vm/web_edit_page.vm     | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/niucloud/app/service/admin/generator/core/ModelGenerator.php b/niucloud/app/service/admin/generator/core/ModelGenerator.php
index fcf8c9830..5a06cf2df 100644
--- a/niucloud/app/service/admin/generator/core/ModelGenerator.php
+++ b/niucloud/app/service/admin/generator/core/ModelGenerator.php
@@ -350,7 +350,7 @@ class ModelGenerator extends BaseGenerator
 
                 $waitReplace = [
                     $config['name'],
-                    $config['model'],
+                    '\\'. $config['model'],
                     $config['foreign_key'],
                     $config['local_key'],
                 ];
diff --git a/niucloud/app/service/admin/generator/core/WebEditGenerator.php b/niucloud/app/service/admin/generator/core/WebEditGenerator.php
index 3747e1b94..78fc16699 100644
--- a/niucloud/app/service/admin/generator/core/WebEditGenerator.php
+++ b/niucloud/app/service/admin/generator/core/WebEditGenerator.php
@@ -488,6 +488,9 @@ class WebEditGenerator extends BaseGenerator
                 continue;
             }
             $content.= 'let '.$column['column_name'].'List = ref([])'.PHP_EOL.'const '.$column['column_name'].'DictList = async () => {'.PHP_EOL.$column['column_name'].'List.value = await (await useDictionary(' ."'".$column['dict_type']."'".')).data.dictionary'.PHP_EOL.'}'.PHP_EOL. $column['column_name'].'DictList();'.PHP_EOL;
+            if ($column['view_type'] == 'radio' || $column['view_type'] == 'select') {
+                $content .= 'watch(() => '.$column['column_name'].'List.value, () => { formData.'.$column['column_name'].' = '.$column['column_name'].'List.value[0].value })'.PHP_EOL;
+            }
         }
 
         if(!empty($content))
diff --git a/niucloud/app/service/admin/generator/core/WebEditPageGenerator.php b/niucloud/app/service/admin/generator/core/WebEditPageGenerator.php
index b0091eb26..b4f4417ee 100644
--- a/niucloud/app/service/admin/generator/core/WebEditPageGenerator.php
+++ b/niucloud/app/service/admin/generator/core/WebEditPageGenerator.php
@@ -110,6 +110,9 @@ class WebEditPageGenerator extends BaseGenerator
                 continue;
             }
             $content.= 'let '.$column['column_name'].'List = ref([])'.PHP_EOL.'const '.$column['column_name'].'DictList = async () => {'.PHP_EOL.$column['column_name'].'List.value = await (await useDictionary(' ."'".$column['dict_type']."'".')).data.dictionary'.PHP_EOL.'}'.PHP_EOL. $column['column_name'].'DictList();'.PHP_EOL;
+            if ($column['view_type'] == 'radio' || $column['view_type'] == 'select') {
+                $content .= 'watch(() => '.$column['column_name'].'List.value, () => { formData.'.$column['column_name'].' = '.$column['column_name'].'List.value[0].value })'.PHP_EOL;
+            }
         }
 
         if(!empty($content))
@@ -199,7 +202,7 @@ class WebEditPageGenerator extends BaseGenerator
                 $vmItemValue = 'item.value';
                 $intFieldValue = ['tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint'];
                 if (in_array($column['column_type'], $intFieldValue)) {
-                    $vmItemValue = 'parseInt(item.value)';
+                    $vmItemValue = 'item.value';
                 }
                 $old[] = '{ITEM_VALUE}';
                 $new[] = $vmItemValue;
diff --git a/niucloud/app/service/admin/generator/vm/web_edit.vm b/niucloud/app/service/admin/generator/vm/web_edit.vm
index ec96d20c5..b8ce1c735 100644
--- a/niucloud/app/service/admin/generator/vm/web_edit.vm
+++ b/niucloud/app/service/admin/generator/vm/web_edit.vm
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, computed, watch } from 'vue'
 import { useDictionary } from '@/app/api/dict'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
diff --git a/niucloud/app/service/admin/generator/vm/web_edit_page.vm b/niucloud/app/service/admin/generator/vm/web_edit_page.vm
index 5e7aba099..cc05eb750 100644
--- a/niucloud/app/service/admin/generator/vm/web_edit_page.vm
+++ b/niucloud/app/service/admin/generator/vm/web_edit_page.vm
@@ -23,7 +23,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, computed, watch } from 'vue'
 import { t } from '@/lang'
 import { useDictionary } from '@/app/api/dict'
 import type { FormInstance } from 'element-plus'
@@ -36,6 +36,7 @@ const loading = ref(false)
 const pageName = route.meta.title
 
 
+
 /**
  * 表单数据
  */