v0.8.1 release

Author: mtianyan

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.1 (2020-12-09)
+
+#### Bug Fixes
+
+- 便于二次开发默认不再覆盖，
+
 ## 0.8.0 (2020-12-01)
 
 #### Bug Fixes

README.md

@@ -30,36 +30,6 @@ TyAdmin: 只需要花五分钟阅读README即可快速上手，无额外文档
 
 前端页面，后端接口，路由，菜单全部自动对接,你只需要拷贝文档，修改配置，不需要写一行代码！！
 
-🎁 内置
-
-## 1. 多种登录方式
-
-![](http://cdn.pic.mtianyan.cn/blog_img/20201130234228.png)
-
-## 2. 内嵌自动dashboard，自动注册现有model count 数据。
-
-![](http://cdn.pic.mtianyan.cn/blog_img/20201130234054.png)
-
-## 3. 全自动的列表展示，增删改查， 筛选，搜索，导出Excel
-
-![](http://cdn.pic.mtianyan.cn/blog_img/20201130234448.png)
-
-![](http://cdn.pic.mtianyan.cn/blog_img/20201130234525.png)
-
-## 4. django自带权限组支持，外键蓝点小标记pop支持
-
-![](http://cdn.pic.mtianyan.cn/blog_img/20201130234705.png)
-
-![](http://cdn.pic.mtianyan.cn/blog_img/20201130234753.png)
-
-## 5. 基于Model定义的表单字段级别自动验证
-
-![](http://cdn.pic.mtianyan.cn/blog_img/20201010194705.png)
-
-## 6. 内嵌富文本支持,仅需把字段定义为`richTextField`,无需任何额外集成。
-
-![](http://cdn.pic.mtianyan.cn/blog_img/20201010192630.png)
-
 # 快速上手 
 
 >已有项目可从第二步开始，注意修改GEN_APPS 变量为自己需要生成的app列表
@@ -160,6 +130,38 @@ python manage.py runserver # 默认运行在8000端口
 
 >如果没有成功看到页面，请查看QA部分
 
+
+🎁 内置
+
+## 1. 多种登录方式
+
+![](http://cdn.pic.mtianyan.cn/blog_img/20201130234228.png)
+
+## 2. 内嵌自动dashboard，自动注册现有model count 数据。
+
+![](http://cdn.pic.mtianyan.cn/blog_img/20201130234054.png)
+
+## 3. 全自动的列表展示，增删改查， 筛选，搜索，导出Excel
+
+![](http://cdn.pic.mtianyan.cn/blog_img/20201130234448.png)
+
+![](http://cdn.pic.mtianyan.cn/blog_img/20201130234525.png)
+
+## 4. django自带权限组支持，外键蓝点小标记pop支持
+
+![](http://cdn.pic.mtianyan.cn/blog_img/20201130234705.png)
+
+![](http://cdn.pic.mtianyan.cn/blog_img/20201130234753.png)
+
+## 5. 基于Model定义的表单字段级别自动验证
+
+![](http://cdn.pic.mtianyan.cn/blog_img/20201010194705.png)
+
+## 6. 内嵌富文本支持,仅需把字段定义为`richTextField`,无需任何额外集成。
+
+![](http://cdn.pic.mtianyan.cn/blog_img/20201010192630.png)
+
+
 # QA环节
 
 ## 0. `TemplateDoesNotExist at /xadmin/ TyAdmin/index.html`
@@ -200,7 +202,7 @@ re_path('media/(?P<path>.*)', serve, {"document_root": settings.MEDIA_ROOT}),
 
 ## 3. 当项目新增了model，我该如何为新model生成前端页面+后端接口
 
-```
+```diff
 +TY_ADMIN_CONFIG = {
 +    'GEN_APPS': ['demo','new_app']
 +}
@@ -221,6 +223,14 @@ npm run start:dev # 默认会运行在8001端口
 
 请确认django运行在8000端口，访问http://127.0.0.1:8001/xadmin/
 
+## 5. 如何更新tyadmin版本，强制覆盖上次生成
+
+```
+TY_ADMIN_CONFIG = {
+    'FORCED_COVER': True,
+}
+```
+
 # 🤝 贡献者名单:
 
 [longyn](https://github.com/longyn)

tyadmin_api_cli/antd_full_templates/src/layouts/UserLayout.jsx

@@ -54,7 +54,7 @@ const UserLayout = props => {
             {
               key: 'TyAdmin',
               title: 'TyAdmin',
-              href: 'https://pro.ant.design',
+              href: 'https://github.com/mtianyan/tyadmin_api_cli',
               blankTarget: true,
             },
             {

tyadmin_api_cli/deal_antd_pages.py

@@ -38,6 +38,10 @@ def gen_antd_pages(project_name_settings, user_label_list, focus_model=None, tem
     from django.conf import settings
     if not user_label_list:
         user_label_list = settings.TY_ADMIN_CONFIG["GEN_APPS"]
+    try:
+        force_cover = settings.TY_ADMIN_CONFIG['FORCED_COVER']
+    except KeyError:
+        force_cover = False
     gen_labels = SYS_LABELS + user_label_list
     model_pic_dict = {}
     model_date_dict = {}
@@ -236,20 +240,37 @@ def gen_antd_pages(project_name_settings, user_label_list, focus_model=None, tem
             cur_path_co = f'{target_path}/{model_name}List/components'
             if not os.path.exists(cur_path_co):
                 os.makedirs(cur_path_co)
-            with open(f'{target_path}/{model_name}List/index.jsx', 'w', encoding='utf-8') as fw:
-                fw.write(new_content)
-
-            with open(f'{target_path}/{model_name}List/service.js', 'w', encoding='utf-8') as fw:
-                fw.write(new_services)
-
-            with open(f'{target_path}/{model_name}List/components/CreateForm.jsx', 'w', encoding='utf-8') as fw:
-                fw.write(create_form)
-
-            with open(f'{target_path}/{model_name}List/components/UpdateForm.jsx', 'w', encoding='utf-8') as fw:
-                fw.write(update_form)
+            index_jsx_path = f'{target_path}/{model_name}List/index.jsx'
+            if not force_cover and os.path.exists(index_jsx_path):
+                pass
+            else:
+                with open(index_jsx_path, 'w', encoding='utf-8') as fw:
+                    fw.write(new_content)
+            service_jsx_path = f'{target_path}/{model_name}List/service.js'
+            if not force_cover and os.path.exists(service_jsx_path):
+                pass
+            else:
+                with open(service_jsx_path, 'w', encoding='utf-8') as fw:
+                    fw.write(new_services)
+            create_form_path = f'{target_path}/{model_name}List/components/CreateForm.jsx'
+            if not force_cover and os.path.exists(create_form_path):
+                pass
+            else:
+                with open(create_form_path, 'w', encoding='utf-8') as fw:
+                    fw.write(create_form)
+            update_form_path = f'{target_path}/{model_name}List/components/UpdateForm.jsx'
+            if not force_cover and os.path.exists(update_form_path):
+                pass
+            else:
+                with open(update_form_path, 'w', encoding='utf-8') as fw:
+                    fw.write(update_form)
             if app_name == user._meta.app_label:
-                with open(f'{target_path}/{model_name}List/components/UpdatePasswordForm.jsx', 'w', encoding='utf-8') as fw:
-                    fw.write(change_password_form)
+                update_password_form_path = f'{target_path}/{model_name}List/components/UpdatePasswordForm.jsx'
+                if not force_cover and os.path.exists(update_password_form_path):
+                    pass
+                else:
+                    with open(update_password_form_path, 'w', encoding='utf-8') as fw:
+                        fw.write(change_password_form)
 
 
 if __name__ == '__main__':

tyadmin_api_cli/gen_url.py

@@ -3,6 +3,7 @@
 from tyadmin_api_cli.utils import init_django_env, get_lower_case_name
 from tyadmin_api_cli.contants import SYS_LABELS
 
+
 def gen_url(project_name_settings, user_label_list):
     init_django_env(project_name_settings)
     import django

tyadmin_api_cli/gen_view.py

@@ -4,6 +4,7 @@
 from tyadmin_api_cli.utils import init_django_env, get_model_import_path
 from tyadmin_api_cli.contants import SYS_LABELS
 
+
 def gen_view(project_name_settings, user_label_list):
     init_django_env(project_name_settings)
     import django
@@ -72,14 +73,10 @@ def get_serializer_class(self):
         else:
             return {model_name}CreateUpdateSerializer
 """
-    # if os.path.exists(f'{settings.BASE_DIR}/tyadmin_api/auto_views.py'):
-    #     print("已存在views跳过")
-    # else:
     with open(f'{settings.BASE_DIR}/tyadmin_api/auto_views.py', 'w', encoding='utf-8') as fw:
         fw.write(viewset_txt)
 
 
 if __name__ == '__main__':
-    # name = input("请输入项目settings位置:")
     name = "skyoms.settings"
-    gen_view(name,None)
+    gen_view(name, None)