wip:upgrade pear admin layui to 3.9.7

applications/view/__init__.py

@@ -3,11 +3,12 @@ from flask import Flask
 from .index import index_bp
 from .logs_view import logs_bp
 from .roles import role_bp
+from .system_view import system_bp
+from .document_view import document_bp
 
 from . import department
 from . import file
 from . import rights
-from . import passport
 from . import users
 
 
@@ -15,3 +16,5 @@ def init_view(app: Flask):
     app.register_blueprint(index_bp)
     app.register_blueprint(logs_bp)
     app.register_blueprint(role_bp)
+    app.register_blueprint(system_bp)
+    app.register_blueprint(document_bp)

applications/view/document_view.py

@@ -0,0 +1,22 @@
+from flask import Blueprint, render_template
+
+document_bp = Blueprint('document', __name__)
+
+
+# @document_bp.route('view/document/button.html')
+# def document_button():
+#     return render_template('view/document/button.html')
+
+@document_bp.route('/component/code/index.html')
+def component_code():
+    return render_template('component/code/index.html')
+
+
+@document_bp.route('/view/<document>/<file>')
+def document_view(document, file):
+    return render_template(f'view/{document}/{file}')
+
+
+@document_bp.get('/login.html')
+def login_html():
+    return render_template('login.html')

applications/view/index.py

@@ -1,24 +1,79 @@
 from flask import Blueprint
-from flask import render_template
-from flask_login import login_required, current_user
+from flask import send_file
+from flask import session, render_template
+
+from common.gen_captcha import get_captcha_image
+
+# 获取验证码
 
 index_bp = Blueprint('index', __name__)
 
 
 @index_bp.route('/')
+@index_bp.route('/admin')
 def index():
-    return render_template('index/index.html')
+    return render_template('index.html')
 
 
-# 首页
-@index_bp.get('/admin/')
-@login_required
-def admin_index():
-    return render_template('index/admin_index.html', user=current_user)
+@index_bp.route('/config/pear.config.json')
+def pear_config():
+    return send_file('static/config/pear.config.json')
 
 
-# 控制台页面
-@index_bp.get('/admin/welcome')
-@login_required
-def welcome():
-    return render_template('index/welcome.html')
+@index_bp.route('/admin/data/menu.json')
+def menu():
+    return send_file('static/admin/data/menu.json')
+
+
+@index_bp.route('/admin/data/message.json')
+def message():
+    return send_file('static/admin/data/message.json')
+
+
+@index_bp.route('/view/console/console1.html')
+def console1():
+    # 控制后台
+    return render_template('view/console/console1.html')
+
+
+@index_bp.route('/view/console/console2.html')
+def console2():
+    # 数据分析
+    return render_template('view/console/console2.html')
+
+
+@index_bp.route('/view/system/theme.html')
+def theme():
+    # 酸爽翻倍
+    return render_template('view/system/theme.html')
+
+
+@index_bp.route('/view/document/core.html')
+def core():
+    # 酸爽翻倍
+    return render_template('view/document/core.html')
+
+
+@index_bp.get('/passport/getCaptcha')
+def get_captcha():
+    resp, code = get_captcha_image()
+    session["code"] = code
+    return resp
+
+
+# 退出登录
+@index_bp.post('/logout')
+# @login_required
+def logout():
+    # logout_user()
+    # session.pop('permissions')
+    print({"message": "注销成功", "success": True})
+    return {"message": "注销成功", "success": True}
+
+
+@index_bp.get('/login')
+def login():
+    # if current_user.is_authenticated:
+    #     return redirect(url_for('admin.index'))
+    # TODO 分离视图操作 最终实现接口登录与视图登录两套逻辑
+    return render_template('login.html')

applications/view/passport.py

@@ -1,32 +0,0 @@
-from flask import session, redirect, render_template, url_for
-from flask_login import login_required, logout_user, current_user
-
-from common.gen_captcha import get_captcha_image
-from common.utils.http import success_api
-
-# 获取验证码
-from applications.view import index_bp
-
-
-@index_bp.get('/passport/getCaptcha')
-def get_captcha():
-    resp, code = get_captcha_image()
-    session["code"] = code
-    return resp
-
-
-# 退出登录
-@index_bp.post('/passport/logout')
-@login_required
-def logout():
-    logout_user()
-    session.pop('permissions')
-    return success_api(message="注销成功")
-
-
-@index_bp.get('/passport/login')
-def login():
-    if current_user.is_authenticated:
-        return redirect(url_for('admin.index'))
-    # TODO 分离视图操作 最终实现接口登录与视图登录两套逻辑
-    return render_template('index/login.html')

applications/view/system_view.py

@@ -0,0 +1,48 @@
+from flask import Blueprint, render_template
+
+system_bp = Blueprint('system', __name__)
+
+
+@system_bp.route('/view/system/user.html')
+def system_user():
+    return render_template('view/system/user.html')
+
+
+@system_bp.route('/view/system/role.html')
+def system_role():
+    return render_template('view/system/role.html')
+
+
+@system_bp.route('/view/system/power.html')
+def system_power():
+    return render_template('view/system/power.html')
+
+
+@system_bp.route('/view/system/department.html')
+def system_department():
+    return render_template('view/system/department.html')
+
+
+@system_bp.route('/view/system/log.html')
+def system_log():
+    return render_template('view/system/log.html')
+
+
+@system_bp.route('/view/system/dict.html')
+def system_dict():
+    return render_template('view/system/dict.html')
+
+
+@system_bp.route('/view/system/operate/add.html')
+def system_operate_add():
+    return render_template('view/system/operate/add.html')
+
+
+@system_bp.route('/view/system/operate/edit.html')
+def system_operate_edit():
+    return render_template('view/system/operate/edit.html')
+
+
+@system_bp.route('/view/system/operate/profile.html')
+def system_operate_profile():
+    return render_template('view/system/operate/profile.html')