From e78433d5accbbd9bc46671b9cf395e3d2b37c8ef Mon Sep 17 00:00:00 2001 From: met Date: Fri, 17 Jun 2022 13:56:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E6=A8=A1=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0monaco-editor=202.=E5=8D=87=E7=BA=A7=E5=88=B06.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Apis/CodeTableApp/CodeTableController.cs | 2 +- SoEasyPlatform/Code/AppStart/Services.cs | 12 +- SoEasyPlatform/Pages/Template.cshtml | 4 +- SoEasyPlatform/Program.cs | 44 +- SoEasyPlatform/SoEasyPlatform.csproj | 117 +- SoEasyPlatform/Startup.cs | 66 +- .../monaco-editor/csharpLanguageProvider.js | 92 + .../vendors/monaco-editor/monaco-editor.html | 49 + .../browser/ui/codicons/codicon/codicon.ttf | Bin 0 -> 70776 bytes .../vs/base/worker/workerMain.js | 22 + .../vs/basic-languages/abap/abap.js | 10 + .../vs/basic-languages/apex/apex.js | 10 + .../vs/basic-languages/azcli/azcli.js | 10 + .../vs/basic-languages/bat/bat.js | 10 + .../vs/basic-languages/bicep/bicep.js | 11 + .../vs/basic-languages/cameligo/cameligo.js | 10 + .../vs/basic-languages/clojure/clojure.js | 10 + .../vs/basic-languages/coffee/coffee.js | 10 + .../vs/basic-languages/cpp/cpp.js | 10 + .../vs/basic-languages/csharp/csharp.js | 10 + .../vs/basic-languages/csp/csp.js | 10 + .../vs/basic-languages/css/css.js | 12 + .../vs/basic-languages/dart/dart.js | 10 + .../basic-languages/dockerfile/dockerfile.js | 10 + .../vs/basic-languages/ecl/ecl.js | 10 + .../vs/basic-languages/elixir/elixir.js | 10 + .../vs/basic-languages/flow9/flow9.js | 10 + .../freemarker2/freemarker2.js | 12 + .../vs/basic-languages/fsharp/fsharp.js | 10 + .../monaco-editor/vs/basic-languages/go/go.js | 10 + .../vs/basic-languages/graphql/graphql.js | 10 + .../basic-languages/handlebars/handlebars.js | 10 + .../vs/basic-languages/hcl/hcl.js | 10 + .../vs/basic-languages/html/html.js | 10 + .../vs/basic-languages/ini/ini.js | 10 + .../vs/basic-languages/java/java.js | 10 + .../basic-languages/javascript/javascript.js | 10 + .../vs/basic-languages/julia/julia.js | 10 + .../vs/basic-languages/kotlin/kotlin.js | 10 + .../vs/basic-languages/less/less.js | 11 + .../vs/basic-languages/lexon/lexon.js | 10 + .../vs/basic-languages/liquid/liquid.js | 10 + .../vs/basic-languages/lua/lua.js | 10 + .../monaco-editor/vs/basic-languages/m3/m3.js | 10 + .../vs/basic-languages/markdown/markdown.js | 10 + .../vs/basic-languages/mips/mips.js | 10 + .../vs/basic-languages/msdax/msdax.js | 10 + .../vs/basic-languages/mysql/mysql.js | 10 + .../objective-c/objective-c.js | 10 + .../vs/basic-languages/pascal/pascal.js | 10 + .../vs/basic-languages/pascaligo/pascaligo.js | 10 + .../vs/basic-languages/perl/perl.js | 10 + .../vs/basic-languages/pgsql/pgsql.js | 10 + .../vs/basic-languages/php/php.js | 10 + .../vs/basic-languages/pla/pla.js | 10 + .../vs/basic-languages/postiats/postiats.js | 10 + .../basic-languages/powerquery/powerquery.js | 10 + .../basic-languages/powershell/powershell.js | 10 + .../vs/basic-languages/protobuf/protobuf.js | 11 + .../vs/basic-languages/pug/pug.js | 10 + .../vs/basic-languages/python/python.js | 10 + .../vs/basic-languages/qsharp/qsharp.js | 10 + .../monaco-editor/vs/basic-languages/r/r.js | 10 + .../vs/basic-languages/razor/razor.js | 10 + .../vs/basic-languages/redis/redis.js | 10 + .../vs/basic-languages/redshift/redshift.js | 10 + .../restructuredtext/restructuredtext.js | 10 + .../vs/basic-languages/ruby/ruby.js | 10 + .../vs/basic-languages/rust/rust.js | 10 + .../monaco-editor/vs/basic-languages/sb/sb.js | 10 + .../vs/basic-languages/scala/scala.js | 10 + .../vs/basic-languages/scheme/scheme.js | 10 + .../vs/basic-languages/scss/scss.js | 12 + .../vs/basic-languages/shell/shell.js | 10 + .../vs/basic-languages/solidity/solidity.js | 10 + .../vs/basic-languages/sophia/sophia.js | 10 + .../vs/basic-languages/sparql/sparql.js | 10 + .../vs/basic-languages/sql/sql.js | 10 + .../monaco-editor/vs/basic-languages/st/st.js | 10 + .../vs/basic-languages/swift/swift.js | 13 + .../systemverilog/systemverilog.js | 10 + .../vs/basic-languages/tcl/tcl.js | 10 + .../vs/basic-languages/twig/twig.js | 10 + .../basic-languages/typescript/typescript.js | 10 + .../monaco-editor/vs/basic-languages/vb/vb.js | 10 + .../vs/basic-languages/xml/xml.js | 10 + .../vs/basic-languages/yaml/yaml.js | 10 + .../monaco-editor/vs/editor/editor.main.css | 6 + .../monaco-editor/vs/editor/editor.main.js | 805 + .../vs/editor/editor.main.nls.de.js | 29 + .../vs/editor/editor.main.nls.es.js | 29 + .../vs/editor/editor.main.nls.fr.js | 27 + .../vs/editor/editor.main.nls.it.js | 27 + .../vs/editor/editor.main.nls.ja.js | 29 + .../vs/editor/editor.main.nls.js | 27 + .../vs/editor/editor.main.nls.ko.js | 27 + .../vs/editor/editor.main.nls.ru.js | 29 + .../vs/editor/editor.main.nls.zh-cn.js | 29 + .../vs/editor/editor.main.nls.zh-tw.js | 27 + .../monaco-editor/vs/language/css/cssMode.js | 13 + .../vs/language/css/cssWorker.js | 63 + .../vs/language/html/htmlMode.js | 13 + .../vs/language/html/htmlWorker.js | 453 + .../vs/language/json/jsonMode.js | 15 + .../vs/language/json/jsonWorker.js | 36 + .../vs/language/typescript/tsMode.js | 20 + .../vs/language/typescript/tsWorker.js | 33970 ++++++++++++++++ .../vendors/monaco-editor/vs/loader.js | 11 + .../wwwroot/views/system/template.js | 4 + 109 files changed, 36775 insertions(+), 104 deletions(-) create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/csharpLanguageProvider.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/monaco-editor.html create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/base/browser/ui/codicons/codicon/codicon.ttf create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/base/worker/workerMain.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/abap/abap.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/apex/apex.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/azcli/azcli.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/bat/bat.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/bicep/bicep.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/cameligo/cameligo.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/clojure/clojure.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/coffee/coffee.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/cpp/cpp.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/csharp/csharp.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/csp/csp.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/css/css.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/dart/dart.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/dockerfile/dockerfile.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/ecl/ecl.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/elixir/elixir.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/flow9/flow9.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/freemarker2/freemarker2.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/fsharp/fsharp.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/go/go.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/graphql/graphql.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/handlebars/handlebars.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/hcl/hcl.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/html/html.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/ini/ini.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/java/java.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/javascript/javascript.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/julia/julia.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/kotlin/kotlin.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/less/less.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/lexon/lexon.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/liquid/liquid.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/lua/lua.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/m3/m3.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/markdown/markdown.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/mips/mips.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/msdax/msdax.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/mysql/mysql.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/objective-c/objective-c.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/pascal/pascal.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/pascaligo/pascaligo.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/perl/perl.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/pgsql/pgsql.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/php/php.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/pla/pla.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/postiats/postiats.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/powerquery/powerquery.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/powershell/powershell.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/protobuf/protobuf.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/pug/pug.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/python/python.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/qsharp/qsharp.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/r/r.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/razor/razor.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/redis/redis.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/redshift/redshift.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/restructuredtext/restructuredtext.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/ruby/ruby.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/rust/rust.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/sb/sb.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/scala/scala.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/scheme/scheme.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/scss/scss.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/shell/shell.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/solidity/solidity.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/sophia/sophia.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/sparql/sparql.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/sql/sql.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/st/st.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/swift/swift.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/systemverilog/systemverilog.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/tcl/tcl.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/twig/twig.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/typescript/typescript.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/vb/vb.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/xml/xml.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/basic-languages/yaml/yaml.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.css create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.de.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.es.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.fr.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.it.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.ja.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.ko.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.ru.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.zh-cn.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/editor/editor.main.nls.zh-tw.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/language/css/cssMode.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/language/css/cssWorker.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/language/html/htmlMode.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/language/html/htmlWorker.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/language/json/jsonMode.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/language/json/jsonWorker.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/language/typescript/tsMode.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/language/typescript/tsWorker.js create mode 100644 SoEasyPlatform/wwwroot/vendors/monaco-editor/vs/loader.js diff --git a/SoEasyPlatform/Apis/CodeTableApp/CodeTableController.cs b/SoEasyPlatform/Apis/CodeTableApp/CodeTableController.cs index 50fcb0b..4dc1818 100644 --- a/SoEasyPlatform/Apis/CodeTableApp/CodeTableController.cs +++ b/SoEasyPlatform/Apis/CodeTableApp/CodeTableController.cs @@ -352,7 +352,7 @@ namespace SoEasyPlatform.Apis var tableDb = base.GetTryDb(dbid); var dts = Export(model, tableDb); var bytes = Table_ToExcel.ExportExcel(dts, "数据库文档.xlsx"); - var url = FileSugar.MergeUrl(Startup.GetCurrentDirectory(), "excel/数据库文档" + SqlSugar.SnowFlakeSingle.Instance.getID() + ".xlsx"); + var url = FileSugar.MergeUrl(Startup.CurrentDirectory, "excel/数据库文档" + SqlSugar.SnowFlakeSingle.Instance.getID() + ".xlsx"); FileSugar.CreateFile(url, bytes); OpenPath(url); return result; diff --git a/SoEasyPlatform/Code/AppStart/Services.cs b/SoEasyPlatform/Code/AppStart/Services.cs index 97900b1..90e45e4 100644 --- a/SoEasyPlatform/Code/AppStart/Services.cs +++ b/SoEasyPlatform/Code/AppStart/Services.cs @@ -1,13 +1,8 @@ -using AutoMapper; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -namespace SoEasyPlatform +namespace SoEasyPlatform { public class Services { @@ -18,8 +13,7 @@ namespace SoEasyPlatform services.AddAutoMapper(typeof(SoEasyPlatform.MapperProfiles).Assembly); #if DEBUG //启用动态编译 - services.AddControllersWithViews() - .AddRazorRuntimeCompilation(); + services.AddControllersWithViews().AddRazorRuntimeCompilation(); #endif services.AddControllersWithViews().AddNewtonsoftJson(opt => { diff --git a/SoEasyPlatform/Pages/Template.cshtml b/SoEasyPlatform/Pages/Template.cshtml index 1b7242d..0481dd4 100644 --- a/SoEasyPlatform/Pages/Template.cshtml +++ b/SoEasyPlatform/Pages/Template.cshtml @@ -51,9 +51,9 @@
- + - +
@*
diff --git a/SoEasyPlatform/Program.cs b/SoEasyPlatform/Program.cs index 7c36f43..04927ac 100644 --- a/SoEasyPlatform/Program.cs +++ b/SoEasyPlatform/Program.cs @@ -1,26 +1,26 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; +using Microsoft.AspNetCore.Builder; +using SoEasyPlatform; +using SqlSugar.IOC; -namespace SoEasyPlatform +var builder = WebApplication.CreateBuilder(args); +Services.AddServices(builder.Services); +builder.Services.AddSqlSugar(new SqlSugar.IOC.IocConfig() { - public class Program + ConfigId = "master1", + DbType = IocDbType.Sqlite, + IsAutoCloseConnection = true, + ConnectionString = "DataSource=" + Startup.CurrentDirectory + @"\database\sqlite.db" +}); +builder.Services.ConfigurationSugar(db => +{ + if (!db.ConfigQuery.Any()) { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); + db.ConfigQuery.SetTable