From 75111b6690cbf3654aed4a7204137677c19bf412 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Sun, 5 Feb 2023 17:18:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(cli):=20=E4=BF=AE=E5=A4=8D=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=98=A0=E5=B0=84=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj    |  2 +-
 .../TypeScriptServiceProxyGenerator.cs        |  7 ++-
 .../Cli/UI/Vben/VbenModelScriptGenerator.cs   | 54 ++++++++++++++++---
 .../Properties/launchSettings.json            |  4 +-
 4 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj
index e948a6227..52a582fa5 100644
--- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj
+++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj
@@ -5,7 +5,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net7.0</TargetFramework>
-		<Version>7.0.0</Version>
+		<Version>7.0.1</Version>
 		<Copyright>colin</Copyright>
 		<Description>Use LINGYUN.MicroService.Templates command line</Description>
 		<PackAsTool>true</PackAsTool>
diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/TypeScriptServiceProxyGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/TypeScriptServiceProxyGenerator.cs
index ca8e7db70..778b46fa4 100644
--- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/TypeScriptServiceProxyGenerator.cs
+++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/TypeScriptServiceProxyGenerator.cs
@@ -31,7 +31,12 @@ public class TypeScriptServiceProxyGenerator : ServiceProxyGeneratorBase<TypeScr
 
     public async override Task GenerateProxyAsync(Volo.Abp.Cli.ServiceProxying.GenerateProxyArgs args)
     {
-        var applicationApiDescriptionModel = await GetApplicationApiDescriptionModelAsync(args);
+        var applicationApiDescriptionModel = await GetApplicationApiDescriptionModelAsync(
+            args,
+            new Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto
+            {
+                IncludeTypes = true
+            });
         var outputFolderRoot = args.Output;
 
         foreach (var module in applicationApiDescriptionModel.Modules)
diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/UI/Vben/VbenModelScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/UI/Vben/VbenModelScriptGenerator.cs
index c1b982262..5d1ee2060 100644
--- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/UI/Vben/VbenModelScriptGenerator.cs
+++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/UI/Vben/VbenModelScriptGenerator.cs
@@ -178,13 +178,14 @@ public class VbenModelScriptGenerator : IVbenModelScriptGenerator, ISingletonDep
             var component = new ComponentModel
             {
                 Name = inputModelProp.JsonName ?? inputModelProp.Name.ToCamelCase(),
-                Component = "Input",
+                Component = GetComponentType(inputModelProp.Type),
                 DisplayName = "DisplayName:" + inputModelProp.Name.ToPascalCase(),
                 Required = inputModelProp.IsRequired,
                 ColProps = "" +
                 "{" +
                     $"span: {span}" +
                 "}",
+                HasDate = inputModelProp.Type.Contains("DateTime")
             };
 
             if (appModel.Types.TryGetValue(inputModelProp.Type, out var inputModelPropType) &&
@@ -194,7 +195,6 @@ public class VbenModelScriptGenerator : IVbenModelScriptGenerator, ISingletonDep
 
                 var optionsStr = Environment.NewLine;
 
-                var options = new object[inputModelPropType.EnumNames.Length];
                 for (var index = 0; index < inputModelPropType.EnumNames.Length; index++)
                 {
                     optionsStr += "" +
@@ -233,13 +233,14 @@ public class VbenModelScriptGenerator : IVbenModelScriptGenerator, ISingletonDep
             var component = new ComponentModel
             {
                 Name = inputModelProp.JsonName ?? inputModelProp.Name.ToCamelCase(),
-                Component = "Input",
+                Component = GetComponentType(inputModelProp.Type),
                 DisplayName = "DisplayName:" + inputModelProp.Name.ToPascalCase(),
                 Required = !inputModelProp.IsOptional,
                 ColProps = "" +
                 "{" +
                     $"span: {span}" +
                 "}",
+                HasDate = inputModelProp.Type.Contains("DateTime"),
             };
 
             if (appModel.Types.TryGetValue(inputModelProp.Type, out var inputModelPropType) &&
@@ -249,7 +250,6 @@ public class VbenModelScriptGenerator : IVbenModelScriptGenerator, ISingletonDep
 
                 var optionsStr = Environment.NewLine;
 
-                var options = new object[inputModelPropType.EnumNames.Length];
                 for (var index = 0; index < inputModelPropType.EnumNames.Length; index++)
                 {
                     optionsStr += "" +
@@ -321,14 +321,15 @@ public class VbenModelScriptGenerator : IVbenModelScriptGenerator, ISingletonDep
                         var component = new ComponentModel
                         {
                             Name = inputModelProp.JsonName ?? inputModelProp.Name.ToCamelCase(),
-                            Component = "Input",
+                            Component = GetComponentType(inputModelProp.Type),
                             DisplayName = "DisplayName:" + inputModelProp.Name.ToPascalCase(),
                             Required = inputModelProp.IsRequired,
                             ColProps = "" +
                             "{" +
                                 "span: 24" +
                             "}",
-                            ComponentProps = "{}"
+                            ComponentProps = "{}",
+                            HasDate = inputModelProp.Type.Contains("DateTime")
                         };
 
                         if (DisableInputModelFields.Contains(inputModelProp.Name, StringComparer.InvariantCultureIgnoreCase))
@@ -351,14 +352,15 @@ public class VbenModelScriptGenerator : IVbenModelScriptGenerator, ISingletonDep
                 var component = new ComponentModel
                 {
                     Name = modelProp.JsonName ?? modelProp.Name.ToCamelCase(),
-                    Component = "Input",
+                    Component = GetComponentType(modelProp.Type),
                     DisplayName = "DisplayName:" + modelProp.Name.ToPascalCase(),
                     Required = modelProp.IsRequired,
                     ColProps = "" +
                         "{" +
                             "span: 24" +
                         "}",
-                    ComponentProps = "{}"
+                    ComponentProps = "{}",
+                    HasDate = modelProp.Type.Contains("DateTime")
                 };
 
                 if (DisableInputModelFields.Contains(modelProp.Name, StringComparer.InvariantCultureIgnoreCase))
@@ -424,6 +426,40 @@ public class VbenModelScriptGenerator : IVbenModelScriptGenerator, ISingletonDep
 
     protected virtual bool IsAbpBaseType(string typeSimple) => TypeScriptModelGenerator.AbpBaseTypes.Any(typeSimple.StartsWith);
 
+    protected virtual string GetComponentType(string typeSimple)
+    {
+        if (typeSimple.Contains("DateTime"))
+        {
+            return "DatePicker";
+        }
+
+        if (typeSimple.Contains("Boolean"))
+        {
+            return "Checkbox";
+        }
+
+        if (typeSimple.Contains("Enum"))
+        {
+            return "Select";
+        }
+
+        if (typeSimple.Contains("Int") ||
+            typeSimple.Contains("Byte") ||
+            typeSimple.Contains("Single") ||
+            typeSimple.Contains("Double") ||
+            typeSimple.Contains("Decimal"))
+        {
+            return "InputNumber";
+        }
+
+        if (typeSimple.Contains("Object"))
+        {
+            return "CodeEditorX";
+        }
+
+        return "Input";
+    }
+
     protected virtual string GetAbpBaseType(string typeSimple) =>
         TypeScriptModelGenerator.AbpBaseTypes.FirstOrDefault(typeSimple.StartsWith);
 
@@ -476,4 +512,6 @@ public class ComponentModel
     public bool Sorter { get; set; } = true;
     public bool Resizable { get; set; } = true;
     public bool Required { get; set; } = false;
+
+    public bool HasDate { get; set; } = false;
 }
diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/Properties/launchSettings.json b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/Properties/launchSettings.json
index bd56229eb..7fa08e303 100644
--- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/Properties/launchSettings.json
+++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/Properties/launchSettings.json
@@ -2,8 +2,8 @@
   "profiles": {
     "LINGYUN.Abp.Cli": {
       "commandName": "Project",
-      "commandLineArgs": "generate-view -t vben-view -m task-management -o D:\\Projects\\Development\\view-script -url http://127.0.0.1:30000/"
-      // "commandLineArgs": "generate-proxy -t ts -asp vben-dynamic -u http://127.0.0.1:30000 -m task-management -o D:\\Projects\\Development\\type-script"
+      "commandLineArgs": "generate-view -t vben-view -m auditing -o D:\\Projects\\Development\\view-script -url http://127.0.0.1:30000/"
+      //"commandLineArgs": "generate-proxy -t ts -asp vben-dynamic -u http://127.0.0.1:30000 -m platform -o D:\\Projects\\Development\\type-script"
     }
   }
 }
\ No newline at end of file