diff --git a/README.md b/README.md
index 0219e865c71c2d4481819e5cf3bb1737166e7642..2165fb30ea62eec15aa7706dd6a2d600e3325127 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-RuoYi-Vue3-FastAPI v1.5.1
+RuoYi-Vue3-FastAPI v1.6.0
基于RuoYi-Vue3+FastAPI前后端分离的快速开发框架
+
+
+
+ {% for column in columns %}
+ {% if column.query %}
+ {% set dictType = column.dict_type %}
+ {% set AttrName = column.python_field[0] | upper + column.python_field[1:] %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% if column.html_type == "input" %}
+
+
+ {% elif (column.html_type == "select" or column.html_type == "radio") and dictType %}
+
+
+
+
+ {% elif (column.html_type == "select" or column.html_type == "radio") and not dictType %}
+
+
+
+
+ {% elif column.html_type == "datetime" and column.query_type != "BETWEEN" %}
+
+
+
+
+ {% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 展开/折叠
+
+
+
+
+ {% for column in columns %}
+ {% set pythonField = column.python_field %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% if column.pk %}
+ {% elif column.list and column.html_type == "datetime" %}
+
+
+ {% raw %}{{{% endraw %} parseTime(scope.row.{{ pythonField }}, '{y}-{m}-{d}') {% raw %}}}{% endraw %}
+
+
+ {% elif column.list and column.html_type == "imageUpload" %}
+
+
+
+
+ {% elif column.list and column.dict_type %}
+
+
+ {% if column.html_type == "checkbox" %}
+
+
+ {% elif column.list and pythonField %}
+ {% if loop.index == 1 %}
+
+
+ 修改
+ 新增
+ 删除
+
+
+
+
+
+
+
+ {% for column in columns %}
+ {% set field = column.python_field %}
+ {% if column.insert and not column.pk %}
+ {% if column.usable_column or not column.super_column %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% set dictType = column.dict_type %}
+ {% if treeParentCode and column.python_field == treeParentCode %}
+
+
+ {% elif column.html_type == "input" %}
+
+
+ {% elif column.html_type == "imageUpload" %}
+
+
+ {% elif column.html_type == "fileUpload" %}
+
+
+ {% elif column.html_type == "editor" %}
+
+
+ {% elif column.html_type == "select" and dictType %}
+
+
+
+
+ {% elif column.html_type == "select" and not dictType %}
+
+
+
+
+ {% elif column.html_type == "checkbox" and dictType %}
+
+
+
+ {% raw %}{{{% endraw %} dict.label {% raw %}}}{% endraw %}
+
+
+
+ {% elif column.html_type == "checkbox" and not dictType %}
+
+
+ 请选择字典生成
+
+
+ {% elif column.html_type == "radio" and dictType %}
+
+
+
+ {% raw %}{{{% endraw %} dict.label {% raw %}}}{% endraw %}
+
+
+
+ {% elif column.html_type == "radio" and not dictType %}
+
+
+
+
+ {% elif column.html_type == "datetime" %}
+
+
+
+
+ {% elif column.html_type == "textarea" %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-fastapi-backend/module_generator/templates/vue/index.vue.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/vue/index.vue.jinja2
new file mode 100644
index 0000000000000000000000000000000000000000..a1b7f4b03ec3f6803a6cd6ce843b5d74afbbe3b4
--- /dev/null
+++ b/ruoyi-fastapi-backend/module_generator/templates/vue/index.vue.jinja2
@@ -0,0 +1,586 @@
+
+
+
+ {% for column in columns %}
+ {% if column.query %}
+ {% set dictType = column.dict_type %}
+ {% set AttrName = column.python_field[0] | upper + column.python_field[1:] %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% if column.html_type == "input" %}
+
+
+ {% elif (column.html_type == "select" or column.html_type == "radio") and dictType %}
+
+
+
+
+ {% elif (column.html_type == "select" or column.html_type == "radio") and not dictType %}
+
+
+
+
+ {% elif column.html_type == "datetime" and column.query_type != "BETWEEN" %}
+
+
+
+
+ {% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+ {% raw %}{{{% endraw %} parseTime(scope.row.{{ pythonField }}, '{y}-{m}-{d}') {% raw %}}}{% endraw %}
+
+
+ {% elif column.list and column.html_type == "imageUpload" %}
+
+
+
+
+ {% elif column.list and column.dict_type %}
+
+
+ {% if column.html_type == "checkbox" %}
+
+
+ {% elif column.list and pythonField %}
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+ {% for column in columns %}
+ {% set field = column.python_field %}
+ {% if column.insert and not column.pk %}
+ {% if column.usable_column or not column.super_column %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% set dictType = column.dict_type %}
+ {% if column.html_type == "input" %}
+
+
+ {% elif column.html_type == "imageUpload" %}
+
+
+ {% elif column.html_type == "fileUpload" %}
+
+
+ {% elif column.html_type == "editor" %}
+
+
+ {% elif column.html_type == "select" and dictType %}
+
+
+
+
+ {% elif column.html_type == "select" and not dictType %}
+
+
+
+
+ {% elif column.html_type == "checkbox" and dictType %}
+
+
+
+ {{ dict.label }}
+
+
+
+ {% elif column.html_type == "checkbox" and not dictType %}
+
+
+ 请选择字典生成
+
+
+ {% elif column.html_type == "radio" and dictType %}
+
+
+
+ {% raw %}{{{% endraw %} dict.label {% raw %}}}{% endraw %}
+
+
+
+ {% elif column.html_type == "radio" and not dictType %}
+
+
+
+
+ {% elif column.html_type == "datetime" %}
+
+
+
+
+ {% elif column.html_type == "textarea" %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ {% if table.sub %}
+ {{ subTable.functionName }}信息
+
+
+ 添加
+
+
+ 删除
+
+
+
+
+
+
+
+ {% elif column.list and column.html_type == 'datetime' %}
+
+
+
+
+
+
+ {% elif column.list and (column.html_type == 'select' or column.html_type == 'radio') and column.dict_type %}
+
+
+
+
+
+
+ {% elif column.list and (column.html_type == 'select' or column.html_type == 'radio') and not column.dict_type %}
+
+
+
+
+
+
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-fastapi-backend/module_generator/templates/vue/v3/index-tree.vue.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/vue/v3/index-tree.vue.jinja2
new file mode 100644
index 0000000000000000000000000000000000000000..433c162de5999e8c679dff27aea75c11410848f7
--- /dev/null
+++ b/ruoyi-fastapi-backend/module_generator/templates/vue/v3/index-tree.vue.jinja2
@@ -0,0 +1,454 @@
+
+
+
+ {% for column in columns %}
+ {% if column.query %}
+ {% set dictType = column.dict_type %}
+ {% set AttrName = column.python_field[0] | upper + column.python_field[1:] %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% if column.html_type == "input" %}
+
+
+ {% elif (column.html_type == "select" or column.html_type == "radio") and dictType %}
+
+
+
+
+ {% elif (column.html_type == "select" or column.html_type == "radio") and not dictType %}
+
+
+
+
+ {% elif column.html_type == "datetime" and column.query_type != "BETWEEN" %}
+
+
+
+
+ {% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 展开/折叠
+
+
+
+
+ {% for column in columns %}
+ {% set pythonField = column.python_field %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% if column.pk %}
+ {% elif column.list and column.html_type == "datetime" %}
+
+
+ {% raw %}{{{% endraw %} parseTime(scope.row.{{ pythonField }}, '{y}-{m}-{d}') {% raw %}}}{% endraw %}
+
+
+ {% elif column.list and column.html_type == "imageUpload" %}
+
+
+
+
+ {% elif column.list and column.dict_type %}
+
+
+ {% if column.html_type == "checkbox" %}
+
+
+ {% elif column.list and pythonField %}
+
+
+ 修改
+ 新增
+ 删除
+
+
+
+
+
+
+
+ {% for column in columns %}
+ {% set field = column.python_field %}
+ {% if column.insert and not column.pk %}
+ {% if column.usable_column or not column.super_column %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% set dictType = column.dict_type %}
+ {% if treeParentCode and column.python_field == treeParentCode %}
+
+
+ {% elif column.html_type == "input" %}
+
+
+ {% elif column.html_type == "imageUpload" %}
+
+
+ {% elif column.html_type == "fileUpload" %}
+
+
+ {% elif column.html_type == "editor" %}
+
+
+ {% elif column.html_type == "select" and dictType %}
+
+
+
+
+ {% elif column.html_type == "select" and not dictType %}
+
+
+
+
+ {% elif column.html_type == "checkbox" and dictType %}
+
+
+
+ {% raw %}{{{% endraw %} dict.label {% raw %}}}{% endraw %}
+
+
+
+ {% elif column.html_type == "checkbox" and not dictType %}
+
+
+ 请选择字典生成
+
+
+ {% elif column.html_type == "radio" and dictType %}
+
+
+
+ {% raw %}{{{% endraw %} dict.label {% raw %}}}{% endraw %}
+
+
+
+ {% elif column.html_type == "radio" and not dictType %}
+
+
+
+
+ {% elif column.html_type == "datetime" %}
+
+
+
+
+ {% elif column.html_type == "textarea" %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-fastapi-backend/module_generator/templates/vue/v3/index.vue.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/vue/v3/index.vue.jinja2
new file mode 100644
index 0000000000000000000000000000000000000000..981124f821599cce9ec5e286d06f4962dba16214
--- /dev/null
+++ b/ruoyi-fastapi-backend/module_generator/templates/vue/v3/index.vue.jinja2
@@ -0,0 +1,571 @@
+
+
+
+ {% for column in columns %}
+ {% if column.query %}
+ {% set dictType = column.dict_type %}
+ {% set AttrName = column.python_field[0] | upper + column.python_field[1:] %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% if column.html_type == "input" %}
+
+
+ {% elif (column.html_type == "select" or column.html_type == "radio") and dictType %}
+
+
+
+
+ {% elif (column.html_type == "select" or column.html_type == "radio") and not dictType %}
+
+
+
+
+ {% elif column.html_type == "datetime" and column.query_type != "BETWEEN" %}
+
+
+
+
+ {% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+ {% raw %}{{{% endraw %} parseTime(scope.row.{{ pythonField }}, '{y}-{m}-{d}') {% raw %}}}{% endraw %}
+
+
+ {% elif column.list and column.html_type == "imageUpload" %}
+
+
+
+
+ {% elif column.list and column.dict_type %}
+
+
+ {% if column.html_type == "checkbox" %}
+
+
+ {% elif column.list and pythonField %}
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+ {% for column in columns %}
+ {% set field = column.python_field %}
+ {% if column.insert and not column.pk %}
+ {% if column.usable_column or not column.super_column %}
+ {% set parentheseIndex = column.column_comment.find("（") %}
+ {% set comment = column.column_comment[:parentheseIndex] if parentheseIndex != -1 else column.column_comment %}
+ {% set dictType = column.dict_type %}
+ {% if column.html_type == "input" %}
+
+
+ {% elif column.html_type == "imageUpload" %}
+
+
+ {% elif column.html_type == "fileUpload" %}
+
+
+ {% elif column.html_type == "editor" %}
+
+
+ {% elif column.html_type == "select" and dictType %}
+
+
+
+
+ {% elif column.html_type == "select" and not dictType %}
+
+
+
+
+ {% elif column.html_type == "checkbox" and dictType %}
+
+
+
+ {{ dict.label }}
+
+
+
+ {% elif column.html_type == "checkbox" and not dictType %}
+
+
+ 请选择字典生成
+
+
+ {% elif column.html_type == "radio" and dictType %}
+
+
+
+ {% raw %}{{{% endraw %} dict.label {% raw %}}}{% endraw %}
+
+
+
+ {% elif column.html_type == "radio" and not dictType %}
+
+
+
+
+ {% elif column.html_type == "datetime" %}
+
+
+
+
+ {% elif column.html_type == "textarea" %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ {% if table.sub %}
+ {{ subTable.functionName }}信息
+
+
+ 添加
+
+
+ 删除
+
+
+
+
+
+
+
+ {% elif column.list and column.html_type == 'datetime' %}
+
+
+
+
+
+
+ {% elif column.list and (column.html_type == 'select' or column.html_type == 'radio') and column.dict_type %}
+
+
+
+
+
+
+ {% elif column.list and (column.html_type == 'select' or column.html_type == 'radio') and not column.dict_type %}
+
+
+
+
+
+
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-fastapi-backend/requirements-pg.txt b/ruoyi-fastapi-backend/requirements-pg.txt
index 9e74b2fa622b8ac4a48650c6062c0442269a4462..3caa988da5f63fccebf7ce801b6e670557be217a 100644
--- a/ruoyi-fastapi-backend/requirements-pg.txt
+++ b/ruoyi-fastapi-backend/requirements-pg.txt
@@ -1,17 +1,17 @@
-APScheduler==3.10.4
+APScheduler==3.11.0
asyncpg==0.30.0
DateTime==5.5
-fastapi[all]==0.115.0
-loguru==0.7.2
+fastapi[all]==0.115.8
+loguru==0.7.3
openpyxl==3.1.5
-pandas==2.2.2
+pandas==2.2.3
passlib[bcrypt]==1.7.4
-Pillow==10.4.0
-psutil==6.0.0
+Pillow==11.1.0
+psutil==7.0.0
pydantic-validation-decorator==0.1.4
-PyJWT[crypto]==2.8.0
+PyJWT[crypto]==2.10.1
psycopg2==2.9.10
-redis==5.0.7
+redis==5.2.1
requests==2.32.3
-SQLAlchemy[asyncio]==2.0.31
+SQLAlchemy[asyncio]==2.0.38
user-agents==2.2.0
diff --git a/ruoyi-fastapi-backend/requirements.txt b/ruoyi-fastapi-backend/requirements.txt
index c09d7b892ca990a786a63026d2e7f6663c73a839..7a3705b8abdcb3145cce783c9911c2cc403aea77 100644
--- a/ruoyi-fastapi-backend/requirements.txt
+++ b/ruoyi-fastapi-backend/requirements.txt
@@ -1,17 +1,17 @@
-APScheduler==3.10.4
-asyncmy==0.2.9
+APScheduler==3.11.0
+asyncmy==0.2.10
DateTime==5.5
-fastapi[all]==0.115.0
-loguru==0.7.2
+fastapi[all]==0.115.8
+loguru==0.7.3
openpyxl==3.1.5
-pandas==2.2.2
+pandas==2.2.3
passlib[bcrypt]==1.7.4
-Pillow==10.4.0
-psutil==6.0.0
+Pillow==11.1.0
+psutil==7.0.0
pydantic-validation-decorator==0.1.4
-PyJWT[crypto]==2.8.0
+PyJWT[crypto]==2.10.1
PyMySQL==1.1.1
-redis==5.0.7
+redis==5.2.1
requests==2.32.3
-SQLAlchemy[asyncio]==2.0.31
+SQLAlchemy[asyncio]==2.0.38
user-agents==2.2.0
diff --git a/ruoyi-fastapi-backend/server.py b/ruoyi-fastapi-backend/server.py
index 00b4661dfc132653e08a1cfe648abf124f6af057..5c8ad9cc023d6b17f9cf137b117b609a05d60c50 100644
--- a/ruoyi-fastapi-backend/server.py
+++ b/ruoyi-fastapi-backend/server.py
@@ -22,6 +22,7 @@ from module_admin.controller.post_controler import postController
from module_admin.controller.role_controller import roleController
from module_admin.controller.server_controller import serverController
from module_admin.controller.user_controller import userController
+from module_generator.controller.gen_controller import genController
from sub_applications.handle import handle_sub_applications
from utils.common_util import worship
from utils.log_util import logger
@@ -77,6 +78,7 @@ controller_list = [
{'router': serverController, 'tags': ['系统监控-菜单管理']},
{'router': cacheController, 'tags': ['系统监控-缓存监控']},
{'router': commonController, 'tags': ['通用模块']},
+ {'router': genController, 'tags': ['代码生成']},
]
for controller in controller_list:
diff --git a/ruoyi-fastapi-backend/sql/ruoyi-fastapi-pg.sql b/ruoyi-fastapi-backend/sql/ruoyi-fastapi-pg.sql
index 79b7767c94e7bbcc8abca244dea48d60d5a12ee0..b3731aa3f42630736fe5619415a2b4203b6f1373 100644
--- a/ruoyi-fastapi-backend/sql/ruoyi-fastapi-pg.sql
+++ b/ruoyi-fastapi-backend/sql/ruoyi-fastapi-pg.sql
@@ -909,15 +909,16 @@ comment on table gen_table is '代码生成业务表';
drop table if exists gen_table_column;
create table gen_table_column (
column_id bigserial not null,
- table_id varchar(64),
+ table_id bigint,
column_name varchar(200),
column_comment varchar(500),
column_type varchar(100),
- java_type varchar(500),
- java_field varchar(200),
+ python_type varchar(500),
+ python_field varchar(200),
is_pk char(1),
is_increment char(1),
is_required char(1),
+ is_unique char(1),
is_insert char(1),
is_edit char(1),
is_list char(1),
@@ -937,11 +938,12 @@ comment on column gen_table_column.table_id is '归属表编号';
comment on column gen_table_column.column_name is '列名称';
comment on column gen_table_column.column_comment is '列描述';
comment on column gen_table_column.column_type is '列类型';
-comment on column gen_table_column.java_type is 'JAVA类型';
-comment on column gen_table_column.java_field is 'JAVA字段名';
+comment on column gen_table_column.python_type is 'PYTHON类型';
+comment on column gen_table_column.python_field is 'PYTHON字段名';
comment on column gen_table_column.is_pk is '是否主键（1是）';
comment on column gen_table_column.is_increment is '是否自增（1是）';
comment on column gen_table_column.is_required is '是否必填（1是）';
+comment on column gen_table_column.is_unique is '是否唯一（1是）';
comment on column gen_table_column.is_insert is '是否为插入字段（1是）';
comment on column gen_table_column.is_edit is '是否编辑字段（1是）';
comment on column gen_table_column.is_list is '是否列表字段（1是）';
@@ -975,3 +977,71 @@ END;
$BODY$
LANGUAGE plpgsql VOLATILE
COST 100;
+
+create or replace view list_column as
+SELECT c.relname AS table_name,
+ a.attname AS column_name,
+ d.description AS column_comment,
+ CASE
+ WHEN a.attnotnull AND con.conname IS NULL THEN '1'
+ ELSE '0'
+ END AS is_required,
+ CASE
+ WHEN con.conname IS NOT NULL THEN '1'
+ ELSE '0'
+ END AS is_pk,
+ a.attnum AS sort,
+ CASE
+ WHEN "position"(pg_get_expr(ad.adbin, ad.adrelid), ((c.relname::text || '_'::text) || a.attname
+ ::text) || '_seq'::text) > 0 THEN '1'
+ ELSE '0'
+ END AS is_increment,
+ btrim(
+ CASE
+ WHEN t.typelem <> 0::oid AND t.typlen = '-1'::integer THEN 'ARRAY'::text
+ ELSE
+ CASE
+ WHEN t.typtype = 'd'::"char" THEN format_type(t.typbasetype, NULL::integer)
+ ELSE format_type(a.atttypid, NULL::integer)
+ END
+ END, '"'::text) AS column_type
+FROM pg_attribute a
+ JOIN (pg_class c
+ JOIN pg_namespace n ON c.relnamespace = n.oid) ON a.attrelid = c.oid
+ LEFT JOIN pg_description d ON d.objoid = c.oid AND a.attnum = d.objsubid
+ LEFT JOIN pg_constraint con ON con.conrelid = c.oid AND (a.attnum = ANY (con.conkey))
+ LEFT JOIN pg_attrdef ad ON a.attrelid = ad.adrelid AND a.attnum = ad.adnum
+ LEFT JOIN pg_type t ON a.atttypid = t.oid
+WHERE (c.relkind = ANY (ARRAY['r'::"char", 'p'::"char"]))
+ AND a.attnum > 0
+ AND n.nspname = 'public'::name
+ AND not a.attisdropped
+ ORDER BY c.relname, a.attnum;
+
+create or replace view list_table as
+SELECT c.relname AS table_name,
+ obj_description(c.oid) AS table_comment,
+ CURRENT_TIMESTAMP AS create_time,
+ CURRENT_TIMESTAMP AS update_time
+FROM pg_class c
+ LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+WHERE (c.relkind = ANY (ARRAY['r'::"char", 'p'::"char"]))
+ AND c.relname !~~ 'spatial_%'::text AND n.nspname = 'public'::name AND n.nspname <> ''::name;
+
+CREATE OR REPLACE FUNCTION substring_index(varchar, varchar, integer)
+RETURNS varchar AS $$
+DECLARE
+tokens varchar[];
+length integer ;
+indexnum integer;
+BEGIN
+tokens := pg_catalog.string_to_array($1, $2);
+length := pg_catalog.array_upper(tokens, 1);
+indexnum := length - ($3 * -1) + 1;
+IF $3 >= 0 THEN
+RETURN pg_catalog.array_to_string(tokens[1:$3], $2);
+ELSE
+RETURN pg_catalog.array_to_string(tokens[indexnum:length], $2);
+END IF;
+END;
+$$ IMMUTABLE STRICT LANGUAGE PLPGSQL;
diff --git a/ruoyi-fastapi-backend/sql/ruoyi-fastapi.sql b/ruoyi-fastapi-backend/sql/ruoyi-fastapi.sql
index ef5a8debddd0c2f695424ce2ca201ab6ab217c9f..d0ce11a55b1a50d9a9feeb84f8f0d4c46bc02333 100644
--- a/ruoyi-fastapi-backend/sql/ruoyi-fastapi.sql
+++ b/ruoyi-fastapi-backend/sql/ruoyi-fastapi.sql
@@ -691,11 +691,12 @@ create table gen_table_column (
column_name varchar(200) comment '列名称',
column_comment varchar(500) comment '列描述',
column_type varchar(100) comment '列类型',
- java_type varchar(500) comment 'JAVA类型',
- java_field varchar(200) comment 'JAVA字段名',
+ python_type varchar(500) comment 'PYTHON类型',
+ python_field varchar(200) comment 'PYTHON字段名',
is_pk char(1) comment '是否主键（1是）',
is_increment char(1) comment '是否自增（1是）',
is_required char(1) comment '是否必填（1是）',
+ is_unique char(1) comment '是否唯一（1是）',
is_insert char(1) comment '是否为插入字段（1是）',
is_edit char(1) comment '是否编辑字段（1是）',
is_list char(1) comment '是否列表字段（1是）',
diff --git a/ruoyi-fastapi-backend/utils/common_util.py b/ruoyi-fastapi-backend/utils/common_util.py
index 86f502e56b7b924b12f831f27aa879ba3b6a23f4..b56000e453dec419417fc4abfb02dbdcacaa20ba 100644
--- a/ruoyi-fastapi-backend/utils/common_util.py
+++ b/ruoyi-fastapi-backend/utils/common_util.py
@@ -7,6 +7,7 @@ from openpyxl.styles import Alignment, PatternFill
from openpyxl.utils import get_column_letter
from openpyxl.worksheet.datavalidation import DataValidation
from sqlalchemy.engine.row import Row
+from sqlalchemy.orm.collections import InstrumentedList
from typing import Any, Dict, List, Literal, Union
from config.database import Base
from config.env import CachePathConfig
@@ -58,6 +59,9 @@ class SqlalchemyUtil:
if isinstance(obj, Base):
base_dict = obj.__dict__.copy()
base_dict.pop('_sa_instance_state', None)
+ for name, value in base_dict.items():
+ if isinstance(value, InstrumentedList):
+ base_dict[name] = cls.serialize_result(value, 'snake_to_camel')
elif isinstance(obj, dict):
base_dict = obj.copy()
if transform_case == 'snake_to_camel':
diff --git a/ruoyi-fastapi-backend/utils/excel_util.py b/ruoyi-fastapi-backend/utils/excel_util.py
new file mode 100644
index 0000000000000000000000000000000000000000..875a41d92f1fa3b262772401793fca452a9a7d99
--- /dev/null
+++ b/ruoyi-fastapi-backend/utils/excel_util.py
@@ -0,0 +1,104 @@
+import io
+import pandas as pd
+from openpyxl import Workbook
+from openpyxl.styles import Alignment, PatternFill
+from openpyxl.utils import get_column_letter
+from openpyxl.worksheet.datavalidation import DataValidation
+from typing import Dict, List
+
+
+class ExcelUtil:
+ """
+ Excel操作类
+ """
+
+ @classmethod
+ def __mapping_list(cls, list_data: List, mapping_dict: Dict):
+ """
+ 工具方法：将list数据中的字段名映射为对应的中文字段名
+
+ :param list_data: 数据列表
+ :param mapping_dict: 映射字典
+ :return: 映射后的数据列表
+ """
+ mapping_data = [{mapping_dict.get(key): item.get(key) for key in mapping_dict} for item in list_data]
+
+ return mapping_data
+
+ @classmethod
+ def export_list2excel(cls, list_data: List, mapping_dict: Dict):
+ """
+ 工具方法：将需要导出的list数据转化为对应excel的二进制数据
+
+ :param list_data: 数据列表
+ :param mapping_dict: 映射字典
+ :return: list数据对应excel的二进制数据
+ """
+ mapping_data = cls.__mapping_list(list_data, mapping_dict)
+ df = pd.DataFrame(mapping_data)
+ binary_data = io.BytesIO()
+ df.to_excel(binary_data, index=False, engine='openpyxl')
+ binary_data = binary_data.getvalue()
+
+ return binary_data
+
+ @classmethod
+ def get_excel_template(cls, header_list: List, selector_header_list: List, option_list: List[Dict]):
+ """
+ 工具方法：将需要导出的list数据转化为对应excel的二进制数据
+
+ :param header_list: 表头数据列表
+ :param selector_header_list: 需要设置为选择器格式的表头数据列表
+ :param option_list: 选择器格式的表头预设的选项列表
+ :return: 模板excel的二进制数据
+ """
+ # 创建Excel工作簿
+ wb = Workbook()
+ # 选择默认的活动工作表
+ ws = wb.active
+
+ # 设置表头文字
+ headers = header_list
+
+ # 设置表头背景样式为灰色，前景色为白色
+ header_fill = PatternFill(start_color='ababab', end_color='ababab', fill_type='solid')
+
+ # 将表头写入第一行
+ for col_num, header in enumerate(headers, 1):
+ cell = ws.cell(row=1, column=col_num)
+ cell.value = header
+ cell.fill = header_fill
+ # 设置列宽度为16
+ ws.column_dimensions[chr(64 + col_num)].width = 12
+ # 设置水平居中对齐
+ cell.alignment = Alignment(horizontal='center')
+
+ # 设置选择器的预设选项
+ options = option_list
+
+ # 获取selector_header的字母索引
+ for selector_header in selector_header_list:
+ column_selector_header_index = headers.index(selector_header) + 1
+
+ # 创建数据有效性规则
+ header_option = []
+ for option in options:
+ if option.get(selector_header):
+ header_option = option.get(selector_header)
+ dv = DataValidation(type='list', formula1=f'"{",".join(header_option)}"')
+ # 设置数据有效性规则的起始单元格和结束单元格
+ dv.add(
+ f'{get_column_letter(column_selector_header_index)}2:{get_column_letter(column_selector_header_index)}1048576'
+ )
+ # 添加数据有效性规则到工作表
+ ws.add_data_validation(dv)
+
+ # 保存Excel文件为字节类型的数据
+ file = io.BytesIO()
+ wb.save(file)
+ file.seek(0)
+
+ # 读取字节数据
+ excel_data = file.getvalue()
+
+ return excel_data
diff --git a/ruoyi-fastapi-backend/utils/gen_util.py b/ruoyi-fastapi-backend/utils/gen_util.py
new file mode 100644
index 0000000000000000000000000000000000000000..355e5d022557c757507c95c81c585e9e3b2f7647
--- /dev/null
+++ b/ruoyi-fastapi-backend/utils/gen_util.py
@@ -0,0 +1,223 @@
+import re
+from datetime import datetime
+from typing import List
+from config.constant import GenConstant
+from config.env import GenConfig
+from module_generator.entity.vo.gen_vo import GenTableColumnModel, GenTableModel
+from utils.string_util import StringUtil
+
+
+class GenUtils:
+ """代码生成器工具类"""
+
+ @classmethod
+ def init_table(cls, gen_table: GenTableModel, oper_name: str) -> None:
+ """
+ 初始化表信息
+
+ param gen_table: 业务表对象
+ param oper_name: 操作人
+ :return:
+ """
+ gen_table.class_name = cls.convert_class_name(gen_table.table_name)
+ gen_table.package_name = GenConfig.package_name
+ gen_table.module_name = cls.get_module_name(GenConfig.package_name)
+ gen_table.business_name = cls.get_business_name(gen_table.table_name)
+ gen_table.function_name = cls.replace_text(gen_table.table_comment)
+ gen_table.function_author = GenConfig.author
+ gen_table.create_by = oper_name
+ gen_table.create_time = datetime.now()
+ gen_table.update_by = oper_name
+ gen_table.update_time = datetime.now()
+
+ @classmethod
+ def init_column_field(cls, column: GenTableColumnModel, table: GenTableModel) -> None:
+ """
+ 初始化列属性字段
+
+ param column: 业务表字段对象
+ param table: 业务表对象
+ :return:
+ """
+ data_type = cls.get_db_type(column.column_type)
+ column_name = column.column_name
+ column.table_id = table.table_id
+ column.create_by = table.create_by
+ # 设置Python字段名
+ column.python_field = cls.to_camel_case(column_name)
+ # 设置默认类型
+ column.python_type = StringUtil.get_mapping_value_by_key_ignore_case(
+ GenConstant.DB_TO_PYTHON_TYPE_MAPPING, data_type
+ )
+ column.query_type = GenConstant.QUERY_EQ
+
+ if cls.arrays_contains(GenConstant.COLUMNTYPE_STR, data_type) or cls.arrays_contains(
+ GenConstant.COLUMNTYPE_TEXT, data_type
+ ):
+ # 字符串长度超过500设置为文本域
+ column_length = cls.get_column_length(column.column_type)
+ html_type = (
+ GenConstant.HTML_TEXTAREA
+ if column_length >= 500 or cls.arrays_contains(GenConstant.COLUMNTYPE_TEXT, data_type)
+ else GenConstant.HTML_INPUT
+ )
+ column.html_type = html_type
+ elif cls.arrays_contains(GenConstant.COLUMNTYPE_TIME, data_type):
+ column.html_type = GenConstant.HTML_DATETIME
+ elif cls.arrays_contains(GenConstant.COLUMNTYPE_NUMBER, data_type):
+ column.html_type = GenConstant.HTML_INPUT
+
+ # 插入字段（默认所有字段都需要插入）
+ column.is_insert = GenConstant.REQUIRE
+
+ # 编辑字段
+ if not cls.arrays_contains(GenConstant.COLUMNNAME_NOT_EDIT, column_name) and not column.pk:
+ column.is_edit = GenConstant.REQUIRE
+ # 列表字段
+ if not cls.arrays_contains(GenConstant.COLUMNNAME_NOT_LIST, column_name) and not column.pk:
+ column.is_list = GenConstant.REQUIRE
+ # 查询字段
+ if not cls.arrays_contains(GenConstant.COLUMNNAME_NOT_QUERY, column_name) and not column.pk:
+ column.is_query = GenConstant.REQUIRE
+
+ # 查询字段类型
+ if column_name.lower().endswith('name'):
+ column.query_type = GenConstant.QUERY_LIKE
+ # 状态字段设置单选框
+ if column_name.lower().endswith('status'):
+ column.html_type = GenConstant.HTML_RADIO
+ # 类型&性别字段设置下拉框
+ elif column_name.lower().endswith('type') or column_name.lower().endswith('sex'):
+ column.html_type = GenConstant.HTML_SELECT
+ # 图片字段设置图片上传控件
+ elif column_name.lower().endswith('image'):
+ column.html_type = GenConstant.HTML_IMAGE_UPLOAD
+ # 文件字段设置文件上传控件
+ elif column_name.lower().endswith('file'):
+ column.html_type = GenConstant.HTML_FILE_UPLOAD
+ # 内容字段设置富文本控件
+ elif column_name.lower().endswith('content'):
+ column.html_type = GenConstant.HTML_EDITOR
+
+ column.create_by = table.create_by
+ column.create_time = datetime.now()
+ column.update_by = table.update_by
+ column.update_time = datetime.now()
+
+ @classmethod
+ def arrays_contains(cls, arr: List[str], target_value: str) -> bool:
+ """
+ 校验数组是否包含指定值
+
+ param arr: 数组
+ param target_value: 需要校验的值
+ :return: 校验结果
+ """
+ return target_value in arr
+
+ @classmethod
+ def get_module_name(cls, package_name: str) -> str:
+ """
+ 获取模块名
+
+ param package_name: 包名
+ :return: 模块名
+ """
+ return package_name.split('.')[-1]
+
+ @classmethod
+ def get_business_name(cls, table_name: str) -> str:
+ """
+ 获取业务名
+
+ param table_name: 业务表名
+ :return: 业务名
+ """
+ return table_name.split('_')[-1]
+
+ @classmethod
+ def convert_class_name(cls, table_name: str) -> str:
+ """
+ 表名转换成Python类名
+
+ param table_name: 业务表名
+ :return: Python类名
+ """
+ auto_remove_pre = GenConfig.auto_remove_pre
+ table_prefix = GenConfig.table_prefix
+ if auto_remove_pre and table_prefix:
+ search_list = table_prefix.split(',')
+ table_name = cls.replace_first(table_name, search_list)
+ return StringUtil.convert_to_camel_case(table_name)
+
+ @classmethod
+ def replace_first(cls, replacement: str, search_list: List[str]) -> str:
+ """
+ 批量替换前缀
+
+ param replacement: 需要被替换的字符串
+ param search_list: 可替换的字符串列表
+ :return: 替换后的字符串
+ """
+ for search_string in search_list:
+ if replacement.startswith(search_string):
+ return replacement.replace(search_string, '', 1)
+ return replacement
+
+ @classmethod
+ def replace_text(cls, text: str) -> str:
+ """
+ 关键字替换
+
+ param text: 需要被替换的字符串
+ :return: 替换后的字符串
+ """
+ return re.sub(r'(?:表|若依)', '', text)
+
+ @classmethod
+ def get_db_type(cls, column_type: str) -> str:
+ """
+ 获取数据库类型字段
+
+ param column_type: 字段类型
+ :return: 数据库类型
+ """
+ if '(' in column_type:
+ return column_type.split('(')[0]
+ return column_type
+
+ @classmethod
+ def get_column_length(cls, column_type: str) -> int:
+ """
+ 获取字段长度
+
+ param column_type: 字段类型
+ :return: 字段长度
+ """
+ if '(' in column_type:
+ length = len(column_type.split('(')[1].split(')')[0])
+ return length
+ return 0
+
+ @classmethod
+ def split_column_type(cls, column_type: str) -> List[str]:
+ """
+ 拆分列类型
+
+ param column_type: 字段类型
+ :return: 拆分结果
+ """
+ if '(' in column_type and ')' in column_type:
+ return column_type.split('(')[1].split(')')[0].split(',')
+ return []
+
+ @classmethod
+ def to_camel_case(cls, text: str) -> str:
+ """
+ 将字符串转换为驼峰命名
+
+ param text: 需要转换的字符串
+ :return: 驼峰命名
+ """
+ parts = text.split('_')
+ return parts[0] + ''.join(word.capitalize() for word in parts[1:])
diff --git a/ruoyi-fastapi-backend/utils/log_util.py b/ruoyi-fastapi-backend/utils/log_util.py
index e42f3938cc8435e49f02c17aac4bfa215ed866a7..f953f55159b10b686e84975964fd9e7f7a761cf6 100644
--- a/ruoyi-fastapi-backend/utils/log_util.py
+++ b/ruoyi-fastapi-backend/utils/log_util.py
@@ -1,11 +1,60 @@
import os
+import sys
import time
-from loguru import logger
+from loguru import logger as _logger
+from typing import Dict
+from middlewares.trace_middleware import TraceCtx
-log_path = os.path.join(os.getcwd(), 'logs')
-if not os.path.exists(log_path):
- os.mkdir(log_path)
-log_path_error = os.path.join(log_path, f'{time.strftime("%Y-%m-%d")}_error.log')
+class LoggerInitializer:
+ def __init__(self):
+ self.log_path = os.path.join(os.getcwd(), 'logs')
+ self.__ensure_log_directory_exists()
+ self.log_path_error = os.path.join(self.log_path, f'{time.strftime("%Y-%m-%d")}_error.log')
-logger.add(log_path_error, rotation='50MB', encoding='utf-8', enqueue=True, compression='zip')
+ def __ensure_log_directory_exists(self):
+ """
+ 确保日志目录存在，如果不存在则创建
+ """
+ if not os.path.exists(self.log_path):
+ os.mkdir(self.log_path)
+
+ @staticmethod
+ def __filter(log: Dict):
+ """
+ 自定义日志过滤器，添加trace_id
+ """
+ log['trace_id'] = TraceCtx.get_id()
+ return log
+
+ def init_log(self):
+ """
+ 初始化日志配置
+ """
+ # 自定义日志格式
+ format_str = (
+ '{time:YYYY-MM-DD HH:mm:ss.SSS} | '
+ '{trace_id} | '
+ '{level: <8} | '
+ '{name} :{function} :{line} - '
+ '{message} '
+ )
+ _logger.remove()
+ # 移除后重新添加sys.stderr, 目的: 控制台输出与文件日志内容和结构一致
+ _logger.add(sys.stderr, filter=self.__filter, format=format_str, enqueue=True)
+ _logger.add(
+ self.log_path_error,
+ filter=self.__filter,
+ format=format_str,
+ rotation='50MB',
+ encoding='utf-8',
+ enqueue=True,
+ compression='zip',
+ )
+
+ return _logger
+
+
+# 初始化日志处理器
+log_initializer = LoggerInitializer()
+logger = log_initializer.init_log()
diff --git a/ruoyi-fastapi-backend/utils/response_util.py b/ruoyi-fastapi-backend/utils/response_util.py
index 88d2e37bfa72db23ecc3e88967ed521348e7c68c..01d463281c510a162df8713162b2206f1b808f0f 100644
--- a/ruoyi-fastapi-backend/utils/response_util.py
+++ b/ruoyi-fastapi-backend/utils/response_util.py
@@ -3,7 +3,8 @@ from fastapi import status
from fastapi.encoders import jsonable_encoder
from fastapi.responses import JSONResponse, Response, StreamingResponse
from pydantic import BaseModel
-from typing import Any, Dict, Optional
+from starlette.background import BackgroundTask
+from typing import Any, Dict, Mapping, Optional
from config.constant import HttpStatusConstant
@@ -20,6 +21,9 @@ class ResponseUtil:
rows: Optional[Any] = None,
dict_content: Optional[Dict] = None,
model_content: Optional[BaseModel] = None,
+ headers: Optional[Mapping[str, str]] = None,
+ media_type: Optional[str] = None,
+ background: Optional[BackgroundTask] = None,
) -> Response:
"""
成功响应方法
@@ -29,6 +33,9 @@ class ResponseUtil:
:param rows: 可选，成功响应结果中属性为rows的值
:param dict_content: 可选，dict类型，成功响应结果中自定义属性的值
:param model_content: 可选，BaseModel类型，成功响应结果中自定义属性的值
+ :param headers: 可选，响应头信息
+ :param media_type: 可选，响应结果媒体类型
+ :param background: 可选，响应返回后执行的后台任务
:return: 成功响应结果
"""
result = {'code': HttpStatusConstant.SUCCESS, 'msg': msg}
@@ -44,7 +51,13 @@ class ResponseUtil:
result.update({'success': True, 'time': datetime.now()})
- return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder(result))
+ return JSONResponse(
+ status_code=status.HTTP_200_OK,
+ content=jsonable_encoder(result),
+ headers=headers,
+ media_type=media_type,
+ background=background,
+ )
@classmethod
def failure(
@@ -54,6 +67,9 @@ class ResponseUtil:
rows: Optional[Any] = None,
dict_content: Optional[Dict] = None,
model_content: Optional[BaseModel] = None,
+ headers: Optional[Mapping[str, str]] = None,
+ media_type: Optional[str] = None,
+ background: Optional[BackgroundTask] = None,
) -> Response:
"""
失败响应方法
@@ -63,6 +79,9 @@ class ResponseUtil:
:param rows: 可选，失败响应结果中属性为rows的值
:param dict_content: 可选，dict类型，失败响应结果中自定义属性的值
:param model_content: 可选，BaseModel类型，失败响应结果中自定义属性的值
+ :param headers: 可选，响应头信息
+ :param media_type: 可选，响应结果媒体类型
+ :param background: 可选，响应返回后执行的后台任务
:return: 失败响应结果
"""
result = {'code': HttpStatusConstant.WARN, 'msg': msg}
@@ -78,7 +97,13 @@ class ResponseUtil:
result.update({'success': False, 'time': datetime.now()})
- return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder(result))
+ return JSONResponse(
+ status_code=status.HTTP_200_OK,
+ content=jsonable_encoder(result),
+ headers=headers,
+ media_type=media_type,
+ background=background,
+ )
@classmethod
def unauthorized(
@@ -88,6 +113,9 @@ class ResponseUtil:
rows: Optional[Any] = None,
dict_content: Optional[Dict] = None,
model_content: Optional[BaseModel] = None,
+ headers: Optional[Mapping[str, str]] = None,
+ media_type: Optional[str] = None,
+ background: Optional[BackgroundTask] = None,
) -> Response:
"""
未认证响应方法
@@ -97,6 +125,9 @@ class ResponseUtil:
:param rows: 可选，未认证响应结果中属性为rows的值
:param dict_content: 可选，dict类型，未认证响应结果中自定义属性的值
:param model_content: 可选，BaseModel类型，未认证响应结果中自定义属性的值
+ :param headers: 可选，响应头信息
+ :param media_type: 可选，响应结果媒体类型
+ :param background: 可选，响应返回后执行的后台任务
:return: 未认证响应结果
"""
result = {'code': HttpStatusConstant.UNAUTHORIZED, 'msg': msg}
@@ -112,7 +143,13 @@ class ResponseUtil:
result.update({'success': False, 'time': datetime.now()})
- return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder(result))
+ return JSONResponse(
+ status_code=status.HTTP_200_OK,
+ content=jsonable_encoder(result),
+ headers=headers,
+ media_type=media_type,
+ background=background,
+ )
@classmethod
def forbidden(
@@ -122,6 +159,9 @@ class ResponseUtil:
rows: Optional[Any] = None,
dict_content: Optional[Dict] = None,
model_content: Optional[BaseModel] = None,
+ headers: Optional[Mapping[str, str]] = None,
+ media_type: Optional[str] = None,
+ background: Optional[BackgroundTask] = None,
) -> Response:
"""
未授权响应方法
@@ -131,6 +171,9 @@ class ResponseUtil:
:param rows: 可选，未授权响应结果中属性为rows的值
:param dict_content: 可选，dict类型，未授权响应结果中自定义属性的值
:param model_content: 可选，BaseModel类型，未授权响应结果中自定义属性的值
+ :param headers: 可选，响应头信息
+ :param media_type: 可选，响应结果媒体类型
+ :param background: 可选，响应返回后执行的后台任务
:return: 未授权响应结果
"""
result = {'code': HttpStatusConstant.FORBIDDEN, 'msg': msg}
@@ -146,7 +189,13 @@ class ResponseUtil:
result.update({'success': False, 'time': datetime.now()})
- return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder(result))
+ return JSONResponse(
+ status_code=status.HTTP_200_OK,
+ content=jsonable_encoder(result),
+ headers=headers,
+ media_type=media_type,
+ background=background,
+ )
@classmethod
def error(
@@ -156,6 +205,9 @@ class ResponseUtil:
rows: Optional[Any] = None,
dict_content: Optional[Dict] = None,
model_content: Optional[BaseModel] = None,
+ headers: Optional[Mapping[str, str]] = None,
+ media_type: Optional[str] = None,
+ background: Optional[BackgroundTask] = None,
) -> Response:
"""
错误响应方法
@@ -165,6 +217,9 @@ class ResponseUtil:
:param rows: 可选，错误响应结果中属性为rows的值
:param dict_content: 可选，dict类型，错误响应结果中自定义属性的值
:param model_content: 可选，BaseModel类型，错误响应结果中自定义属性的值
+ :param headers: 可选，响应头信息
+ :param media_type: 可选，响应结果媒体类型
+ :param background: 可选，响应返回后执行的后台任务
:return: 错误响应结果
"""
result = {'code': HttpStatusConstant.ERROR, 'msg': msg}
@@ -180,14 +235,32 @@ class ResponseUtil:
result.update({'success': False, 'time': datetime.now()})
- return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder(result))
+ return JSONResponse(
+ status_code=status.HTTP_200_OK,
+ content=jsonable_encoder(result),
+ headers=headers,
+ media_type=media_type,
+ background=background,
+ )
@classmethod
- def streaming(cls, *, data: Any = None):
+ def streaming(
+ cls,
+ *,
+ data: Any = None,
+ headers: Optional[Mapping[str, str]] = None,
+ media_type: Optional[str] = None,
+ background: Optional[BackgroundTask] = None,
+ ) -> Response:
"""
流式响应方法
:param data: 流式传输的内容
+ :param headers: 可选，响应头信息
+ :param media_type: 可选，响应结果媒体类型
+ :param background: 可选，响应返回后执行的后台任务
:return: 流式响应结果
"""
- return StreamingResponse(status_code=status.HTTP_200_OK, content=data)
+ return StreamingResponse(
+ status_code=status.HTTP_200_OK, content=data, headers=headers, media_type=media_type, background=background
+ )
diff --git a/ruoyi-fastapi-backend/utils/string_util.py b/ruoyi-fastapi-backend/utils/string_util.py
index 0be9e653bffdd63dace928ed6d95059dabf74ce8..7196bcf53de6530c8a3f760aee40abc893c1baa3 100644
--- a/ruoyi-fastapi-backend/utils/string_util.py
+++ b/ruoyi-fastapi-backend/utils/string_util.py
@@ -1,4 +1,4 @@
-from typing import List
+from typing import Dict, List
from config.constant import CommonConstant
@@ -36,6 +36,16 @@ class StringUtil:
"""
return string is None or len(string) == 0
+ @classmethod
+ def is_not_empty(cls, string: str) -> bool:
+ """
+ 校验字符串是否不是''和None
+
+ :param string: 需要校验的字符串
+ :return: 校验结果
+ """
+ return not cls.is_empty(string)
+
@classmethod
def is_http(cls, link: str):
"""
@@ -49,7 +59,7 @@ class StringUtil:
@classmethod
def contains_ignore_case(cls, search_str: str, compare_str: str):
"""
- 查找指定字符串是否包含指定字符串同时串忽略大小写
+ 查找指定字符串是否包含指定字符串同时忽略大小写
:param search_str: 查找的字符串
:param compare_str: 比对的字符串
@@ -62,15 +72,40 @@ class StringUtil:
@classmethod
def contains_any_ignore_case(cls, search_str: str, compare_str_list: List[str]):
"""
- 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+ 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时忽略大小写
:param search_str: 查找的字符串
:param compare_str_list: 比对的字符串列表
:return: 查找结果
"""
if search_str and compare_str_list:
- for compare_str in compare_str_list:
- return cls.contains_ignore_case(search_str, compare_str)
+ return any([cls.contains_ignore_case(search_str, compare_str) for compare_str in compare_str_list])
+ return False
+
+ @classmethod
+ def equals_ignore_case(cls, search_str: str, compare_str: str):
+ """
+ 比较两个字符串是否相等同时忽略大小写
+
+ :param search_str: 查找的字符串
+ :param compare_str: 比对的字符串
+ :return: 比较结果
+ """
+ if search_str and compare_str:
+ return search_str.lower() == compare_str.lower()
+ return False
+
+ @classmethod
+ def equals_any_ignore_case(cls, search_str: str, compare_str_list: List[str]):
+ """
+ 比较指定字符串是否与指定字符串列表中的任意一个字符串相等同时忽略大小写
+
+ :param search_str: 查找的字符串
+ :param compare_str_list: 比对的字符串列表
+ :return: 比较结果
+ """
+ if search_str and compare_str_list:
+ return any([cls.equals_ignore_case(search_str, compare_str) for compare_str in compare_str_list])
return False
@classmethod
@@ -96,6 +131,40 @@ class StringUtil:
:return: 查找结果
"""
if search_str and compare_str_list:
- for compare_str in compare_str_list:
- return cls.startswith_case(search_str, compare_str)
+ return any([cls.startswith_case(search_str, compare_str) for compare_str in compare_str_list])
return False
+
+ @classmethod
+ def convert_to_camel_case(cls, name: str) -> str:
+ """
+ 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串
+
+ :param name: 转换前的下划线大写方式命名的字符串
+ :return: 转换后的驼峰式命名的字符串
+ """
+ if not name:
+ return ''
+ if '_' not in name:
+ return name[0].upper() + name[1:]
+ parts = name.split('_')
+ result = []
+ for part in parts:
+ if not part:
+ continue
+ result.append(part[0].upper() + part[1:].lower())
+ return ''.join(result)
+
+ @classmethod
+ def get_mapping_value_by_key_ignore_case(cls, mapping: Dict[str, str], key: str) -> str:
+ """
+ 根据忽略大小写的键获取字典中的对应的值
+
+ param mapping: 字典
+ param key: 字典的键
+ :return: 字典键对应的值
+ """
+ for k, v in mapping.items():
+ if key.lower() == k.lower():
+ return v
+
+ return ''
diff --git a/ruoyi-fastapi-backend/utils/template_util.py b/ruoyi-fastapi-backend/utils/template_util.py
new file mode 100644
index 0000000000000000000000000000000000000000..55a8f879c7fd775fbeb60c6756963aa30e3e0306
--- /dev/null
+++ b/ruoyi-fastapi-backend/utils/template_util.py
@@ -0,0 +1,468 @@
+import json
+import os
+from datetime import datetime
+from jinja2 import Environment, FileSystemLoader
+from typing import Dict, List, Set
+from config.constant import GenConstant
+from config.env import DataBaseConfig
+from exceptions.exception import ServiceWarning
+from module_generator.entity.vo.gen_vo import GenTableModel, GenTableColumnModel
+from utils.common_util import CamelCaseUtil, SnakeCaseUtil
+from utils.string_util import StringUtil
+
+
+class TemplateInitializer:
+ """
+ 模板引擎初始化类
+ """
+
+ @classmethod
+ def init_jinja2(cls):
+ """
+ 初始化 Jinja2 模板引擎
+
+ :return: Jinja2 环境对象
+ """
+ try:
+ template_dir = os.path.join(os.getcwd(), 'module_generator', 'templates')
+ env = Environment(
+ loader=FileSystemLoader(template_dir),
+ keep_trailing_newline=True,
+ trim_blocks=True,
+ lstrip_blocks=True,
+ )
+ env.filters.update(
+ {
+ 'camel_to_snake': SnakeCaseUtil.camel_to_snake,
+ 'snake_to_camel': CamelCaseUtil.snake_to_camel,
+ 'get_sqlalchemy_type': TemplateUtils.get_sqlalchemy_type,
+ }
+ )
+ return env
+ except Exception as e:
+ raise RuntimeError(f'初始化Jinja2模板引擎失败: {e}')
+
+
+class TemplateUtils:
+ """
+ 模板工具类
+ """
+
+ # 项目路径
+ FRONTEND_PROJECT_PATH = 'frontend'
+ BACKEND_PROJECT_PATH = 'backend'
+ DEFAULT_PARENT_MENU_ID = '3'
+
+ @classmethod
+ def prepare_context(cls, gen_table: GenTableModel):
+ """
+ 准备模板变量
+
+ :param gen_table: 生成表的配置信息
+ :return: 模板上下文字典
+ """
+ if not gen_table.options:
+ raise ServiceWarning(message='请先完善生成配置信息')
+ class_name = gen_table.class_name
+ module_name = gen_table.module_name
+ business_name = gen_table.business_name
+ package_name = gen_table.package_name
+ tpl_category = gen_table.tpl_category
+ function_name = gen_table.function_name
+
+ context = {
+ 'tplCategory': tpl_category,
+ 'tableName': gen_table.table_name,
+ 'functionName': function_name if StringUtil.is_not_empty(function_name) else '【请填写功能名称】',
+ 'ClassName': class_name,
+ 'className': class_name.lower(),
+ 'moduleName': module_name,
+ 'BusinessName': business_name.capitalize(),
+ 'businessName': business_name,
+ 'basePackage': cls.get_package_prefix(package_name),
+ 'packageName': package_name,
+ 'author': gen_table.function_author,
+ 'datetime': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
+ 'pkColumn': gen_table.pk_column,
+ 'doImportList': cls.get_do_import_list(gen_table),
+ 'voImportList': cls.get_vo_import_list(gen_table),
+ 'permissionPrefix': cls.get_permission_prefix(module_name, business_name),
+ 'columns': gen_table.columns,
+ 'table': gen_table,
+ 'dicts': cls.get_dicts(gen_table),
+ 'dbType': DataBaseConfig.db_type,
+ }
+
+ # 设置菜单、树形结构、子表的上下文
+ cls.set_menu_context(context, gen_table)
+ if tpl_category == GenConstant.TPL_TREE:
+ cls.set_tree_context(context, gen_table)
+ if tpl_category == GenConstant.TPL_SUB:
+ cls.set_sub_context(context, gen_table)
+
+ return context
+
+ @classmethod
+ def set_menu_context(cls, context: Dict, gen_table: GenTableModel):
+ """
+ 设置菜单上下文
+
+ :param context: 模板上下文字典
+ :param gen_table: 生成表的配置信息
+ :return: 新的模板上下文字典
+ """
+ options = gen_table.options
+ params_obj = json.loads(options)
+ context['parentMenuId'] = cls.get_parent_menu_id(params_obj)
+
+ @classmethod
+ def set_tree_context(cls, context: Dict, gen_table: GenTableModel):
+ """
+ 设置树形结构上下文
+
+ :param context: 模板上下文字典
+ :param gen_table: 生成表的配置信息
+ :return: 新的模板上下文字典
+ """
+ options = gen_table.options
+ params_obj = json.loads(options)
+ context['treeCode'] = cls.get_tree_code(params_obj)
+ context['treeParentCode'] = cls.get_tree_parent_code(params_obj)
+ context['treeName'] = cls.get_tree_name(params_obj)
+ context['expandColumn'] = cls.get_expand_column(gen_table)
+
+ @classmethod
+ def set_sub_context(cls, context: Dict, gen_table: GenTableModel):
+ """
+ 设置子表上下文
+
+ :param context: 模板上下文字典
+ :param gen_table: 生成表的配置信息
+ :return: 新的模板上下文字典
+ """
+ sub_table = gen_table.sub_table
+ sub_table_name = gen_table.sub_table_name
+ sub_table_fk_name = gen_table.sub_table_fk_name
+ sub_class_name = sub_table.class_name
+ sub_table_fk_class_name = StringUtil.convert_to_camel_case(sub_table_fk_name)
+ context['subTable'] = sub_table
+ context['subTableName'] = sub_table_name
+ context['subTableFkName'] = sub_table_fk_name
+ context['subTableFkClassName'] = sub_table_fk_class_name
+ context['subTableFkclassName'] = sub_table_fk_class_name.lower()
+ context['subClassName'] = sub_class_name
+ context['subclassName'] = sub_class_name.lower()
+
+ @classmethod
+ def get_template_list(cls, tpl_category: str, tpl_web_type: str):
+ """
+ 获取模板列表
+
+ :param tpl_category: 生成模板类型
+ :param tpl_web_type: 前端类型
+ :return: 模板列表
+ """
+ use_web_type = 'vue'
+ if tpl_web_type == 'element-plus':
+ use_web_type = 'vue/v3'
+ templates = [
+ 'python/controller.py.jinja2',
+ 'python/dao.py.jinja2',
+ 'python/do.py.jinja2',
+ 'python/service.py.jinja2',
+ 'python/vo.py.jinja2',
+ 'sql/sql.jinja2',
+ 'js/api.js.jinja2',
+ ]
+ if tpl_category == GenConstant.TPL_CRUD:
+ templates.append(f'{use_web_type}/index.vue.jinja2')
+ elif tpl_category == GenConstant.TPL_TREE:
+ templates.append(f'{use_web_type}/index-tree.vue.jinja2')
+ elif tpl_category == GenConstant.TPL_SUB:
+ templates.append(f'{use_web_type}/index.vue.jinja2')
+ # templates.append('python/sub-domain.python.jinja2')
+ return templates
+
+ @classmethod
+ def get_file_name(cls, template: List[str], gen_table: GenTableModel):
+ """
+ 根据模板生成文件名
+
+ :param template: 模板列表
+ :param gen_table: 生成表的配置信息
+ :return: 模板生成文件名
+ """
+ package_name = gen_table.package_name
+ module_name = gen_table.module_name
+ business_name = gen_table.business_name
+
+ vue_path = cls.FRONTEND_PROJECT_PATH
+ python_path = f'{cls.BACKEND_PROJECT_PATH}/{package_name.replace(".", "/")}'
+
+ if 'controller.py.jinja2' in template:
+ return f'{python_path}/controller/{business_name}_controller.py'
+ elif 'dao.py.jinja2' in template:
+ return f'{python_path}/dao/{business_name}_dao.py'
+ elif 'do.py.jinja2' in template:
+ return f'{python_path}/entity/do/{business_name}_do.py'
+ elif 'service.py.jinja2' in template:
+ return f'{python_path}/service/{business_name}_service.py'
+ elif 'vo.py.jinja2' in template:
+ return f'{python_path}/entity/vo/{business_name}_vo.py'
+ elif 'sql.jinja2' in template:
+ return f'{cls.BACKEND_PROJECT_PATH}/sql/{business_name}_menu.sql'
+ elif 'api.js.jinja2' in template:
+ return f'{vue_path}/api/{module_name}/{business_name}.js'
+ elif 'index.vue.jinja2' in template or 'index-tree.vue.jinja2' in template:
+ return f'{vue_path}/views/{module_name}/{business_name}/index.vue'
+ return ''
+
+ @classmethod
+ def get_package_prefix(cls, package_name: str):
+ """
+ 获取包前缀
+
+ :param package_name: 包名
+ :return: 包前缀
+ """
+ return package_name[: package_name.rfind('.')]
+
+ @classmethod
+ def get_vo_import_list(cls, gen_table: GenTableModel):
+ """
+ 获取vo模板导入包列表
+
+ :param gen_table: 生成表的配置信息
+ :return: 导入包列表
+ """
+ columns = gen_table.columns or []
+ import_list = set()
+ for column in columns:
+ if column.python_type in GenConstant.TYPE_DATE:
+ import_list.add(f'from datetime import {column.python_type}')
+ elif column.python_type == GenConstant.TYPE_DECIMAL:
+ import_list.add('from decimal import Decimal')
+ if gen_table.sub:
+ sub_columns = gen_table.sub_table.columns or []
+ for sub_column in sub_columns:
+ if sub_column.python_type in GenConstant.TYPE_DATE:
+ import_list.add(f'from datetime import {sub_column.python_type}')
+ elif sub_column.python_type == GenConstant.TYPE_DECIMAL:
+ import_list.add('from decimal import Decimal')
+ return cls.merge_same_imports(list(import_list), 'from datetime import')
+
+ @classmethod
+ def get_do_import_list(cls, gen_table: GenTableModel):
+ """
+ 获取do模板导入包列表
+
+ :param gen_table: 生成表的配置信息
+ :return: 导入包列表
+ """
+ columns = gen_table.columns or []
+ import_list = set()
+ import_list.add('from sqlalchemy import Column')
+ for column in columns:
+ data_type = cls.get_db_type(column.column_type)
+ if data_type in GenConstant.COLUMNTYPE_GEOMETRY:
+ import_list.add('from geoalchemy2 import Geometry')
+ import_list.add(
+ f'from sqlalchemy import {StringUtil.get_mapping_value_by_key_ignore_case(GenConstant.DB_TO_SQLALCHEMY_TYPE_MAPPING, data_type)}'
+ )
+ if gen_table.sub:
+ import_list.add('from sqlalchemy import ForeignKey')
+ sub_columns = gen_table.sub_table.columns or []
+ for sub_column in sub_columns:
+ data_type = cls.get_db_type(sub_column.column_type)
+ import_list.add(
+ f'from sqlalchemy import {StringUtil.get_mapping_value_by_key_ignore_case(GenConstant.DB_TO_SQLALCHEMY_TYPE_MAPPING, data_type)}'
+ )
+ return cls.merge_same_imports(list(import_list), 'from sqlalchemy import')
+
+ @classmethod
+ def get_db_type(cls, column_type: str) -> str:
+ """
+ 获取数据库类型字段
+
+ param column_type: 字段类型
+ :return: 数据库类型
+ """
+ if '(' in column_type:
+ return column_type.split('(')[0]
+ return column_type
+
+ @classmethod
+ def merge_same_imports(cls, imports: List[str], import_start: str) -> List[str]:
+ """
+ 合并相同的导入语句
+
+ :param imports: 导入语句列表
+ :param import_start: 导入语句的起始字符串
+ :return: 合并后的导入语句列表
+ """
+ merged_imports = []
+ _imports = []
+ for import_stmt in imports:
+ if import_stmt.startswith(import_start):
+ imported_items = import_stmt.split('import')[1].strip()
+ _imports.extend(imported_items.split(', '))
+ else:
+ merged_imports.append(import_stmt)
+
+ if _imports:
+ merged_datetime_import = f'{import_start} {", ".join(_imports)}'
+ merged_imports.append(merged_datetime_import)
+
+ return merged_imports
+
+ @classmethod
+ def get_dicts(cls, gen_table: GenTableModel):
+ """
+ 获取字典列表
+
+ :param gen_table: 生成表的配置信息
+ :return: 字典列表
+ """
+ columns = gen_table.columns or []
+ dicts = set()
+ cls.add_dicts(dicts, columns)
+ if gen_table.sub_table is not None:
+ cls.add_dicts(dicts, gen_table.sub_table.columns)
+ return ', '.join(dicts)
+
+ @classmethod
+ def add_dicts(cls, dicts: Set[str], columns: List[GenTableColumnModel]):
+ """
+ 添加字典列表
+
+ :param dicts: 字典列表
+ :param columns: 字段列表
+ :return: 新的字典列表
+ """
+ for column in columns:
+ if (
+ not column.super_column
+ and StringUtil.is_not_empty(column.dict_type)
+ and StringUtil.equals_any_ignore_case(
+ column.html_type, [GenConstant.HTML_SELECT, GenConstant.HTML_RADIO, GenConstant.HTML_CHECKBOX]
+ )
+ ):
+ dicts.add(f"'{column.dict_type}'")
+
+ @classmethod
+ def get_permission_prefix(cls, module_name: str, business_name: str):
+ """
+ 获取权限前缀
+
+ :param module_name: 模块名
+ :param business_name: 业务名
+ :return: 权限前缀
+ """
+ return f'{module_name}:{business_name}'
+
+ @classmethod
+ def get_parent_menu_id(cls, params_obj: Dict):
+ """
+ 获取上级菜单ID
+
+ :param params_obj: 菜单参数字典
+ :return: 上级菜单ID
+ """
+ if params_obj and params_obj.get(GenConstant.PARENT_MENU_ID):
+ return params_obj.get(GenConstant.PARENT_MENU_ID)
+ return cls.DEFAULT_PARENT_MENU_ID
+
+ @classmethod
+ def get_tree_code(cls, params_obj: Dict):
+ """
+ 获取树编码
+
+ :param params_obj: 菜单参数字典
+ :return: 树编码
+ """
+ if GenConstant.TREE_CODE in params_obj:
+ return cls.to_camel_case(params_obj.get(GenConstant.TREE_CODE))
+ return ''
+
+ @classmethod
+ def get_tree_parent_code(cls, params_obj: Dict):
+ """
+ 获取树父编码
+
+ :param params_obj: 菜单参数字典
+ :return: 树父编码
+ """
+ if GenConstant.TREE_PARENT_CODE in params_obj:
+ return cls.to_camel_case(params_obj.get(GenConstant.TREE_PARENT_CODE))
+ return ''
+
+ @classmethod
+ def get_tree_name(cls, params_obj: Dict):
+ """
+ 获取树名称
+
+ :param params_obj: 菜单参数字典
+ :return: 树名称
+ """
+ if GenConstant.TREE_NAME in params_obj:
+ return cls.to_camel_case(params_obj.get(GenConstant.TREE_NAME))
+ return ''
+
+ @classmethod
+ def get_expand_column(cls, gen_table: GenTableModel):
+ """
+ 获取展开列
+
+ :param gen_table: 生成表的配置信息
+ :return: 展开列
+ """
+ options = gen_table.options
+ params_obj = json.loads(options)
+ tree_name = params_obj.get(GenConstant.TREE_NAME)
+ num = 0
+ for column in gen_table.columns or []:
+ if column.list:
+ num += 1
+ if column.column_name == tree_name:
+ break
+ return num
+
+ @classmethod
+ def to_camel_case(cls, text: str) -> str:
+ """
+ 将字符串转换为驼峰命名
+
+ :param text: 待转换的字符串
+ :return: 转换后的驼峰命名字符串
+ """
+ parts = text.split('_')
+ return parts[0] + ''.join(word.capitalize() for word in parts[1:])
+
+ @classmethod
+ def get_sqlalchemy_type(cls, column_type: str):
+ """
+ 获取SQLAlchemy类型
+
+ :param column_type: 列类型
+ :return: SQLAlchemy类型
+ """
+ if '(' in column_type:
+ column_type_list = column_type.split('(')
+ if column_type_list[0] in GenConstant.COLUMNTYPE_STR:
+ sqlalchemy_type = (
+ StringUtil.get_mapping_value_by_key_ignore_case(
+ GenConstant.DB_TO_SQLALCHEMY_TYPE_MAPPING, column_type_list[0]
+ )
+ + '('
+ + column_type_list[1]
+ )
+ else:
+ sqlalchemy_type = StringUtil.get_mapping_value_by_key_ignore_case(
+ GenConstant.DB_TO_SQLALCHEMY_TYPE_MAPPING, column_type_list[0]
+ )
+ else:
+ sqlalchemy_type = StringUtil.get_mapping_value_by_key_ignore_case(
+ GenConstant.DB_TO_SQLALCHEMY_TYPE_MAPPING, column_type
+ )
+
+ return sqlalchemy_type
diff --git a/ruoyi-fastapi-frontend/package.json b/ruoyi-fastapi-frontend/package.json
index 996c73b801b1a25a5e83de0a43b3bb8093057b89..4a7dc7b8cd3f55d09939d9b63823b8fe327999e1 100644
--- a/ruoyi-fastapi-frontend/package.json
+++ b/ruoyi-fastapi-frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "vfadmin",
- "version": "1.5.1",
+ "version": "1.6.0",
"description": "vfadmin管理系统",
"author": "insistence",
"license": "MIT",
@@ -23,17 +23,21 @@
"@vueuse/core": "10.11.0",
"ant-design-vue": "^4.1.1",
"axios": "0.28.1",
+ "clipboard": "2.0.11",
"echarts": "5.5.1",
"element-plus": "2.7.6",
"file-saver": "2.0.5",
"fuse.js": "6.6.2",
+ "js-beautify": "1.15.1",
"js-cookie": "3.0.5",
"jsencrypt": "3.3.2",
"nprogress": "0.2.0",
"pinia": "2.1.7",
+ "splitpanes": "3.1.5",
"vue": "3.4.15",
"vue-cropper": "1.1.1",
- "vue-router": "4.4.0"
+ "vue-router": "4.4.0",
+ "vuedraggable": "4.1.0"
},
"devDependencies": {
"@vitejs/plugin-vue": "5.0.5",
diff --git a/ruoyi-fastapi-frontend/src/api/system/user.js b/ruoyi-fastapi-frontend/src/api/system/user.js
index 9b0211a5fe3db21e68c659a9e9c0dfd539b677a7..b5e3edd81925eff98df34bf86e605938e192e2ac 100644
--- a/ruoyi-fastapi-frontend/src/api/system/user.js
+++ b/ruoyi-fastapi-frontend/src/api/system/user.js
@@ -96,7 +96,7 @@ export function updateUserPwd(oldPassword, newPassword) {
return request({
url: '/system/user/profile/updatePwd',
method: 'put',
- params: data
+ data: data
})
}
diff --git a/ruoyi-fastapi-frontend/src/api/tool/gen.js b/ruoyi-fastapi-frontend/src/api/tool/gen.js
index 45069278fa93ac8cd748ffae138dc2777cd5bd00..5728980c6fe018def597b7bfbe06900a85002926 100644
--- a/ruoyi-fastapi-frontend/src/api/tool/gen.js
+++ b/ruoyi-fastapi-frontend/src/api/tool/gen.js
@@ -1,76 +1,85 @@
-import request from '@/utils/request'
-
-// 查询生成表数据
-export function listTable(query) {
- return request({
- url: '/tool/gen/list',
- method: 'get',
- params: query
- })
-}
-// 查询db数据库列表
-export function listDbTable(query) {
- return request({
- url: '/tool/gen/db/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询表详细信息
-export function getGenTable(tableId) {
- return request({
- url: '/tool/gen/' + tableId,
- method: 'get'
- })
-}
-
-// 修改代码生成信息
-export function updateGenTable(data) {
- return request({
- url: '/tool/gen',
- method: 'put',
- data: data
- })
-}
-
-// 导入表
-export function importTable(data) {
- return request({
- url: '/tool/gen/importTable',
- method: 'post',
- params: data
- })
-}
-
-// 预览生成代码
-export function previewTable(tableId) {
- return request({
- url: '/tool/gen/preview/' + tableId,
- method: 'get'
- })
-}
-
-// 删除表数据
-export function delTable(tableId) {
- return request({
- url: '/tool/gen/' + tableId,
- method: 'delete'
- })
-}
-
-// 生成代码（自定义路径）
-export function genCode(tableName) {
- return request({
- url: '/tool/gen/genCode/' + tableName,
- method: 'get'
- })
-}
-
-// 同步数据库
-export function synchDb(tableName) {
- return request({
- url: '/tool/gen/synchDb/' + tableName,
- method: 'get'
- })
-}
+import request from '@/utils/request'
+
+// 查询生成表数据
+export function listTable(query) {
+ return request({
+ url: '/tool/gen/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询db数据库列表
+export function listDbTable(query) {
+ return request({
+ url: '/tool/gen/db/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询表详细信息
+export function getGenTable(tableId) {
+ return request({
+ url: '/tool/gen/' + tableId,
+ method: 'get'
+ })
+}
+
+// 修改代码生成信息
+export function updateGenTable(data) {
+ return request({
+ url: '/tool/gen',
+ method: 'put',
+ data: data
+ })
+}
+
+// 导入表
+export function importTable(data) {
+ return request({
+ url: '/tool/gen/importTable',
+ method: 'post',
+ params: data
+ })
+}
+
+// 创建表
+export function createTable(data) {
+ return request({
+ url: '/tool/gen/createTable',
+ method: 'post',
+ params: data
+ })
+}
+
+// 预览生成代码
+export function previewTable(tableId) {
+ return request({
+ url: '/tool/gen/preview/' + tableId,
+ method: 'get'
+ })
+}
+
+// 删除表数据
+export function delTable(tableId) {
+ return request({
+ url: '/tool/gen/' + tableId,
+ method: 'delete'
+ })
+}
+
+// 生成代码（自定义路径）
+export function genCode(tableName) {
+ return request({
+ url: '/tool/gen/genCode/' + tableName,
+ method: 'get'
+ })
+}
+
+// 同步数据库
+export function synchDb(tableName) {
+ return request({
+ url: '/tool/gen/synchDb/' + tableName,
+ method: 'get'
+ })
+}
diff --git a/ruoyi-fastapi-frontend/src/assets/icons/svg/moon.svg b/ruoyi-fastapi-frontend/src/assets/icons/svg/moon.svg
new file mode 100755
index 0000000000000000000000000000000000000000..ec72d77abae95889678a009b082cbbaba0c665bb
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/assets/icons/svg/moon.svg
@@ -0,0 +1 @@
+
-
+
{{ item.meta.title }}
{{ item.meta.title }}
@@ -10,21 +10,53 @@
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/src/layout/components/Navbar.vue b/ruoyi-fastapi-frontend/src/layout/components/Navbar.vue
index 05e15af227c9454eff98fea4e79274b85226f00f..4ec7cadee07ffe40ffc5247fdbd79d954e001031 100644
--- a/ruoyi-fastapi-frontend/src/layout/components/Navbar.vue
+++ b/ruoyi-fastapi-frontend/src/layout/components/Navbar.vue
@@ -18,6 +18,13 @@
+
+
+
+
@@ -98,6 +105,10 @@ const emits = defineEmits(['setLayout'])
function setLayout() {
emits('setLayout');
}
+
+function toggleTheme() {
+ settingsStore.toggleTheme()
+}
diff --git a/ruoyi-fastapi-frontend/src/layout/components/TagsView/index.vue b/ruoyi-fastapi-frontend/src/layout/components/TagsView/index.vue
index 8212fecb03215a7c470824bac7dd3bafb846ea84..0b826d6622bf78891c6d4ec82834aefbf78ba7be 100644
--- a/ruoyi-fastapi-frontend/src/layout/components/TagsView/index.vue
+++ b/ruoyi-fastapi-frontend/src/layout/components/TagsView/index.vue
@@ -237,13 +237,13 @@ function handleScroll() {
}
-`
+}
+
+function buildFormTemplate(conf, child, type) {
+ let labelPosition = ''
+ if (conf.labelPosition !== 'right') {
+ labelPosition = `label-position="${conf.labelPosition}"`
+ }
+ const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : ''
+ let str = `
+ ${child}
+ ${buildFromBtns(conf, type)}
+ `
+ if (someSpanIsNot24) {
+ str = `
+ ${str}
+ `
+ }
+ return str
+}
+
+function buildFromBtns(conf, type) {
+ let str = ''
+ if (conf.formBtns && type === 'file') {
+ str = `
+ 提交
+ 重置
+ `
+ if (someSpanIsNot24) {
+ str = `
+ ${str}
+ `
+ }
+ }
+ return str
+}
+
+// span不为24的用el-col包裹
+function colWrapper(element, str) {
+ if (someSpanIsNot24 || element.span !== 24) {
+ return `
+ ${str}
+ `
+ }
+ return str
+}
+
+const layouts = {
+ colFormItem(element) {
+ let labelWidth = ''
+ if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) {
+ labelWidth = `label-width="${element.labelWidth}px"`
+ }
+ const required = !trigger[element.tag] && element.required ? 'required' : ''
+ const tagDom = tags[element.tag] ? tags[element.tag](element) : null
+ let str = `
+ ${tagDom}
+ `
+ str = colWrapper(element, str)
+ return str
+ },
+ rowFormItem(element) {
+ const type = element.type === 'default' ? '' : `type="${element.type}"`
+ const justify = element.type === 'default' ? '' : `justify="${element.justify}"`
+ const align = element.type === 'default' ? '' : `align="${element.align}"`
+ const gutter = element.gutter ? `gutter="${element.gutter}"` : ''
+ const children = element.children.map(el => layouts[el.layout](el))
+ let str = `
+ ${children.join('\n')}
+ `
+ str = colWrapper(element, str)
+ return str
+ }
+}
+
+const tags = {
+ 'el-button': el => {
+ const {
+ tag, disabled
+ } = attrBuilder(el)
+ const type = el.type ? `type="${el.type}"` : ''
+ const icon = el.icon ? `icon="${el.icon}"` : ''
+ const size = el.size ? `size="${el.size}"` : ''
+ let child = buildElButtonChild(el)
+
+ if (child) child = `\n${child}\n` // 换行
+ return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}`
+ },
+ 'el-input': el => {
+ const {
+ disabled, vModel, clearable, placeholder, width
+ } = attrBuilder(el)
+ const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : ''
+ const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : ''
+ const readonly = el.readonly ? 'readonly' : ''
+ const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : ''
+ const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : ''
+ const showPassword = el['show-password'] ? 'show-password' : ''
+ const type = el.type ? `type="${el.type}"` : ''
+ const autosize = el.autosize && el.autosize.minRows
+ ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"`
+ : ''
+ let child = buildElInputChild(el)
+
+ if (child) child = `\n${child}\n` // 换行
+ return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}`
+ },
+ 'el-input-number': el => {
+ const { disabled, vModel, placeholder } = attrBuilder(el)
+ const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : ''
+ const min = el.min ? `:min='${el.min}'` : ''
+ const max = el.max ? `:max='${el.max}'` : ''
+ const step = el.step ? `:step='${el.step}'` : ''
+ const stepStrictly = el['step-strictly'] ? 'step-strictly' : ''
+ const precision = el.precision ? `:precision='${el.precision}'` : ''
+
+ return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}>`
+ },
+ 'el-select': el => {
+ const {
+ disabled, vModel, clearable, placeholder, width
+ } = attrBuilder(el)
+ const filterable = el.filterable ? 'filterable' : ''
+ const multiple = el.multiple ? 'multiple' : ''
+ let child = buildElSelectChild(el)
+
+ if (child) child = `\n${child}\n` // 换行
+ return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}`
+ },
+ 'el-radio-group': el => {
+ const { disabled, vModel } = attrBuilder(el)
+ const size = `size="${el.size}"`
+ let child = buildElRadioGroupChild(el)
+
+ if (child) child = `\n${child}\n` // 换行
+ return `<${el.tag} ${vModel} ${size} ${disabled}>${child}`
+ },
+ 'el-checkbox-group': el => {
+ const { disabled, vModel } = attrBuilder(el)
+ const size = `size="${el.size}"`
+ const min = el.min ? `:min="${el.min}"` : ''
+ const max = el.max ? `:max="${el.max}"` : ''
+ let child = buildElCheckboxGroupChild(el)
+
+ if (child) child = `\n${child}\n` // 换行
+ return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}`
+ },
+ 'el-switch': el => {
+ const { disabled, vModel } = attrBuilder(el)
+ const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : ''
+ const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : ''
+ const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : ''
+ const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : ''
+ const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : ''
+ const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : ''
+
+ return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}>`
+ },
+ 'el-cascader': el => {
+ const {
+ disabled, vModel, clearable, placeholder, width
+ } = attrBuilder(el)
+ const options = el.options ? `:options="${el.vModel}Options"` : ''
+ const props = el.props ? `:props="${el.vModel}Props"` : ''
+ const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"'
+ const filterable = el.filterable ? 'filterable' : ''
+ const separator = el.separator === '/' ? '' : `separator="${el.separator}"`
+
+ return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}>`
+ },
+ 'el-slider': el => {
+ const { disabled, vModel } = attrBuilder(el)
+ const min = el.min ? `:min='${el.min}'` : ''
+ const max = el.max ? `:max='${el.max}'` : ''
+ const step = el.step ? `:step='${el.step}'` : ''
+ const range = el.range ? 'range' : ''
+ const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : ''
+
+ return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}>`
+ },
+ 'el-time-picker': el => {
+ const {
+ disabled, vModel, clearable, placeholder, width
+ } = attrBuilder(el)
+ const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
+ const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
+ const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
+ const isRange = el['is-range'] ? 'is-range' : ''
+ const format = el.format ? `format="${el.format}"` : ''
+ const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
+ const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : ''
+
+ return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}>`
+ },
+ 'el-date-picker': el => {
+ const {
+ disabled, vModel, clearable, placeholder, width
+ } = attrBuilder(el)
+ const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
+ const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
+ const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
+ const format = el.format ? `format="${el.format}"` : ''
+ const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
+ const type = el.type === 'date' ? '' : `type="${el.type}"`
+ const readonly = el.readonly ? 'readonly' : ''
+
+ return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}>`
+ },
+ 'el-rate': el => {
+ const { disabled, vModel } = attrBuilder(el)
+ const max = el.max ? `:max='${el.max}'` : ''
+ const allowHalf = el['allow-half'] ? 'allow-half' : ''
+ const showText = el['show-text'] ? 'show-text' : ''
+ const showScore = el['show-score'] ? 'show-score' : ''
+
+ return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}>`
+ },
+ 'el-color-picker': el => {
+ const { disabled, vModel } = attrBuilder(el)
+ const size = `size="${el.size}"`
+ const showAlpha = el['show-alpha'] ? 'show-alpha' : ''
+ const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : ''
+
+ return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}>`
+ },
+ 'el-upload': el => {
+ const disabled = el.disabled ? ':disabled=\'true\'' : ''
+ const action = el.action ? `:action="${el.vModel}Action"` : ''
+ const multiple = el.multiple ? 'multiple' : ''
+ const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : ''
+ const accept = el.accept ? `accept="${el.accept}"` : ''
+ const name = el.name !== 'file' ? `name="${el.name}"` : ''
+ const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : ''
+ const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"`
+ const fileList = `:file-list="${el.vModel}fileList"`
+ const ref = `ref="${el.vModel}"`
+ let child = buildElUploadChild(el)
+
+ if (child) child = `\n${child}\n` // 换行
+ return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}`
+ }
+}
+
+function attrBuilder(el) {
+ return {
+ vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`,
+ clearable: el.clearable ? 'clearable' : '',
+ placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '',
+ width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '',
+ disabled: el.disabled ? ':disabled=\'true\'' : ''
+ }
+}
+
+// el-buttin 子级
+function buildElButtonChild(conf) {
+ const children = []
+ if (conf.default) {
+ children.push(conf.default)
+ }
+ return children.join('\n')
+}
+
+// el-input innerHTML
+function buildElInputChild(conf) {
+ const children = []
+ if (conf.prepend) {
+ children.push(`${conf.prepend} `)
+ }
+ if (conf.append) {
+ children.push(`${conf.append} `)
+ }
+ return children.join('\n')
+}
+
+function buildElSelectChild(conf) {
+ const children = []
+ if (conf.options && conf.options.length) {
+ children.push(`${conf.buttonText} `)
+ if (conf.showTip) list.push(`只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件
`)
+ return list.join('\n')
+}
+
+export function makeUpHtml(conf, type) {
+ const htmlList = []
+ confGlobal = conf
+ someSpanIsNot24 = conf.fields.some(item => item.span !== 24)
+ conf.fields.forEach(el => {
+ htmlList.push(layouts[el.layout](el))
+ })
+ const htmlStr = htmlList.join('\n')
+
+ let temp = buildFormTemplate(conf, htmlStr, type)
+ if (type === 'dialog') {
+ temp = dialogWrapper(temp)
+ }
+ confGlobal = null
+ return temp
+}
diff --git a/ruoyi-fastapi-frontend/src/utils/generator/icon.json b/ruoyi-fastapi-frontend/src/utils/generator/icon.json
new file mode 100755
index 0000000000000000000000000000000000000000..2d9999a31e372b76df8d32656f6530a3b79faa06
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/utils/generator/icon.json
@@ -0,0 +1 @@
+["platform-eleme","eleme","delete-solid","delete","s-tools","setting","user-solid","user","phone","phone-outline","more","more-outline","star-on","star-off","s-goods","goods","warning","warning-outline","question","info","remove","circle-plus","success","error","zoom-in","zoom-out","remove-outline","circle-plus-outline","circle-check","circle-close","s-help","help","minus","plus","check","close","picture","picture-outline","picture-outline-round","upload","upload2","download","camera-solid","camera","video-camera-solid","video-camera","message-solid","bell","s-cooperation","s-order","s-platform","s-fold","s-unfold","s-operation","s-promotion","s-home","s-release","s-ticket","s-management","s-open","s-shop","s-marketing","s-flag","s-comment","s-finance","s-claim","s-custom","s-opportunity","s-data","s-check","s-grid","menu","share","d-caret","caret-left","caret-right","caret-bottom","caret-top","bottom-left","bottom-right","back","right","bottom","top","top-left","top-right","arrow-left","arrow-right","arrow-down","arrow-up","d-arrow-left","d-arrow-right","video-pause","video-play","refresh","refresh-right","refresh-left","finished","sort","sort-up","sort-down","rank","loading","view","c-scale-to-original","date","edit","edit-outline","folder","folder-opened","folder-add","folder-remove","folder-delete","folder-checked","tickets","document-remove","document-delete","document-copy","document-checked","document","document-add","printer","paperclip","takeaway-box","search","monitor","attract","mobile","scissors","umbrella","headset","brush","mouse","coordinate","magic-stick","reading","data-line","data-board","pie-chart","data-analysis","collection-tag","film","suitcase","suitcase-1","receiving","collection","files","notebook-1","notebook-2","toilet-paper","office-building","school","table-lamp","house","no-smoking","smoking","shopping-cart-full","shopping-cart-1","shopping-cart-2","shopping-bag-1","shopping-bag-2","sold-out","sell","present","box","bank-card","money","coin","wallet","discount","price-tag","news","guide","male","female","thumb","cpu","link","connection","open","turn-off","set-up","chat-round","chat-line-round","chat-square","chat-dot-round","chat-dot-square","chat-line-square","message","postcard","position","turn-off-microphone","microphone","close-notification","bangzhu","time","odometer","crop","aim","switch-button","full-screen","copy-document","mic","stopwatch","medal-1","medal","trophy","trophy-1","first-aid-kit","discover","place","location","location-outline","location-information","add-location","delete-location","map-location","alarm-clock","timer","watch-1","watch","lock","unlock","key","service","mobile-phone","bicycle","truck","ship","basketball","football","soccer","baseball","wind-power","light-rain","lightning","heavy-rain","sunrise","sunrise-1","sunset","sunny","cloudy","partly-cloudy","cloudy-and-sunny","moon","moon-night","dish","dish-1","food","chicken","fork-spoon","knife-fork","burger","tableware","sugar","dessert","ice-cream","hot-water","water-cup","coffee-cup","cold-drink","goblet","goblet-full","goblet-square","goblet-square-full","refrigerator","grape","watermelon","cherry","apple","pear","orange","coffee","ice-tea","ice-drink","milk-tea","potato-strips","lollipop","ice-cream-square","ice-cream-round"]
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/src/utils/generator/js.js b/ruoyi-fastapi-frontend/src/utils/generator/js.js
new file mode 100755
index 0000000000000000000000000000000000000000..dc38bfe5580399210778613b50de3c048f9428d7
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/utils/generator/js.js
@@ -0,0 +1,370 @@
+import { titleCase } from '@/utils/index'
+import { trigger } from './config'
+// 文件大小设置
+const units = {
+ KB: '1024',
+ MB: '1024 / 1024',
+ GB: '1024 / 1024 / 1024',
+}
+/**
+ * @name: 生成js需要的数据
+ * @description: 生成js需要的数据
+ * @param {*} conf
+ * @param {*} type 弹窗或表单
+ * @return {*}
+ */
+export function makeUpJs(conf, type) {
+ conf = JSON.parse(JSON.stringify(conf))
+ const dataList = []
+ const ruleList = []
+ const optionsList = []
+ const propsList = []
+ const methodList = []
+ const uploadVarList = []
+
+ conf.fields.forEach((el) => {
+ buildAttributes(
+ el,
+ dataList,
+ ruleList,
+ optionsList,
+ methodList,
+ propsList,
+ uploadVarList
+ )
+ })
+
+ const script = buildexport(
+ conf,
+ type,
+ dataList.join('\n'),
+ ruleList.join('\n'),
+ optionsList.join('\n'),
+ uploadVarList.join('\n'),
+ propsList.join('\n'),
+ methodList.join('\n')
+ )
+
+ return script
+}
+/**
+ * @name: 生成参数
+ * @description: 生成参数，包括表单数据表单验证数据，多选选项数据，上传数据等
+ * @return {*}
+ */
+function buildAttributes(
+ el,
+ dataList,
+ ruleList,
+ optionsList,
+ methodList,
+ propsList,
+ uploadVarList
+){
+ buildData(el, dataList)
+ buildRules(el, ruleList)
+
+ if (el.options && el.options.length) {
+ buildOptions(el, optionsList)
+ if (el.dataType === 'dynamic') {
+ const model = `${el.vModel}Options`
+ const options = titleCase(model)
+ buildOptionMethod(`get${options}`, model, methodList)
+ }
+ }
+
+ if (el.props && el.props.props) {
+ buildProps(el, propsList)
+ }
+
+ if (el.action && el.tag === 'el-upload') {
+ uploadVarList.push(
+ `
+ // 上传请求路径
+ const ${el.vModel}Action = ref('${el.action}')
+ // 上传文件列表
+ const ${el.vModel}fileList = ref([])`
+ )
+ methodList.push(buildBeforeUpload(el))
+ if (!el['auto-upload']) {
+ methodList.push(buildSubmitUpload(el))
+ }
+ }
+
+ if (el.children) {
+ el.children.forEach((el2) => {
+ buildAttributes(
+ el2,
+ dataList,
+ ruleList,
+ optionsList,
+ methodList,
+ propsList,
+ uploadVarList
+ )
+ })
+ }
+}
+/**
+ * @name: 生成表单数据formData
+ * @description: 生成表单数据formData
+ * @param {*} conf
+ * @param {*} dataList 数据列表
+ * @return {*}
+ */
+function buildData(conf, dataList) {
+ if (conf.vModel === undefined) return
+ let defaultValue
+ if (typeof conf.defaultValue === 'string' && !conf.multiple) {
+ defaultValue = `'${conf.defaultValue}'`
+ } else {
+ defaultValue = `${JSON.stringify(conf.defaultValue)}`
+ }
+ dataList.push(`${conf.vModel}: ${defaultValue},`)
+}
+/**
+ * @name: 生成表单验证数据rule
+ * @description: 生成表单验证数据rule
+ * @param {*} conf
+ * @param {*} ruleList 验证数据列表
+ * @return {*}
+ */
+function buildRules(conf, ruleList) {
+ if (conf.vModel === undefined) return
+ const rules = []
+ if (trigger[conf.tag]) {
+ if (conf.required) {
+ const type = Array.isArray(conf.defaultValue) ? "type: 'array'," : ''
+ let message = Array.isArray(conf.defaultValue)
+ ? `请至少选择一个${conf.vModel}`
+ : conf.placeholder
+ if (message === undefined) message = `${conf.label}不能为空`
+ rules.push(
+ `{ required: true, ${type} message: '${message}', trigger: '${
+ trigger[conf.tag]
+ }' }`
+ )
+ }
+ if (conf.regList && Array.isArray(conf.regList)) {
+ conf.regList.forEach((item) => {
+ if (item.pattern) {
+ rules.push(
+ `{ pattern: new RegExp(${item.pattern}), message: '${
+ item.message
+ }', trigger: '${trigger[conf.tag]}' }`
+ )
+ }
+ })
+ }
+ ruleList.push(`${conf.vModel}: [${rules.join(',')}],`)
+ }
+}
+/**
+ * @name: 生成选项数据
+ * @description: 生成选项数据，单选多选下拉等
+ * @param {*} conf
+ * @param {*} optionsList 选项数据列表
+ * @return {*}
+ */
+function buildOptions(conf, optionsList) {
+ if (conf.vModel === undefined) return
+ if (conf.dataType === 'dynamic') {
+ conf.options = []
+ }
+ const str = `const ${conf.vModel}Options = ref(${JSON.stringify(conf.options)})`
+ optionsList.push(str)
+}
+/**
+ * @name: 生成方法
+ * @description: 生成方法
+ * @param {*} methodName 方法名
+ * @param {*} model
+ * @param {*} methodList 方法列表
+ * @return {*}
+ */
+function buildOptionMethod(methodName, model, methodList) {
+ const str = `function ${methodName}() {
+ // TODO 发起请求获取数据
+ ${model}.value
+ }`
+ methodList.push(str)
+}
+/**
+ * @name: 生成表单组件需要的props设置
+ * @description: 生成表单组件需要的props设置，如；级联组件
+ * @param {*} conf
+ * @param {*} propsList
+ * @return {*}
+ */
+function buildProps(conf, propsList) {
+ if (conf.dataType === 'dynamic') {
+ conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey)
+ conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey)
+ conf.childrenKey !== 'children' &&
+ (conf.props.props.children = conf.childrenKey)
+ }
+ const str = `
+ // props设置
+ const ${conf.vModel}Props = ref(${JSON.stringify(conf.props.props)})`
+ propsList.push(str)
+}
+/**
+ * @name: 生成上传组件的相关内容
+ * @description: 生成上传组件的相关内容
+ * @param {*} conf
+ * @return {*}
+ */
+function buildBeforeUpload(conf) {
+ const unitNum = units[conf.sizeUnit]
+ let rightSizeCode = ''
+ let acceptCode = ''
+ const returnList = []
+ if (conf.fileSize) {
+ rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize}
+ if(!isRightSize){
+ proxy.$modal.msgError('文件大小超过 ${conf.fileSize}${conf.sizeUnit}')
+ }`
+ returnList.push('isRightSize')
+ }
+ if (conf.accept) {
+ acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type)
+ if(!isAccept){
+ proxy.$modal.msgError('应该选择${conf.accept}类型的文件')
+ }`
+ returnList.push('isAccept')
+ }
+ const str = `
+ /**
+ * @name: 上传之前的文件判断
+ * @description: 上传之前的文件判断，判断文件大小文件类型等
+ * @param {*} file
+ * @return {*}
+ */
+ function ${conf.vModel}BeforeUpload(file) {
+ ${rightSizeCode}
+ ${acceptCode}
+ return ${returnList.join('&&')}
+ }`
+ return returnList.length ? str : ''
+}
+/**
+ * @name: 生成提交表单方法
+ * @description: 生成提交表单方法
+ * @param {Object} conf vModel 表单ref
+ * @return {*}
+ */
+function buildSubmitUpload(conf) {
+ const str = `function submitUpload() {
+ this.$refs['${conf.vModel}'].submit()
+ }`
+ return str
+}
+/**
+ * @name: 组装js代码
+ * @description: 组装js代码方法
+ * @return {*}
+ */
+function buildexport(
+ conf,
+ type,
+ data,
+ rules,
+ selectOptions,
+ uploadVar,
+ props,
+ methods
+) {
+ let str = `
+ const { proxy } = getCurrentInstance()
+ const ${conf.formRef} = ref()
+ const data = reactive({
+ ${conf.formModel}: {
+ ${data}
+ },
+ ${conf.formRules}: {
+ ${rules}
+ }
+ })
+
+ const {${conf.formModel}, ${conf.formRules}} = toRefs(data)
+
+ ${selectOptions}
+
+ ${uploadVar}
+
+ ${props}
+
+ ${methods}
+ `
+
+ if(type === 'dialog') {
+ str += `
+ // 弹窗设置
+ const dialogVisible = defineModel()
+ // 弹窗确认回调
+ const emit = defineEmits(['confirm'])
+ /**
+ * @name: 弹窗打开后执行
+ * @description: 弹窗打开后执行方法
+ * @return {*}
+ */
+ function onOpen(){
+
+ }
+ /**
+ * @name: 弹窗关闭时执行
+ * @description: 弹窗关闭方法，重置表单
+ * @return {*}
+ */
+ function onClose(){
+ ${conf.formRef}.value.resetFields()
+ }
+ /**
+ * @name: 弹窗取消
+ * @description: 弹窗取消方法
+ * @return {*}
+ */
+ function close(){
+ dialogVisible.value = false
+ }
+ /**
+ * @name: 弹窗表单提交
+ * @description: 弹窗表单提交方法
+ * @return {*}
+ */
+ function handelConfirm(){
+ ${conf.formRef}.value.validate((valid) => {
+ if (!valid) return
+ // TODO 提交表单
+
+ close()
+ // 回调父级组件
+ emit('confirm')
+ })
+ }
+ `
+ } else {
+ str += `
+ /**
+ * @name: 表单提交
+ * @description: 表单提交方法
+ * @return {*}
+ */
+ function submitForm() {
+ ${conf.formRef}.value.validate((valid) => {
+ if (!valid) return
+ // TODO 提交表单
+ })
+ }
+ /**
+ * @name: 表单重置
+ * @description: 表单重置方法
+ * @return {*}
+ */
+ function resetForm() {
+ ${conf.formRef}.value.resetFields()
+ }
+ `
+ }
+ return str
+}
diff --git a/ruoyi-fastapi-frontend/src/utils/generator/render.js b/ruoyi-fastapi-frontend/src/utils/generator/render.js
new file mode 100755
index 0000000000000000000000000000000000000000..d6d4414cb2f804ef27695f4f62cea870a62648ea
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/utils/generator/render.js
@@ -0,0 +1,156 @@
+import { defineComponent, h } from 'vue'
+import { makeMap } from '@/utils/index'
+
+const isAttr = makeMap(
+ 'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,' +
+ 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,' +
+ 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,' +
+ 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,' +
+ 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,' +
+ 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,' +
+ 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,' +
+ 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,' +
+ 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,' +
+ 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,' +
+ 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,' +
+ 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,' +
+ 'target,title,type,usemap,value,width,wrap' + 'prefix-icon'
+)
+const isNotProps = makeMap(
+ 'layout,prepend,regList,tag,document,changeTag,defaultValue'
+)
+
+function useVModel(props, emit) {
+ return {
+ modelValue: props.defaultValue,
+ 'onUpdate:modelValue': (val) => emit('update:modelValue', val),
+ }
+}
+const componentChild = {
+ 'el-button': {
+ default(h, conf, key) {
+ return conf[key]
+ },
+ },
+ 'el-select': {
+ options(h, conf, key) {
+ return conf.options.map(item => h(resolveComponent('el-option'), {
+ label: item.label,
+ value: item.value,
+ }))
+ }
+ },
+ 'el-radio-group': {
+ options(h, conf, key) {
+ return conf.optionType === 'button' ? conf.options.map(item => h(resolveComponent('el-checkbox-button'), {
+ label: item.value,
+ }, () => item.label)) : conf.options.map(item => h(resolveComponent('el-radio'), {
+ label: item.value,
+ border: conf.border,
+ }, () => item.label))
+ }
+ },
+ 'el-checkbox-group': {
+ options(h, conf, key) {
+ return conf.optionType === 'button' ? conf.options.map(item => h(resolveComponent('el-checkbox-button'), {
+ label: item.value,
+ }, () => item.label)) : conf.options.map(item => h(resolveComponent('el-checkbox'), {
+ label: item.value,
+ border: conf.border,
+ }, () => item.label))
+ }
+ },
+ 'el-upload': {
+ 'list-type': (h, conf, key) => {
+ const option = {}
+ // if (conf.showTip) {
+ // tip = h('div', {
+ // class: "el-upload__tip"
+ // }, () => '只能上传不超过' + conf.fileSize + conf.sizeUnit + '的' + conf.accept + '文件')
+ // }
+ if (conf['list-type'] === 'picture-card') {
+ return h(resolveComponent('el-icon'), option, () => h(resolveComponent('Plus')))
+ } else {
+ // option.size = "small"
+ option.type = "primary"
+ option.icon = "Upload"
+ return h(resolveComponent('el-button'), option, () => conf.buttonText)
+ }
+ },
+
+ }
+}
+const componentSlot = {
+ 'el-upload': {
+ 'tip': (h, conf, key) => {
+ if (conf.showTip) {
+ return () => h('div', {
+ class: "el-upload__tip"
+ }, '只能上传不超过' + conf.fileSize + conf.sizeUnit + '的' + conf.accept + '文件')
+ }
+ },
+ }
+}
+export default defineComponent({
+
+ // 使用 render 函数
+ render() {
+ const dataObject = {
+ attrs: {},
+ props: {},
+ on: {},
+ style: {}
+ }
+ const confClone = JSON.parse(JSON.stringify(this.conf))
+ const children = []
+ const slot = {}
+ const childObjs = componentChild[confClone.tag]
+ if (childObjs) {
+ Object.keys(childObjs).forEach(key => {
+ const childFunc = childObjs[key]
+ if (confClone[key]) {
+ children.push(childFunc(h, confClone, key))
+ }
+ })
+ }
+ const slotObjs = componentSlot[confClone.tag]
+ if (slotObjs) {
+ Object.keys(slotObjs).forEach(key => {
+ const childFunc = slotObjs[key]
+ if (confClone[key]) {
+ slot[key] = childFunc(h, confClone, key)
+ }
+ })
+ }
+ Object.keys(confClone).forEach(key => {
+ const val = confClone[key]
+ if (dataObject[key]) {
+ dataObject[key] = val
+ } else if (isAttr(key)) {
+ dataObject.attrs[key] = val
+ } else if (!isNotProps(key)) {
+ dataObject.props[key] = val
+ }
+ })
+ if(children.length > 0){
+ slot.default = () => children
+ }
+
+ return h(resolveComponent(this.conf.tag),
+ {
+ modelValue: this.$attrs.modelValue,
+ ...dataObject.props,
+ ...dataObject.attrs,
+ style: {
+ ...dataObject.style
+ },
+ }
+ , slot ?? null)
+ },
+ props: {
+ conf: {
+ type: Object,
+ required: true,
+ },
+ }
+})
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/src/utils/validate.js b/ruoyi-fastapi-frontend/src/utils/validate.js
index 459d42141b6a2b92a81c88f8254a33e9759be2dd..6a4c0c5d1883d1c1e4cad2d0c24a0f914d286872 100644
--- a/ruoyi-fastapi-frontend/src/utils/validate.js
+++ b/ruoyi-fastapi-frontend/src/utils/validate.js
@@ -1,3 +1,15 @@
+/**
+ * 路径匹配器
+ * @param {string} pattern
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isPathMatch(pattern, path) {
+ const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*\*/g, '.*').replace(/\*/g, '[^\\/]*')
+ const regex = new RegExp(`^${regexPattern}$`)
+ return regex.test(path)
+}
+
/**
* 判断value字符串是否为空
* @param {string} value
@@ -87,10 +99,7 @@ export function validEmail(email) {
* @returns {Boolean}
*/
export function isString(str) {
- if (typeof str === 'string' || str instanceof String) {
- return true
- }
- return false
+ return typeof str === 'string' || str instanceof String
}
/**
diff --git a/ruoyi-fastapi-frontend/src/views/system/role/index.vue b/ruoyi-fastapi-frontend/src/views/system/role/index.vue
index fe4426306bc7f7d05f1625f5aa950151ab2fdea2..367ebd0bf0a5340852fb8c00a897ad8b02a25f4b 100644
--- a/ruoyi-fastapi-frontend/src/views/system/role/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/system/role/index.vue
@@ -430,8 +430,8 @@ function handleUpdate(row) {
});
});
});
- title.value = "修改角色";
});
+ title.value = "修改角色";
}
/** 根据角色ID查询菜单树结构 */
function getRoleMenuTreeselect(roleId) {
@@ -535,8 +535,8 @@ function handleDataScope(row) {
});
});
});
- title.value = "分配数据权限";
});
+ title.value = "分配数据权限";
}
/** 提交按钮（数据权限） */
function submitDataScope() {
diff --git a/ruoyi-fastapi-frontend/src/views/system/user/index.vue b/ruoyi-fastapi-frontend/src/views/system/user/index.vue
index 2bf486b64af8a6f5a0ae6ce7b03c1ce1b1041559..2eca079b3abf31f2dd53e5a85a5bc6c3825da23b 100644
--- a/ruoyi-fastapi-frontend/src/views/system/user/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/system/user/index.vue
@@ -1,341 +1,525 @@
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- 搜索
- 重置
-
+
+
+
+
+
+ 搜索
+ 重置
+
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导入
-
-
- 导出
-
-
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导入
+
+
+ 导出
+
+
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 将文件拖到此处，或点击上传
-
-
-
-
-
仅允许导入xls、xlsx格式文件。
-
下载模板
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ element.componentName }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/src/views/tool/build/IconsDialog.vue b/ruoyi-fastapi-frontend/src/views/tool/build/IconsDialog.vue
new file mode 100755
index 0000000000000000000000000000000000000000..98d9c13d21f47893b54344c0cdfdf9c62bfbdbfd
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/tool/build/IconsDialog.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/views/tool/build/RightPanel.vue b/ruoyi-fastapi-frontend/src/views/tool/build/RightPanel.vue
new file mode 100755
index 0000000000000000000000000000000000000000..9729da3c0f3a60238d74314d7fa65a1f261faf90
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/tool/build/RightPanel.vue
@@ -0,0 +1,918 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+ {{ activeData.componentName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 默认
+
+
+ 右侧
+
+
+
+
+
+
+ 个字符
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text
+
+
+ picture
+
+
+ picture-card
+
+
+
+
+
+
+
+
+
+
+
+
+ 选项
+
+
+
+
+
+
+
+ 添加选项
+
+
+
+
+
+ 选项
+
+
+
+ 动态数据
+
+
+ 静态数据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加父级
+
+
+
+
+
+
+
+ 默认
+
+
+ 按钮
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 较大
+
+
+ 默认
+
+
+ 较小
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 布局结构树
+
+
+
+
+
+
+
+
+
+ 正则校验
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加规则
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 较大
+
+
+ 默认
+
+
+ 较小
+
+
+
+
+
+
+ 左对齐
+
+
+ 右对齐
+
+
+ 顶部对齐
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-fastapi-frontend/src/views/tool/build/TreeNodeDialog.vue b/ruoyi-fastapi-frontend/src/views/tool/build/TreeNodeDialog.vue
new file mode 100755
index 0000000000000000000000000000000000000000..372d3af20ffb522380a67ecc0fb8fe44dc2d8390
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/tool/build/TreeNodeDialog.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/views/tool/build/index.vue b/ruoyi-fastapi-frontend/src/views/tool/build/index.vue
old mode 100644
new mode 100755
index c3543a92d775817a150748cc0a8deb5bf319c8ea..60159b0f18f822c6e5f21835df89f143d4b2e203
--- a/ruoyi-fastapi-frontend/src/views/tool/build/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/tool/build/index.vue
@@ -1,3 +1,653 @@
-
- 表单构建
-
\ No newline at end of file
+
+
+
+
+
+
Form Generator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出vue文件
+
+
+ 复制代码
+
+
+ 清空
+
+
+
+
+
+
+
+
+
+
+ 从左侧拖入或点选组件进行表单设计
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/views/tool/gen/basicInfoForm.vue b/ruoyi-fastapi-frontend/src/views/tool/gen/basicInfoForm.vue
index 39c851507b1a1ed48883edf552ce05bcb6619525..025ae42ddd10f684170112139482aafba353f277 100644
--- a/ruoyi-fastapi-frontend/src/views/tool/gen/basicInfoForm.vue
+++ b/ruoyi-fastapi-frontend/src/views/tool/gen/basicInfoForm.vue
@@ -1,48 +1,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/views/tool/gen/createTable.vue b/ruoyi-fastapi-frontend/src/views/tool/gen/createTable.vue
new file mode 100644
index 0000000000000000000000000000000000000000..00fdfdb444788545d9f7da9f8a8f3f774493977b
--- /dev/null
+++ b/ruoyi-fastapi-frontend/src/views/tool/gen/createTable.vue
@@ -0,0 +1,46 @@
+
+
+
+ 创建表语句(支持多个建表语句)：
+
+
+
+
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/views/tool/gen/editTable.vue b/ruoyi-fastapi-frontend/src/views/tool/gen/editTable.vue
index ddcbfd5b95c8f7df0d9b986a7bc6d965c0e30e89..8c718248dd3289573893e692a64075e4fd47fae2 100644
--- a/ruoyi-fastapi-frontend/src/views/tool/gen/editTable.vue
+++ b/ruoyi-fastapi-frontend/src/views/tool/gen/editTable.vue
@@ -1,198 +1,208 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dict.dictName }}
- {{ dict.dictType }}
-
-
-
-
-
-
-
-
-
-
-
- 提交
- 返回
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.dictName }}
+ {{ dict.dictType }}
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 返回
+
+
+
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/views/tool/gen/genInfoForm.vue b/ruoyi-fastapi-frontend/src/views/tool/gen/genInfoForm.vue
index a75e3b856793e65e38491a98645b69ddc0a4d2ae..926d268f11ba02d37c61d416dfa5a5ef946a6423 100644
--- a/ruoyi-fastapi-frontend/src/views/tool/gen/genInfoForm.vue
+++ b/ruoyi-fastapi-frontend/src/views/tool/gen/genInfoForm.vue
@@ -1,297 +1,306 @@
-
-
-
-
-
- 生成模板
-
-
-
-
-
-
-
- 前端类型
-
-
-
-
-
-
-
-
- 生成包路径
-
-
-
-
-
-
-
-
-
- 生成模块名
-
-
-
-
-
-
-
-
-
- 生成业务名
-
-
-
-
-
-
-
-
-
- 生成功能名
-
-
-
-
-
-
-
-
-
- 生成代码方式
-
-
-
- zip压缩包
- 自定义路径
-
-
-
-
-
-
- 上级菜单
-
-
-
-
-
-
-
-
-
- 自定义路径
-
-
-
-
-
-
-
- 最近路径快速选择
-
-
-
- 恢复默认的生成基础路径
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 树编码字段
-
-
-
-
-
-
-
-
-
-
- 树父编码字段
-
-
-
-
-
-
-
-
-
-
- 树名称字段
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 关联子表的表名
-
-
-
-
-
-
-
-
-
-
- 子表关联的外键名
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 生成模板
+
+
+
+
+
+
+
+ 前端类型
+
+
+
+
+
+
+
+
+ 生成包路径
+
+
+
+
+
+
+
+
+
+ 生成模块名
+
+
+
+
+
+
+
+
+
+ 生成业务名
+
+
+
+
+
+
+
+
+
+ 生成功能名
+
+
+
+
+
+
+
+
+
+ 生成代码方式
+
+
+
+ zip压缩包
+ 自定义路径
+
+
+
+
+
+
+ 上级菜单
+
+
+
+
+
+
+
+
+
+ 自定义路径
+
+
+
+
+
+
+
+ 最近路径快速选择
+
+
+
+ 恢复默认的生成基础路径
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 树编码字段
+
+
+
+
+
+
+
+
+
+
+ 树父编码字段
+
+
+
+
+
+
+
+
+
+
+ 树名称字段
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关联子表的表名
+
+
+
+
+
+
+
+
+
+
+ 子表关联的外键名
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/views/tool/gen/importTable.vue b/ruoyi-fastapi-frontend/src/views/tool/gen/importTable.vue
index 33b563373debe537a85d85802936055300e6144a..49d96c393f8e85bf628226888a660573747a7760 100644
--- a/ruoyi-fastapi-frontend/src/views/tool/gen/importTable.vue
+++ b/ruoyi-fastapi-frontend/src/views/tool/gen/importTable.vue
@@ -1,118 +1,126 @@
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-fastapi-frontend/src/views/tool/gen/index.vue b/ruoyi-fastapi-frontend/src/views/tool/gen/index.vue
index 06e2d4c66231a9ef93546e9db17396f6ab30c410..de5fc75057356aa1aed75446e50541428065ab1f 100644
--- a/ruoyi-fastapi-frontend/src/views/tool/gen/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/tool/gen/index.vue
@@ -1,284 +1,310 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 生成
+
+
+ 创建
+
+
+ 导入
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 复制
+ {{ value }}
+
+
+
+
+
+
+
+
+ 
