From 51422a7e37a700b49af7f7841ad7e5f7bc1fa43c Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Thu, 19 Apr 2018 15:36:37 +0500 Subject: [PATCH 01/77] updated styles --- style/prism.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/style/prism.css b/style/prism.css index 99f4717..0cbce7c 100644 --- a/style/prism.css +++ b/style/prism.css @@ -4,6 +4,10 @@ * @author Tim Shedor */ +pre[class*="language-"] { + margin: .5em 0 1rem; +} + code[class*="language-"], pre[class*="language-"] { color: black; @@ -24,13 +28,12 @@ pre[class*="language-"] { -moz-hyphens: none; -ms-hyphens: none; hyphens: none; - margin-bottom: 1rem; + /*margin-bottom: 1rem;*/ } /* Code blocks */ pre { position: relative; - margin: .5em 0; /* box-shadow: -1px 0px 0px 0px #358ccb, 0px 0px 0px 1px #dfdfdf; */ /* background-color: #fdfdfd; */ /* background-image: linear-gradient(transparent 50%, rgba(69, 142, 209, 0.04) 50%); */ From 0b4cbca5d1e0400b2a52429e3b566fd37da221bb Mon Sep 17 00:00:00 2001 From: Zotov Dmitry Date: Thu, 19 Apr 2018 16:56:26 +0500 Subject: [PATCH 02/77] added new link; --- script/constant/Links.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/script/constant/Links.js b/script/constant/Links.js index a02f9a6..f7cf44c 100644 --- a/script/constant/Links.js +++ b/script/constant/Links.js @@ -47,6 +47,10 @@ const Links = [ url: "tree-entities", name: "Tree Entities" }, + { + url: "separating-entity-definition", + name: "Separating Entity definition" + }, ] }, { From b6281dcf0b0ea16c73d45490902b8f11bfbda3b1 Mon Sep 17 00:00:00 2001 From: Zotov Dmitry Date: Thu, 19 Apr 2018 17:00:44 +0500 Subject: [PATCH 03/77] minor fix --- script/constant/Links.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/constant/Links.js b/script/constant/Links.js index f7cf44c..02636b0 100644 --- a/script/constant/Links.js +++ b/script/constant/Links.js @@ -49,7 +49,7 @@ const Links = [ }, { url: "separating-entity-definition", - name: "Separating Entity definition" + name: "Separating Entity Definition" }, ] }, From e2f6b8f5633e9465481229f52015f6bbbf1d499c Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Thu, 19 Apr 2018 18:18:04 +0500 Subject: [PATCH 04/77] google verification --- google552c2ac57e25d91e.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 google552c2ac57e25d91e.html diff --git a/google552c2ac57e25d91e.html b/google552c2ac57e25d91e.html new file mode 100644 index 0000000..58af12f --- /dev/null +++ b/google552c2ac57e25d91e.html @@ -0,0 +1 @@ +google-site-verification: google552c2ac57e25d91e.html \ No newline at end of file From 9a600dbd7e87d942c82e25f284391023cad7d77c Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 6 Jul 2018 12:58:28 +0200 Subject: [PATCH 05/77] updated bootstrap css to 4.1.1 the previous url to bootstrap 4.0.0-beta no longer works. --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index a811494..0246369 100644 --- a/index.html +++ b/index.html @@ -6,8 +6,8 @@ @@ -59,4 +59,4 @@ - \ No newline at end of file + From fc79560eb8238f1b674a2a358b9446a54ff006ce Mon Sep 17 00:00:00 2001 From: Uladzimir Havenchyk Date: Fri, 7 Dec 2018 11:24:31 +0300 Subject: [PATCH 06/77] Replace gitter with slack --- script/component/MainPage.js | 16 ++++++++-------- style/app.css | 9 +-------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index fe01195..42e4ba1 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -26,10 +26,10 @@ const MainPage = { --> @@ -54,16 +54,16 @@ const MainPage = {
  • - {{ link.name }} + {{ link.name }}
    • {{ subLink.name }}
    • -
    +
    -
    +
    {{ link.name }}
    @@ -86,4 +86,4 @@ const MainPage = { window.scrollTo(0,0); } } -}; \ No newline at end of file +}; diff --git a/style/app.css b/style/app.css index 6d25e54..923ff8e 100644 --- a/style/app.css +++ b/style/app.css @@ -94,17 +94,10 @@ h1 code, h2 code, h3 code { color: #333; } -.gitter { - background-image: url("../image/icon/gitter.svg"); - fill: #1DA1F2; - width: 18px; - height: 18px; -} - pre { overflow: auto !important; } ol { margin-bottom: 2rem; -} \ No newline at end of file +} From 805432680467be36edd6fd586b1f911baf9c5305 Mon Sep 17 00:00:00 2001 From: AlexMesser Date: Thu, 20 Dec 2018 15:18:06 +0500 Subject: [PATCH 07/77] create folder for domain validation --- .well-known/pki-validation/foo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .well-known/pki-validation/foo.txt diff --git a/.well-known/pki-validation/foo.txt b/.well-known/pki-validation/foo.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.well-known/pki-validation/foo.txt @@ -0,0 +1 @@ + From 40a50b4ee80e0947e1af8c485dbd20bf635d39ed Mon Sep 17 00:00:00 2001 From: AlexMesser Date: Thu, 20 Dec 2018 15:18:31 +0500 Subject: [PATCH 08/77] added domain validation file --- .well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt diff --git a/.well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt b/.well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt new file mode 100644 index 0000000..7e93ce9 --- /dev/null +++ b/.well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt @@ -0,0 +1 @@ +82CAB53B60D8D2D3C3497B6639D69A9A05E8ED5CDEE2BE9526D23423BF514C57 comodoca.com 5c1b6af61fc51 \ No newline at end of file From 0401876f4586969e7067d933148baac305909d0a Mon Sep 17 00:00:00 2001 From: AlexMesser Date: Thu, 20 Dec 2018 15:18:51 +0500 Subject: [PATCH 09/77] Delete foo.txt --- .well-known/pki-validation/foo.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .well-known/pki-validation/foo.txt diff --git a/.well-known/pki-validation/foo.txt b/.well-known/pki-validation/foo.txt deleted file mode 100644 index 8b13789..0000000 --- a/.well-known/pki-validation/foo.txt +++ /dev/null @@ -1 +0,0 @@ - From 32adb27841edd4434bf606fd08f52162f8719d7a Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Fri, 21 Dec 2018 11:52:36 +0500 Subject: [PATCH 10/77] testing ssl --- foo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 foo.txt diff --git a/foo.txt b/foo.txt new file mode 100644 index 0000000..3b18e51 --- /dev/null +++ b/foo.txt @@ -0,0 +1 @@ +hello world From 4ba1190b9b821e6e59a37b1ac53608e54dc7ab58 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Fri, 21 Dec 2018 11:53:49 +0500 Subject: [PATCH 11/77] Rename foo.txt to test/foo.txt --- foo.txt => test/foo.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename foo.txt => test/foo.txt (100%) diff --git a/foo.txt b/test/foo.txt similarity index 100% rename from foo.txt rename to test/foo.txt From 8dbbd20496ecd6d68b25d52a7e87d4723b07f174 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Fri, 21 Dec 2018 11:54:37 +0500 Subject: [PATCH 12/77] Rename test/foo.txt to .test/foo.txt --- {test => .test}/foo.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {test => .test}/foo.txt (100%) diff --git a/test/foo.txt b/.test/foo.txt similarity index 100% rename from test/foo.txt rename to .test/foo.txt From 78011550dbb69b9bb1a8b3427be77842975e9830 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Fri, 21 Dec 2018 13:50:43 +0500 Subject: [PATCH 13/77] Delete foo.txt --- .test/foo.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .test/foo.txt diff --git a/.test/foo.txt b/.test/foo.txt deleted file mode 100644 index 3b18e51..0000000 --- a/.test/foo.txt +++ /dev/null @@ -1 +0,0 @@ -hello world From ee7d326c421dcefab8e7902f392f2b268e3d343f Mon Sep 17 00:00:00 2001 From: abingoal Date: Fri, 18 Jan 2019 17:50:49 +0800 Subject: [PATCH 14/77] add Chinese support, and add language chooser --- README-zh_CN.md | 58 ++++++ script/component/MainPage.js | 3 + script/zh_CN/component/DocumentPage.js | 58 ++++++ script/zh_CN/component/MainPage.js | 92 ++++++++++ script/zh_CN/constant/Links.js | 243 +++++++++++++++++++++++++ script/zh_CN/index.js | 12 ++ style/app.css | 6 + zh_CN/index.html | 72 ++++++++ 8 files changed, 544 insertions(+) create mode 100644 README-zh_CN.md create mode 100644 script/zh_CN/component/DocumentPage.js create mode 100644 script/zh_CN/component/MainPage.js create mode 100644 script/zh_CN/constant/Links.js create mode 100644 script/zh_CN/index.js create mode 100644 zh_CN/index.html diff --git a/README-zh_CN.md b/README-zh_CN.md new file mode 100644 index 0000000..37e5f3b --- /dev/null +++ b/README-zh_CN.md @@ -0,0 +1,58 @@ +# TypeORM 文档网站 + +文档 : [https://typeorm.io/](https://typeorm.io/) + +项目仓库 : [https://github.com/typeorm/typeorm](https://github.com/typeorm/typeorm) + +## TypeORM 是什么? + +TypeORM 是一个可以在 NodeJS,Browser,Cordova,PhoneGap 和 Ionic 平台上运行的[ORM](https://en.wikipedia.org/wiki/Object-relational_mapping),它可以与 TypeScript 和 JavaScript 一起使用(ES5,ES6,ES7)。 +它的目标是始终支持最新的 JavaScript 功能,并提供可帮助你开发使用任何类型数据库的应用程序 - 从具有少量表的小型应用程序到具有多个数据库的大型企业应用程序。 + +与当前存在的所有其他 JavaScript ORM 不同,TypeORM 支持 Active Record 和 Data Mapper 模式,这意味着你可以以最高效的方式编写高质量、松散耦合、可扩展、可维护的应用程序。 + +TypeORM 受其他 ORM 的影响,例如 [Hibernate](http://hibernate.org/orm/), +[Doctrine](http://www.doctrine-project.org/) 和 [Entity Framework](https://www.asp.net/entity-framework)。 + +一些 TypeORM 特性: + +- 支持 DataMapper 和 ActiveRecord (随你选择) +- 实体和列 +- 数据库特性列类型 +- 实体管理 +- 存储库和自定义存储库 +- 清晰的对象关系模型 +- 关联(关系) +- 贪婪和延迟关系 +- 单向的,双向的和自引用的关系 +- 支持多重继承模式 +- 级联 +- 索引 +- 事务 +- 迁移和自动迁移 +- 连接池 +- 主从复制 +- 使用多个数据库连接 +- 使用多个数据库类型 +- 跨数据库和跨模式查询 +- 优雅的语法,灵活而强大的 QueryBuilder +- 左联接和内联接 +- 使用联查查询的适当分页 +- 查询缓存 +- 原始结果流 +- 日志 +- 监听者和订阅者(钩子) +- 支持闭包表模式 +- 在模型或者分离的配置文件中声明模式 +- json / xml / yml / env 格式的连接配置 +- 支持 MySQL / MariaDB / Postgres / SQLite / Microsoft SQL Server / Oracle / sql.js +- 支持 MongoDB NoSQL 数据库 +- 可在 NodeJS / 浏览器 / Ionic / Cordova / React Native / Expo / Electron 平台上使用 +- 支持 TypeScript 和 JavaScript +- 生成高性能、灵活、清晰和可维护的代码 +- 遵循所有可能的最佳实践 +- 命令行工具 + +还有更多... + +查看[网站](http://typeorm.io)上的更多文档。 diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 42e4ba1..6193620 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -41,6 +41,9 @@ const MainPage = {
  • + + TypeORM + + + + +
    +
    +
      +
    • +
      +
      + {{ link.name }} +
      +
        +
      • + {{ subLink.name }} +
      • +
      +
      +
      +
      + {{ link.name }} +
      +
      +
    • +
    +
    +
    + +
    +
    + +`, + data: function() { + return { + links: Links + }; + }, + methods: { + goToLink: function() { + window.scrollTo(0, 0); + } + } +}; diff --git a/script/zh_CN/constant/Links.js b/script/zh_CN/constant/Links.js new file mode 100644 index 0000000..ca560ed --- /dev/null +++ b/script/zh_CN/constant/Links.js @@ -0,0 +1,243 @@ +const Links = [ + { + url: "", + name: "快速开始" + }, + { + name: "数据库连接", + links: [ + { + url: "connection", + name: "使用连接" + }, + { + url: "using-ormconfig", + name: "使用ormconfig.json" + }, + { + url: "connection-options", + name: "连接选项" + }, + { + url: "multiple-connections", + name: "多个连接" + }, + { + url: "connection-api", + name: "连接API" + } + ] + }, + { + name: "实体", + links: [ + { + url: "entities", + name: "什么是实体?" + }, + { + url: "embedded-entities", + name: "嵌入式实体" + }, + { + url: "entity-inheritance", + name: "实体继承" + }, + { + url: "tree-entities", + name: "树实体" + }, + { + url: "separating-entity-definition", + name: "分离实体定义" + } + ] + }, + { + name: "关系", + links: [ + { + url: "relations", + name: "什么是关系?" + }, + { + url: "one-to-one-relations", + name: "一对一" + }, + { + url: "many-to-one-one-to-many-relations", + name: "多对一和一对多" + }, + { + url: "many-to-many-relations", + name: "多对对y" + }, + { + url: "eager-and-lazy-relations", + name: "Eager 和 Lazy 关系" + }, + { + url: "relations-faq", + name: "关系常见问题" + } + ] + }, + { + name: "实体管理器和存储库", + links: [ + { + url: "working-with-entity-manager", + name: "使用实体管理器" + }, + { + url: "working-with-repository", + name: "使用存储库" + }, + { + url: "find-options", + name: "查找选项" + }, + { + url: "custom-repository", + name: "自定义存储库" + }, + { + url: "entity-manager-api", + name: "实体管理器API" + }, + { + url: "repository-api", + name: "存储库API" + } + ] + }, + { + url: "query-builder", + name: "查询生成器", + links: [ + { + url: "select-query-builder", + name: "使用Query Builder查询" + }, + { + url: "insert-query-builder", + name: "使用Query Builder插入" + }, + { + url: "update-query-builder", + name: "使用Query Builder更新" + }, + { + url: "delete-query-builder", + name: "使用Query Builder删除" + }, + { + url: "relational-query-builder", + name: "关系查询生成器" + }, + { + url: "caching", + name: "缓存结果" + } + ] + }, + { + name: "进阶主题", + links: [ + { + url: "migrations", + name: "迁移" + }, + { + url: "transactions", + name: "事务" + }, + { + url: "indices", + name: "索引" + }, + { + url: "listeners-and-subscribers", + name: "监听者和订阅者" + }, + { + url: "logging", + name: "日志" + }, + { + url: "using-cli", + name: "使用CLI" + } + ] + }, + { + name: "指南", + links: [ + { + url: "active-record-data-mapper", + name: "Active Record vs Data Mapper" + }, + { + url: "mongodb", + name: "使用MongoDB" + }, + { + url: "validation", + name: "使用验证" + }, + { + url: "example-with-express", + name: "Express示例" + }, + { + url: "usage-with-javascript", + name: "JavaScript示例" + }, + { + url: "sequelize-migration", + name: "从Sequelize迁移" + } + // { + // url: "schema-in-files", + // name: "文件中定义架构" + // }, + // { + // url: "naming-strategy", + // name: "如何使用自定义命名策略" + // }, + ] + }, + { + name: "帮助", + links: [ + { + url: "faq", + name: "FAQ" + }, + { + url: "supported-platforms", + name: "支持的平台" + }, + { + url: "decorator-reference", + name: "装饰器参考" + }, + // { + // url: "internals", + // name: "Internals" + // }, + { + url: "roadmap", + name: "路线图" + }, + { + url: "changelog", + name: "更新日志" + }, + { + url: "support", + name: "支持" + } + ] + } +]; diff --git a/script/zh_CN/index.js b/script/zh_CN/index.js new file mode 100644 index 0000000..57f6da8 --- /dev/null +++ b/script/zh_CN/index.js @@ -0,0 +1,12 @@ +new Vue({ + el: "#app", + router: new VueRouter({ + routes: [ + { path: "/:document?/:fragment?", component: DocumentPage }, + ] + }), + components: { + "main-page": MainPage, + "markdown-reader": MarkdownReader, + } +}); \ No newline at end of file diff --git a/style/app.css b/style/app.css index 923ff8e..d5e85c3 100644 --- a/style/app.css +++ b/style/app.css @@ -101,3 +101,9 @@ pre { ol { margin-bottom: 2rem; } +.language { + padding: 5px; +} +.language i { + font-size: 18px; +} diff --git a/zh_CN/index.html b/zh_CN/index.html new file mode 100644 index 0000000..0952792 --- /dev/null +++ b/zh_CN/index.html @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + TypeORM - 适用于TypeScript和JavaScript的ORM(ES7、ES6、ES5)。 支持MySQL、PostgreSQL、MariaDB、SQLite、MS SQL + Server、Oracle、WebSQL数据库。 适用于NodeJS、浏览器、Ionic、Cordova和Electron平台。 + + + + + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bbd3f8b84032f4d83f7d0439a495964b704e2074 Mon Sep 17 00:00:00 2001 From: abingoal Date: Tue, 22 Jan 2019 00:03:49 +0800 Subject: [PATCH 15/77] Improve translation and optimize document structure --- README-zh_CN.md | 81 +++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/README-zh_CN.md b/README-zh_CN.md index 37e5f3b..773d450 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -1,4 +1,5 @@ -# TypeORM 文档网站 +TypeORM 文档网站 +============================= 文档 : [https://typeorm.io/](https://typeorm.io/) @@ -6,52 +7,52 @@ ## TypeORM 是什么? -TypeORM 是一个可以在 NodeJS,Browser,Cordova,PhoneGap 和 Ionic 平台上运行的[ORM](https://en.wikipedia.org/wiki/Object-relational_mapping),它可以与 TypeScript 和 JavaScript 一起使用(ES5,ES6,ES7)。 -它的目标是始终支持最新的 JavaScript 功能,并提供可帮助你开发使用任何类型数据库的应用程序 - 从具有少量表的小型应用程序到具有多个数据库的大型企业应用程序。 +TypeORM 是一个可以在 NodeJS、Browser、Cordova、PhoneGap 和 Ionic 平台上运行的 [ORM](https://en.wikipedia.org/wiki/Object-relational_mapping),同时也可以与 TypeScript 和 JavaScript(ES5,ES6,ES7) 一起使用。 +它的目标是始终支持最新的 JavaScript 特性,并提供可帮助你开发使用任何类型数据库的应用程序 - 从具有少量表的小型应用程序到具有多个数据库的大型企业应用程序。 与当前存在的所有其他 JavaScript ORM 不同,TypeORM 支持 Active Record 和 Data Mapper 模式,这意味着你可以以最高效的方式编写高质量、松散耦合、可扩展、可维护的应用程序。 -TypeORM 受其他 ORM 的影响,例如 [Hibernate](http://hibernate.org/orm/), +TypeORM受其他ORM的启发,例如 [Hibernate](http://hibernate.org/orm/), [Doctrine](http://www.doctrine-project.org/) 和 [Entity Framework](https://www.asp.net/entity-framework)。 一些 TypeORM 特性: -- 支持 DataMapper 和 ActiveRecord (随你选择) -- 实体和列 -- 数据库特性列类型 -- 实体管理 -- 存储库和自定义存储库 -- 清晰的对象关系模型 -- 关联(关系) -- 贪婪和延迟关系 -- 单向的,双向的和自引用的关系 -- 支持多重继承模式 -- 级联 -- 索引 -- 事务 -- 迁移和自动迁移 -- 连接池 -- 主从复制 -- 使用多个数据库连接 -- 使用多个数据库类型 -- 跨数据库和跨模式查询 -- 优雅的语法,灵活而强大的 QueryBuilder -- 左联接和内联接 -- 使用联查查询的适当分页 -- 查询缓存 -- 原始结果流 -- 日志 -- 监听者和订阅者(钩子) -- 支持闭包表模式 -- 在模型或者分离的配置文件中声明模式 -- json / xml / yml / env 格式的连接配置 -- 支持 MySQL / MariaDB / Postgres / SQLite / Microsoft SQL Server / Oracle / sql.js -- 支持 MongoDB NoSQL 数据库 -- 可在 NodeJS / 浏览器 / Ionic / Cordova / React Native / Expo / Electron 平台上使用 -- 支持 TypeScript 和 JavaScript -- 生成高性能、灵活、清晰和可维护的代码 -- 遵循所有可能的最佳实践 -- 命令行工具 +* 支持 DataMapper 和 ActiveRecord (随你选择) +* 实体和列 +* 数据库特性列类型 +* 实体管理 +* 存储库和自定义存储库 +* 清晰的对象关系模型 +* 关联(关系) +* 贪婪和延迟关系 +* 单向的,双向的和自引用的关系 +* 支持多重继承模式 +* 级联 +* 索引 +* 事务 +* 迁移和自动迁移 +* 连接池 +* 主从复制 +* 使用多个数据库连接 +* 使用多个数据库类型 +* 跨数据库和跨模式查询 +* 优雅的语法,灵活而强大的 QueryBuilder +* 左联接和内联接 +* 使用联查查询的适当分页 +* 查询缓存 +* 原始结果流 +* 日志 +* 监听者和订阅者(钩子) +* 支持闭包表模式 +* 在模型或者分离的配置文件中声明模式 +* json / xml / yml / env格式的连接配置 +* 支持 MySQL / MariaDB / Postgres / SQLite / Microsoft SQL Server / Oracle / sql.js +* 支持 MongoDB NoSQL 数据库 +* 可在 NodeJS / 浏览器 / Ionic / Cordova / React Native / Expo / Electron 平台上使用 +* 支持 TypeScript 和 JavaScript +* 生成高性能、灵活、清晰和可维护的代码 +* 遵循所有可能的最佳实践 +* 命令行工具 还有更多... From 419543038739d049ba2edb25ffa07c67fb365a79 Mon Sep 17 00:00:00 2001 From: abingoal Date: Tue, 22 Jan 2019 00:05:30 +0800 Subject: [PATCH 16/77] add locale folder to store multi-language configs --- locale/en.js | 177 +++++++++++++++++++++++++++++++++++++++++++++ locale/zh_CN.js | 185 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 362 insertions(+) create mode 100644 locale/en.js create mode 100644 locale/zh_CN.js diff --git a/locale/en.js b/locale/en.js new file mode 100644 index 0000000..f5227fb --- /dev/null +++ b/locale/en.js @@ -0,0 +1,177 @@ +const locale_en = { + title: "TypeORM - Amazing ORM for TypeScript and JavaScript (ES7, ES6, ES5). Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, WebSQL databases. Works in NodeJS, Browser, Ionic, Cordova and Electron platforms.", + contribute: "Found a typo and want to contribute to the documentation?", + edit: "Edit this page on Github!", + links: [{ + url: "", + name: "Getting Started" + }, { + name: "Connection", + links: [{ + url: "connection", + name: "Working with Connection" + }, { + url: "using-ormconfig", + name: "Using ormconfig.json" + }, { + url: "connection-options", + name: "Connection Options" + }, { + url: "multiple-connections", + name: "Multiple Connections" + }, { + url: "connection-api", + name: "Connection API" + }] + }, { + name: "Entity", + links: [{ + url: "entities", + name: "What is Entity?" + }, { + url: "embedded-entities", + name: "Embedded Entities" + }, { + url: "entity-inheritance", + name: "Entity Inheritance" + }, { + url: "tree-entities", + name: "Tree Entities" + }, { + url: "separating-entity-definition", + name: "Separating Entity Definition" + }] + }, { + name: "Relations", + links: [{ + url: "relations", + name: "What are Relations?" + }, { + url: "one-to-one-relations", + name: "One-to-One" + }, { + url: "many-to-one-one-to-many-relations", + name: "Many-to-One and One-to-Many" + }, { + url: "many-to-many-relations", + name: "Many-to-Many" + }, { + url: "eager-and-lazy-relations", + name: "Eager and Lazy Relations" + }, { + url: "relations-faq", + name: "Relations FAQ" + }] + }, { + name: "Entity Manager and Repository", + links: [{ + url: "working-with-entity-manager", + name: "Working with Entity Manager" + }, { + url: "working-with-repository", + name: "Working with Repository" + }, { + url: "find-options", + name: "Find Options" + }, { + url: "custom-repository", + name: "Custom Repository" + }, { + url: "entity-manager-api", + name: "Entity Manager API" + }, { + url: "repository-api", + name: "Repository API" + }] + }, { + url: "query-builder", + name: "Query Builder", + links: [{ + url: "select-query-builder", + name: "Select using Query Builder" + }, { + url: "insert-query-builder", + name: "Insert using Query Builder" + }, { + url: "update-query-builder", + name: "Update using Query Builder" + }, { + url: "delete-query-builder", + name: "Delete using Query Builder" + }, { + url: "relational-query-builder", + name: "Working with Relations" + }, { + url: "caching", + name: "Caching Results" + }] + }, { + name: "Advanced Topics", + links: [{ + url: "migrations", + name: "Migrations" + }, { + url: "transactions", + name: "Transactions" + }, { + url: "indices", + name: "Indices" + }, { + url: "listeners-and-subscribers", + name: "Listeners and Subscribers" + }, { + url: "logging", + name: "Logging" + }, { + url: "using-cli", + name: "Using CLI" + }] + }, { + name: "Guides", + links: [{ + url: "active-record-data-mapper", + name: "Active Record vs Data Mapper" + }, { + url: "mongodb", + name: "Working with MongoDB" + }, { + url: "validation", + name: "Using Validation" + }, { + url: "example-with-express", + name: "Example with Express" + }, { + url: "usage-with-javascript", + name: "Usage with JavaScript" + }, { + url: "sequelize-migration", + name: "Migration from Sequelize" + }] + }, { + name: "Help", + links: [{ + url: "faq", + name: "FAQ" + }, { + url: "supported-platforms", + name: "Supported Platforms" + }, { + url: "decorator-reference", + name: "Decorator Reference" + }, + // { + // url: "internals", + // name: "Internals" + // }, + { + url: "roadmap", + name: "Roadmap" + }, { + url: "changelog", + name: "Changelog" + }, { + url: "support", + name: "Support" + }] + }] +} \ No newline at end of file diff --git a/locale/zh_CN.js b/locale/zh_CN.js new file mode 100644 index 0000000..aa7d9e3 --- /dev/null +++ b/locale/zh_CN.js @@ -0,0 +1,185 @@ +const locale_zh_CN = { + title: "TypeORM - 用于TypeScript和JavaScript(ES7,ES6,ES5)的ORM。支持MySQL、PostgreSQL、MariaDB、SQLite、MS SQL Server、Oracle、WebSQL数据库。 支持NodeJS、浏览器、Ionic、Cordova和Electron平台。", + contribute: "发现错误并希望为文档做出贡献?", + edit: "在Github上编辑此页面!", + links: [{ + url: "", + name: "快速开始" + }, { + name: "数据库连接", + links: [{ + url: "connection", + name: "使用连接" + }, { + url: "using-ormconfig", + name: "使用ormconfig.json" + }, { + url: "connection-options", + name: "连接选项" + }, { + url: "multiple-connections", + name: "多个连接" + }, { + url: "connection-api", + name: "连接API" + }] + }, { + name: "实体", + links: [{ + url: "entities", + name: "什么是实体?" + }, { + url: "embedded-entities", + name: "嵌入式实体" + }, { + url: "entity-inheritance", + name: "实体继承" + }, { + url: "tree-entities", + name: "树实体" + }, { + url: "separating-entity-definition", + name: "分离实体定义" + }] + }, { + name: "关系", + links: [{ + url: "relations", + name: "什么是关系?" + }, { + url: "one-to-one-relations", + name: "一对一" + }, { + url: "many-to-one-one-to-many-relations", + name: "多对一和一对多" + }, { + url: "many-to-many-relations", + name: "多对对y" + }, { + url: "eager-and-lazy-relations", + name: "Eager 和 Lazy 关系" + }, { + url: "relations-faq", + name: "关系常见问题" + }] + }, { + name: "实体管理器和存储库", + links: [{ + url: "working-with-entity-manager", + name: "使用实体管理器" + }, { + url: "working-with-repository", + name: "使用存储库" + }, { + url: "find-options", + name: "查找选项" + }, { + url: "custom-repository", + name: "自定义存储库" + }, { + url: "entity-manager-api", + name: "实体管理器API" + }, { + url: "repository-api", + name: "存储库API" + }] + }, { + url: "query-builder", + name: "查询生成器", + links: [{ + url: "select-query-builder", + name: "使用Query Builder查询" + }, { + url: "insert-query-builder", + name: "使用Query Builder插入" + }, { + url: "update-query-builder", + name: "使用Query Builder更新" + }, { + url: "delete-query-builder", + name: "使用Query Builder删除" + }, { + url: "relational-query-builder", + name: "关系查询生成器" + }, { + url: "caching", + name: "缓存结果" + }] + }, { + name: "进阶主题", + links: [{ + url: "migrations", + name: "迁移" + }, { + url: "transactions", + name: "事务" + }, { + url: "indices", + name: "索引" + }, { + url: "listeners-and-subscribers", + name: "监听者和订阅者" + }, { + url: "logging", + name: "日志" + }, { + url: "using-cli", + name: "使用CLI" + }] + }, { + name: "指南", + links: [{ + url: "active-record-data-mapper", + name: "Active Record vs Data Mapper" + }, { + url: "mongodb", + name: "使用MongoDB" + }, { + url: "validation", + name: "使用验证" + }, { + url: "example-with-express", + name: "Express示例" + }, { + url: "usage-with-javascript", + name: "JavaScript示例" + }, { + url: "sequelize-migration", + name: "从Sequelize迁移" + // { + // url: "schema-in-files", + // name: "文件中定义架构" + // }, + // { + // url: "naming-strategy", + // name: "如何使用自定义命名策略" + // }, + }] + }, { + name: "帮助", + links: [{ + url: "faq", + name: "FAQ" + }, { + url: "supported-platforms", + name: "支持的平台" + }, { + url: "decorator-reference", + name: "装饰器参考" + }, + // { + // url: "internals", + // name: "Internals" + // }, + { + url: "roadmap", + name: "路线图" + }, { + url: "changelog", + name: "更新日志" + }, { + url: "support", + name: "支持" + }] + }] +} \ No newline at end of file From 20b3d073d61a4a017dd1b6b5b96b195290efba9a Mon Sep 17 00:00:00 2001 From: abingoal Date: Tue, 22 Jan 2019 00:06:25 +0800 Subject: [PATCH 17/77] add style for the language chooser --- style/app.css | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/style/app.css b/style/app.css index d5e85c3..b45e622 100644 --- a/style/app.css +++ b/style/app.css @@ -101,9 +101,31 @@ pre { ol { margin-bottom: 2rem; } -.language { - padding: 5px; +.language > .nav-dropdown { + margin: 0; + padding: 0; + list-style: none; + position: absolute; + border: 1px solid; + right: 20px; + z-index: 9; } -.language i { - font-size: 18px; + +.language .dropdown-menu a { + color: #616161; + cursor: pointer; } + +.language .dropdown-item:hover, +.language .dropdown-item:focus { + color: #E83524 !important; + text-decoration: none; + background-color: #f8f9fa; +} + +.language .dropdown-item.active, +.language .dropdown-item:active { + color: #ffffff; + text-decoration: none; + background-color: transparent; +} \ No newline at end of file From 7d5baf5815d4975eb7abc611ecabe3feb2e2d10b Mon Sep 17 00:00:00 2001 From: abingoal Date: Tue, 22 Jan 2019 09:27:27 +0800 Subject: [PATCH 18/77] add language chooser and store the locale to cookie --- script/component/DocumentPage.js | 19 +++++++++---------- script/component/MainPage.js | 28 +++++++++++++++++++++------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/script/component/DocumentPage.js b/script/component/DocumentPage.js index 71a09e1..9086ec5 100644 --- a/script/component/DocumentPage.js +++ b/script/component/DocumentPage.js @@ -4,7 +4,7 @@ const DocumentPage = {
    - Found a typo and want to contribute to the documentation? Edit this page on Github! + {{$t("contribute")}} {{$t("edit")}}
    `, @@ -12,6 +12,9 @@ const DocumentPage = { return { document: this.$route.params.document, fragment: this.$route.params.fragment, + locale: $cookies.get("locale") || "en", + readLink: "https://raw.githubusercontent.com/typeorm/typeorm/master/", + editLink: "https://github.com/typeorm/typeorm/edit/master/" }; }, watch: { @@ -26,7 +29,7 @@ const DocumentPage = { }, methods: { updateTitle: function() { - const link = Links.find(link => link.url === this.document); + const link = this.$t("links").find(link => link.url === this.document); if (link) { window.document.title = link.name + " | TypeORM"; } @@ -39,23 +42,19 @@ const DocumentPage = { readUrl: function () { if (this.document === "changelog") { return `https://raw.githubusercontent.com/typeorm/typeorm/master/CHANGELOG.md`; - } else if (!this.document || this.document === "readme") { - return `https://raw.githubusercontent.com/typeorm/typeorm/master/README.md`; - + return this.readLink + (this.locale === "en"? `README.md`: `README-${this.locale}.md`); } else { - return `https://raw.githubusercontent.com/typeorm/typeorm/master/docs/${this.document}.md`; + return this.readLink + (this.locale === "en"? `docs/${this.document}.md`: `docs/${this.locale}/${this.document}.md`); } }, editUrl: function () { if (this.document === "changelog") { return `https://github.com/typeorm/typeorm/edit/master/CHANGELOG.md`; - } else if (!this.document) { - return `https://github.com/typeorm/typeorm/edit/master/README.md`; - + return this.editLink + (this.locale === "en"? "README.md": `README-${this.locale}.md`); } else { - return `https://github.com/typeorm/typeorm/edit/master/docs/${this.document}.md`; + return this.editLink + (this.locale === "en"? `docs/${this.document}.md`: `docs/${this.locale}/${this.document}.md`); } } } diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 6193620..71e3038 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -2,7 +2,7 @@ const MainPage = { template: `
    +
    From ccd220712040feceb0aa8fb509e11f483bbac763 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Tue, 22 Jan 2019 23:12:06 +0500 Subject: [PATCH 24/77] added carbon ads styles --- style/app.css | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/style/app.css b/style/app.css index 923ff8e..1e9816a 100644 --- a/style/app.css +++ b/style/app.css @@ -101,3 +101,103 @@ pre { ol { margin-bottom: 2rem; } + +#carbonads { + --width: 180px; + --font-size: 14px; +} + +#carbonads { + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + display: block; + overflow: hidden; + margin-bottom: 20px; + max-width: var(--width); + border-radius: 4px; + text-align: center; + box-shadow: 0 0 0 1px hsla(0, 0%, 0%, .1); + background-color: hsl(0, 0%, 98%); + font-size: var(--font-size); + line-height: 1.5; +} + +#carbonads a { + color: inherit; + text-decoration: none; +} + +#carbonads a:hover { + color: inherit; +} + +#carbonads span { + position: relative; + display: block; + overflow: hidden; +} + +.carbon-img { + display: block; + margin-bottom: 8px; + max-width: var(--width); + line-height: 1; +} + +.carbon-img img { + display: block; + margin: 0 auto; + max-width: var(--width) !important; + width: var(--width); + height: auto; +} + +.carbon-text { + display: block; + padding: 0 1em 8px; +} + +.carbon-poweredby { + display: block; + padding: 10px var(--font-size); + background: repeating-linear-gradient(-45deg, transparent, transparent 5px, hsla(0, 0%, 0%, .025) 5px, hsla(0, 0%, 0%, .025) 10px) hsla(203, 11%, 95%, .4); + text-transform: uppercase; + letter-spacing: .5px; + font-weight: 600; + font-size: 9px; + line-height: 0; +} + +@media only screen and (min-width: 320px) and (max-width: 759px) { + #carbonads { + float: none; + margin: 0 auto; + max-width: 330px; + } + #carbonads span { + position: relative; + } + #carbonads > span { + max-width: none; + } + .carbon-img { + float: left; + margin: 0; + } + + .carbon-img img { + max-width: 130px !important; + } + .carbon-text { + float: left; + margin-bottom: 0; + padding: 8px 20px; + text-align: left; + max-width: calc(100% - 130px - 3em); + } + .carbon-poweredby { + left: 130px; + bottom: 0; + display: block; + width: 100%; + } +} From a89638d639c581fb2cc873e9f04850b9798feb81 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Tue, 22 Jan 2019 23:21:20 +0500 Subject: [PATCH 25/77] adding carbon ads --- script/component/MainPage.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 0c4e79b..52d6931 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -69,8 +69,8 @@ const MainPage = {
    - - +
    +
    @@ -82,6 +82,14 @@ const MainPage = { links: Links }; }, + ready() { + // + var scriptEl = document.createElement('script'); + scriptEl.setAttribute('src', '//cdn.carbonads.com/carbon.js?serve=CK7DL53W&placement=typeormio'); + scriptEl.setAttribute('id', '_carbonads_js'); + scriptEl.setAttribute('async', null); + this.$els.scriptHolder.appendChild(scriptEl); + }, methods: { goToLink: function() { window.scrollTo(0,0); From d9526a05f64c8604e8ba8693e82d5f45bfb984e6 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Tue, 22 Jan 2019 23:33:08 +0500 Subject: [PATCH 26/77] Update MainPage.js --- script/component/MainPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 52d6931..ddc0fce 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -82,7 +82,7 @@ const MainPage = { links: Links }; }, - ready() { + mounted() { // var scriptEl = document.createElement('script'); scriptEl.setAttribute('src', '//cdn.carbonads.com/carbon.js?serve=CK7DL53W&placement=typeormio'); From a9953df88eadb74d4c0c769a822006dbe7db60d0 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Tue, 22 Jan 2019 23:35:47 +0500 Subject: [PATCH 27/77] Update MainPage.js --- script/component/MainPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index ddc0fce..2a4c477 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -69,7 +69,7 @@ const MainPage = { -
    +
    @@ -88,7 +88,7 @@ const MainPage = { scriptEl.setAttribute('src', '//cdn.carbonads.com/carbon.js?serve=CK7DL53W&placement=typeormio'); scriptEl.setAttribute('id', '_carbonads_js'); scriptEl.setAttribute('async', null); - this.$els.scriptHolder.appendChild(scriptEl); + this.$refs.scriptHolder.appendChild(scriptEl); }, methods: { goToLink: function() { From b12ee23cbeba4be2c8fbee0b9a789a017f3fa108 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Tue, 22 Jan 2019 23:38:00 +0500 Subject: [PATCH 28/77] Update MainPage.js --- script/component/MainPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 2a4c477..4ef5485 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -69,7 +69,7 @@ const MainPage = {
    -
    +
    @@ -88,7 +88,7 @@ const MainPage = { scriptEl.setAttribute('src', '//cdn.carbonads.com/carbon.js?serve=CK7DL53W&placement=typeormio'); scriptEl.setAttribute('id', '_carbonads_js'); scriptEl.setAttribute('async', null); - this.$refs.scriptHolder.appendChild(scriptEl); + this.$refs.carbon.appendChild(scriptEl); }, methods: { goToLink: function() { From b1e180fefeca1342e2b0c8a218d82db39aceff27 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Tue, 22 Jan 2019 23:45:53 +0500 Subject: [PATCH 29/77] Update MainPage.js --- script/component/MainPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 4ef5485..d81e48a 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -69,7 +69,7 @@ const MainPage = {
    -
    +
    From 96727175e722d3a05005f67804ef4e8f134f740b Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Tue, 22 Jan 2019 23:46:15 +0500 Subject: [PATCH 30/77] adding carbon styles --- style/app.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/style/app.css b/style/app.css index 1e9816a..de2dc33 100644 --- a/style/app.css +++ b/style/app.css @@ -102,6 +102,14 @@ ol { margin-bottom: 2rem; } +.carbon-container { + border-top: 1px solid #eee; + padding-top: 20px; + margin-left: 80px; + margin-right: 80px; + min-width: 120px; +} + #carbonads { --width: 180px; --font-size: 14px; From 3ae5dd7d082def3afb70fdcf62030a0b71b275f6 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Tue, 22 Jan 2019 23:48:22 +0500 Subject: [PATCH 31/77] adding carbon styles --- style/app.css | 1 + 1 file changed, 1 insertion(+) diff --git a/style/app.css b/style/app.css index de2dc33..b487862 100644 --- a/style/app.css +++ b/style/app.css @@ -108,6 +108,7 @@ ol { margin-left: 80px; margin-right: 80px; min-width: 120px; + margin-bottom: 20px; } #carbonads { From 75425b641d26608120a2407df3464e33aabfd8ad Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Wed, 13 Feb 2019 02:18:24 +0500 Subject: [PATCH 32/77] fixed ads show algorithm --- script/component/MainPage.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 34658f3..63bdc2b 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -105,6 +105,13 @@ const MainPage = { methods: { goToLink: function () { window.scrollTo(0, 0); + + var scriptEl = document.createElement('script'); + scriptEl.setAttribute('src', '//cdn.carbonads.com/carbon.js?serve=CK7DL53W&placement=typeormio'); + scriptEl.setAttribute('id', '_carbonads_js'); + scriptEl.setAttribute('async', null); + this.$refs.carbon.innerHTML = '' + this.$refs.carbon.appendChild(scriptEl); }, changeLang: function (locale) { $cookies.set("locale", locale); From b7a0dab987e88d64c4b2f5e7e7087d91b5562864 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Wed, 13 Feb 2019 02:19:01 +0500 Subject: [PATCH 33/77] removed roadmap for now --- script/constant/Links.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/constant/Links.js b/script/constant/Links.js index 02636b0..3bb40d5 100644 --- a/script/constant/Links.js +++ b/script/constant/Links.js @@ -226,10 +226,10 @@ const Links = [ // url: "internals", // name: "Internals" // }, - { - url: "roadmap", - name: "Roadmap" - }, + // { + // url: "roadmap", + // name: "Roadmap" + // }, { url: "changelog", name: "Changelog" From 235cd4f3706ea4fac1181c9d618c0fd82595c714 Mon Sep 17 00:00:00 2001 From: abingoal Date: Fri, 22 Feb 2019 16:46:43 +0800 Subject: [PATCH 34/77] Fix some typos and improve the translation accuracy of some words --- locale/zh_CN.js | 24 ++++++++++++------------ script/component/MainPage.js | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/locale/zh_CN.js b/locale/zh_CN.js index aa7d9e3..c7dfc43 100644 --- a/locale/zh_CN.js +++ b/locale/zh_CN.js @@ -9,7 +9,7 @@ const locale_zh_CN = { name: "数据库连接", links: [{ url: "connection", - name: "使用连接" + name: "使用Connection" }, { url: "using-ormconfig", name: "使用ormconfig.json" @@ -21,7 +21,7 @@ const locale_zh_CN = { name: "多个连接" }, { url: "connection-api", - name: "连接API" + name: "Connection API" }] }, { name: "实体", @@ -54,7 +54,7 @@ const locale_zh_CN = { name: "多对一和一对多" }, { url: "many-to-many-relations", - name: "多对对y" + name: "多对多" }, { url: "eager-and-lazy-relations", name: "Eager 和 Lazy 关系" @@ -63,29 +63,29 @@ const locale_zh_CN = { name: "关系常见问题" }] }, { - name: "实体管理器和存储库", + name: "Entity Manager 和 Repository", links: [{ url: "working-with-entity-manager", - name: "使用实体管理器" + name: "使用Entity Manager" }, { url: "working-with-repository", - name: "使用存储库" + name: "使用Repository" }, { url: "find-options", - name: "查找选项" + name: "find选项" }, { url: "custom-repository", - name: "自定义存储库" + name: "自定义Repository" }, { url: "entity-manager-api", name: "实体管理器API" }, { url: "repository-api", - name: "存储库API" + name: "Entity Manager API" }] }, { url: "query-builder", - name: "查询生成器", + name: "Query Builder", links: [{ url: "select-query-builder", name: "使用Query Builder查询" @@ -100,10 +100,10 @@ const locale_zh_CN = { name: "使用Query Builder删除" }, { url: "relational-query-builder", - name: "关系查询生成器" + name: "与Relations结合" }, { url: "caching", - name: "缓存结果" + name: "结果缓存" }] }, { name: "进阶主题", diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 34658f3..493b0c8 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -91,7 +91,7 @@ const MainPage = { data: function () { return { links: this.$t("links"), - langs: { en: "English", "zh_CN": "中文" } + langs: { en: "English", "zh_CN": "简体中文" } }; }, mounted() { From 1f1f15e9ff6c261e141b44de3d1b0a299215b2b7 Mon Sep 17 00:00:00 2001 From: abingoal Date: Fri, 22 Feb 2019 16:53:17 +0800 Subject: [PATCH 35/77] Fix some typos --- locale/zh_CN.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/zh_CN.js b/locale/zh_CN.js index c7dfc43..b51bee5 100644 --- a/locale/zh_CN.js +++ b/locale/zh_CN.js @@ -15,10 +15,10 @@ const locale_zh_CN = { name: "使用ormconfig.json" }, { url: "connection-options", - name: "连接选项" + name: "Connection选项" }, { url: "multiple-connections", - name: "多个连接" + name: "多个Connection" }, { url: "connection-api", name: "Connection API" @@ -72,7 +72,7 @@ const locale_zh_CN = { name: "使用Repository" }, { url: "find-options", - name: "find选项" + name: "Find选项" }, { url: "custom-repository", name: "自定义Repository" From 463e1ac2ae5b3d86aeffa80053f8b750d27d9e0b Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Mon, 25 Feb 2019 12:51:39 +0500 Subject: [PATCH 36/77] added pki validation file --- well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt diff --git a/well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt b/well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt new file mode 100644 index 0000000..7e93ce9 --- /dev/null +++ b/well-known/pki-validation/0141ED2624914000AB1E5A966A5DDFE6.txt @@ -0,0 +1 @@ +82CAB53B60D8D2D3C3497B6639D69A9A05E8ED5CDEE2BE9526D23423BF514C57 comodoca.com 5c1b6af61fc51 \ No newline at end of file From c0c71c1ed91e68debf6554de105e7df2ad4f3726 Mon Sep 17 00:00:00 2001 From: Zotov Dmitry Date: Tue, 9 Apr 2019 19:37:35 +0500 Subject: [PATCH 37/77] added View entities link; --- locale/en.js | 3 +++ script/constant/Links.js | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/locale/en.js b/locale/en.js index f5227fb..123ab93 100644 --- a/locale/en.js +++ b/locale/en.js @@ -37,6 +37,9 @@ const locale_en = { }, { url: "tree-entities", name: "Tree Entities" + }, { + url: "view-entities", + name: "View Entities" }, { url: "separating-entity-definition", name: "Separating Entity Definition" diff --git a/script/constant/Links.js b/script/constant/Links.js index 3bb40d5..1265a1e 100644 --- a/script/constant/Links.js +++ b/script/constant/Links.js @@ -47,6 +47,10 @@ const Links = [ url: "tree-entities", name: "Tree Entities" }, + { + url: "view-entities", + name: "View Entities" + }, { url: "separating-entity-definition", name: "Separating Entity Definition" From c1ddea2a5fee3a5f9d03b57d71f16d135164f283 Mon Sep 17 00:00:00 2001 From: wujingquan Date: Sun, 14 Jul 2019 16:24:51 +0800 Subject: [PATCH 38/77] fix some description --- locale/zh_CN.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/zh_CN.js b/locale/zh_CN.js index b51bee5..55fdd66 100644 --- a/locale/zh_CN.js +++ b/locale/zh_CN.js @@ -81,7 +81,7 @@ const locale_zh_CN = { name: "实体管理器API" }, { url: "repository-api", - name: "Entity Manager API" + name: "Repository API" }] }, { url: "query-builder", @@ -182,4 +182,4 @@ const locale_zh_CN = { name: "支持" }] }] -} \ No newline at end of file +} From b1d562c899d993687cc7e34a33b48402ae78d86f Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Fri, 27 Sep 2019 19:11:24 +0500 Subject: [PATCH 39/77] Update MainPage.js --- script/component/MainPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index d8025c2..3a9a060 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -26,7 +26,7 @@ const MainPage = { --> --> --> --> + +
    `, diff --git a/script/component/MarkdownReader.js b/script/component/MarkdownReader.js index 3de5884..8e38581 100644 --- a/script/component/MarkdownReader.js +++ b/script/component/MarkdownReader.js @@ -1,5 +1,5 @@ const MarkdownReader = { - template: `
    `, + template: `
    `, props: ["file", "hash"], data: function() { return { From c26fa6acb5a86492f31bbaec73c06a62dadd7ed8 Mon Sep 17 00:00:00 2001 From: Umed Khudoiberdiev Date: Wed, 3 Jan 2024 20:13:26 +0500 Subject: [PATCH 71/77] updated slack link --- script/component/MainPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/component/MainPage.js b/script/component/MainPage.js index 88e2d85..6f5b59f 100644 --- a/script/component/MainPage.js +++ b/script/component/MainPage.js @@ -30,7 +30,7 @@ const MainPage = {
    From 440f9febdbeffc6d829e8e25fa2a25c1ddbd14ce Mon Sep 17 00:00:00 2001 From: Naor Peled Date: Mon, 31 Mar 2025 12:07:45 +0300 Subject: [PATCH 77/77] fix: replace unpkg with jsdelivr --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 0f056f4..7860819 100644 --- a/index.html +++ b/index.html @@ -45,10 +45,10 @@ - - - - + + + +