diff --git a/README.md b/README.md
index baa556cb6385ad798968d41788696bf9aa8e273d..97321ae2123b5c7ed02426d9d92f86e861a41fff 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-RuoYi-Vue-FastAPI v1.6.1
+RuoYi-Vue-FastAPI v1.6.2
基于RuoYi-Vue+FastAPI前后端分离的快速开发框架
- 
+ 
diff --git a/ruoyi-fastapi-backend/.env.dev b/ruoyi-fastapi-backend/.env.dev
index 73e227ff82be3446ecb6413462f1ee56814f5a47..9ddf8f30d6fe9024e42ea67a741f4d54a59428dd 100644
--- a/ruoyi-fastapi-backend/.env.dev
+++ b/ruoyi-fastapi-backend/.env.dev
@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
# 应用端口
APP_PORT = 9099
# 应用版本
-APP_VERSION= '1.6.1'
+APP_VERSION= '1.6.2'
# 应用是否开启热重载
APP_RELOAD = true
# 应用是否开启IP归属区域查询
diff --git a/ruoyi-fastapi-backend/.env.prod b/ruoyi-fastapi-backend/.env.prod
index 3f971049a5c29a170c072181940b0851b1c1a323..c7bf1f14f59de9d9fd65d344c790c6df91ae76e4 100644
--- a/ruoyi-fastapi-backend/.env.prod
+++ b/ruoyi-fastapi-backend/.env.prod
@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
# 应用端口
APP_PORT = 9099
# 应用版本
-APP_VERSION= '1.6.1'
+APP_VERSION= '1.6.2'
# 应用是否开启热重载
APP_RELOAD = false
# 应用是否开启IP归属区域查询
diff --git a/ruoyi-fastapi-backend/config/constant.py b/ruoyi-fastapi-backend/config/constant.py
index 1b124a061ae141a6238f412184381779d4f76c23..eb77464df2d9fe3ae54a2a2b1d5203c5eb45b699 100644
--- a/ruoyi-fastapi-backend/config/constant.py
+++ b/ruoyi-fastapi-backend/config/constant.py
@@ -252,6 +252,8 @@ class GenConstant:
'double',
'decimal',
]
+ COLUMNNAME_NOT_ADD_SHOW = ['create_by', 'create_time']
+ COLUMNNAME_NOT_EDIT_SHOW = ['update_by', 'update_time']
COLUMNNAME_NOT_EDIT = ['id', 'create_by', 'create_time', 'del_flag']
COLUMNNAME_NOT_LIST = ['id', 'create_by', 'create_time', 'del_flag', 'update_by', 'update_time']
COLUMNNAME_NOT_QUERY = ['id', 'create_by', 'create_time', 'del_flag', 'update_by', 'update_time', 'remark']
diff --git a/ruoyi-fastapi-backend/config/get_scheduler.py b/ruoyi-fastapi-backend/config/get_scheduler.py
index 447339044e67f966d46884650602827732a0f50f..4b0c29834476783ee5501d031af350f6fe0050fa 100644
--- a/ruoyi-fastapi-backend/config/get_scheduler.py
+++ b/ruoyi-fastapi-backend/config/get_scheduler.py
@@ -201,9 +201,12 @@ class SchedulerUtil:
job_executor = job_info.job_executor
if iscoroutinefunction(job_func):
job_executor = 'default'
+ job_trigger = DateTrigger()
+ if job_info.status == '0':
+ job_trigger = OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)])
scheduler.add_job(
func=eval(job_info.invoke_target),
- trigger=OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)]),
+ trigger=job_trigger,
args=job_info.job_args.split(',') if job_info.job_args else None,
kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None,
id=str(job_info.job_id),
diff --git a/ruoyi-fastapi-backend/module_admin/dao/log_dao.py b/ruoyi-fastapi-backend/module_admin/dao/log_dao.py
index 1e4ad41eb21dd11f40422a0759d6f6ea21e9bd97..684f3d79434392d1eae65bf64b9a3dfd524b8ab6 100644
--- a/ruoyi-fastapi-backend/module_admin/dao/log_dao.py
+++ b/ruoyi-fastapi-backend/module_admin/dao/log_dao.py
@@ -5,6 +5,7 @@ from module_admin.entity.do.log_do import SysLogininfor, SysOperLog
from module_admin.entity.vo.log_vo import LogininforModel, LoginLogPageQueryModel, OperLogModel, OperLogPageQueryModel
from utils.common_util import SnakeCaseUtil
from utils.page_util import PageUtil
+from utils.time_format_util import TimeFormatUtil
class OperationLogDao:
@@ -38,8 +39,8 @@ class OperationLogDao:
SysOperLog.business_type == query_object.business_type if query_object.business_type else True,
SysOperLog.status == query_object.status if query_object.status else True,
SysOperLog.oper_time.between(
- datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(00, 00, 00)),
- datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
+ datetime.combine(TimeFormatUtil.parse_date(query_object.begin_time), time(00, 00, 00)),
+ datetime.combine(TimeFormatUtil.parse_date(query_object.end_time), time(23, 59, 59)),
)
if query_object.begin_time and query_object.end_time
else True,
@@ -120,8 +121,8 @@ class LoginLogDao:
SysLogininfor.user_name.like(f'%{query_object.user_name}%') if query_object.user_name else True,
SysLogininfor.status == query_object.status if query_object.status else True,
SysLogininfor.login_time.between(
- datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(00, 00, 00)),
- datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
+ datetime.combine(TimeFormatUtil.parse_date(query_object.begin_time), time(00, 00, 00)),
+ datetime.combine(TimeFormatUtil.parse_date(query_object.end_time), time(23, 59, 59)),
)
if query_object.begin_time and query_object.end_time
else True,
diff --git a/ruoyi-fastapi-backend/module_admin/service/dict_service.py b/ruoyi-fastapi-backend/module_admin/service/dict_service.py
index bfe64895f94882a92342cd569392d519543efe80..0acfd738df81e35b6d05c3453816201152e09aae 100644
--- a/ruoyi-fastapi-backend/module_admin/service/dict_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/dict_service.py
@@ -103,9 +103,10 @@ class DictTypeService:
if dict_type_info.dict_type != page_object.dict_type:
for dict_data in dict_data_list:
edit_dict_data = DictDataModel(
- dictCode=dict_data.dict_code,
+ dictCode=dict_data.get('dict_code'),
dictType=page_object.dict_type,
updateBy=page_object.update_by,
+ updateTime=page_object.update_time,
).model_dump(exclude_unset=True)
await DictDataDao.edit_dict_data_dao(query_db, edit_dict_data)
await DictTypeDao.edit_dict_type_dao(query_db, edit_dict_type)
diff --git a/ruoyi-fastapi-backend/module_admin/service/user_service.py b/ruoyi-fastapi-backend/module_admin/service/user_service.py
index c149b56d914b301a8a88b60d170990e0978ffbba..60f77c6a727a3dab5e35af488f3f9e61dc905f27 100644
--- a/ruoyi-fastapi-backend/module_admin/service/user_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/user_service.py
@@ -494,6 +494,7 @@ class UserService:
}
for item in user_list:
+ item['deptName'] = item.get('dept').get('deptName')
if item.get('status') == '0':
item['status'] = '正常'
else:
diff --git a/ruoyi-fastapi-backend/module_generator/templates/python/dao.py.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/python/dao.py.jinja2
index 6cf19a137b65bbae22742934d97c3cac9ea499ae..3b186c52ad1a580fca2db790b219f7bb1721ab15 100644
--- a/ruoyi-fastapi-backend/module_generator/templates/python/dao.py.jinja2
+++ b/ruoyi-fastapi-backend/module_generator/templates/python/dao.py.jinja2
@@ -118,12 +118,12 @@ class {{ BusinessName }}Dao:
{{ ClassName }}.{{ field }} <= query_object.{{ field }} if query_object.{{ field }} else True,
{% elif column.query_type == "LIKE" %}
{{ ClassName }}.{{ field }}.like(f'%{% raw %}{{% endraw %}query_object.{{ field }}{% raw %}}{% endraw %}%') if query_object.{{ field }} else True,
- {% elif column.query_type == "BETWEEN" %}
+ {% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
{{ ClassName }}.{{ field }}.between(
- datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(00, 00, 00)),
- datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
+ datetime.combine(datetime.strptime(query_object.begin_{{ column.column_name }}, '%Y-%m-%d'), time(00, 00, 00)),
+ datetime.combine(datetime.strptime(query_object.end_{{ column.column_name }}, '%Y-%m-%d'), time(23, 59, 59)),
)
- if query_object.begin_time and query_object.end_time
+ if query_object.begin_{{ column.column_name }} and query_object.end_{{ column.column_name }}
else True,
{% endif %}
{% endif %}
@@ -145,7 +145,7 @@ class {{ BusinessName }}Dao:
:param {{ businessName }}: {{ functionName }}对象
:return:
"""
- db_{{ businessName }} = {{ ClassName }}(**{{ businessName }}.model_dump(exclude={% raw %}{{% endraw %}{% if table.sub %}'{{ subclassName }}_list', {% endif %}{% for column in columns %}{% if not column.insert %}'{{ column.python_field | camel_to_snake }}'{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}{% raw %}}{% endraw %}))
+ db_{{ businessName }} = {{ ClassName }}(**{{ businessName }}.model_dump(exclude={% raw %}{{% endraw %}{% if table.sub %}'{{ subclassName }}_list', {% endif %}{% for column in columns %}{% if not column.insert and column.column_name not in column_not_add_show + column_not_edit_show %}'{{ column.python_field | camel_to_snake }}'{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}{% raw %}}{% endraw %}))
db.add(db_{{ businessName }})
await db.flush()
diff --git a/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2
index 27d6979111787c77b7270924c3535daafd07c1ab..5726c5d1240b7457f5f4d96a7d28c42aa2733791 100644
--- a/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2
+++ b/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2
@@ -103,7 +103,7 @@ class {{ BusinessName }}Service:
:param page_object: 编辑{{ functionName }}对象
:return: 编辑{{ functionName }}校验结果
"""
- edit_{{ businessName }} = page_object.model_dump(exclude_unset=True, exclude={% raw %}{{% endraw %}{% if table.sub %}'{{ subclassName }}_list', {% endif %}{% for column in columns %}{% if not column.edit and not column.pk %}'{{ column.python_field | camel_to_snake }}'{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}{% raw %}}{% endraw %})
+ edit_{{ businessName }} = page_object.model_dump(exclude_unset=True, exclude={% raw %}{{% endraw %}{% if table.sub %}'{{ subclassName }}_list', {% endif %}{% for column in columns %}{% if not column.edit and not column.pk and column.column_name not in column_not_edit_show %}'{{ column.python_field | camel_to_snake }}'{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}{% raw %}}{% endraw %})
{{ businessName }}_info = await cls.{{ businessName }}_detail_services(query_db, page_object.{{ pk_field }})
if {{ businessName }}_info.{{ pk_field }}:
{% for column in columns %}
diff --git a/ruoyi-fastapi-backend/module_generator/templates/python/vo.py.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/python/vo.py.jinja2
index 76349807bec6730c66e27d859a4f6058362bb9f6..47abbf597a37583717098ef2cc4f37aa7358942e 100644
--- a/ruoyi-fastapi-backend/module_generator/templates/python/vo.py.jinja2
+++ b/ruoyi-fastapi-backend/module_generator/templates/python/vo.py.jinja2
@@ -3,10 +3,14 @@
{% set pkParentheseIndex = pkColumn.column_comment.find("（") %}
{% set pk_field_comment = pkColumn.column_comment[:pkParentheseIndex] if pkParentheseIndex != -1 else pkColumn.column_comment %}
{% set vo_field_required = namespace(has_required=False) %}
+{% set vo_field_daterange = namespace(has_daterange=False) %}
{% for column in columns %}
{% if column.required %}
{% set vo_field_required.has_required = True %}
{% endif %}
+{% if column.html_type == "datetime" and column.query_type == "BETWEEN" %}
+ {% set vo_field_daterange.has_daterange = True %}
+{% endif %}
{% endfor %}
{% set sub_vo_field_required = namespace(has_required=False) %}
{% if table.sub %}
@@ -142,9 +146,16 @@ class {{ BusinessName }}QueryModel({% if table.sub %}{{ BusinessName }}BaseModel
"""
{{ functionName }}不分页查询模型
"""
-
- begin_time: Optional[str] = Field(default=None, description='开始时间')
- end_time: Optional[str] = Field(default=None, description='结束时间')
+ {% if vo_field_daterange.has_daterange %}
+ {% for column in columns %}
+ {% if column.html_type == "datetime" and column.query_type == "BETWEEN" %}
+ begin_{{ column.column_name }}: Optional[str] = Field(default=None, description='开始{{ column.column_comment }}')
+ end_{{ column.column_name }}: Optional[str] = Field(default=None, description='结束{{ column.column_comment }}')
+ {% endif %}
+ {% endfor %}
+ {% else %}
+ pass
+ {% endif %}
@as_query
diff --git a/ruoyi-fastapi-backend/module_generator/templates/vue/index-tree.vue.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/vue/index-tree.vue.jinja2
index 741f13282a13abde0eecabfdb695f85b960b0a25..eb8ceaf5424907a7005abb7e72c3ae4910e73089 100644
--- a/ruoyi-fastapi-backend/module_generator/templates/vue/index-tree.vue.jinja2
+++ b/ruoyi-fastapi-backend/module_generator/templates/vue/index-tree.vue.jinja2
@@ -35,12 +35,13 @@
{% elif column.html_type == "datetime" and column.query_type != "BETWEEN" %}
-
-
+ placeholder="请选择{{ comment }}"
+ clearable
+ />
{% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
@@ -52,7 +53,7 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
- >
+ />
{% endif %}
{% endif %}
@@ -161,33 +162,33 @@
{% for column in columns %}
{% set field = column.python_field %}
- {% if column.insert and not column.pk %}
+ {% if (column.insert or column.edit) and not column.pk and column.column_name not in column_not_add_show + column_not_edit_show %}
{% 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 %}
-
+
{% elif column.html_type == "checkbox" and not dictType %}
-
+
请选择字典生成
{% elif column.html_type == "radio" and dictType %}
-
+
{% elif column.html_type == "radio" and not dictType %}
-
+
{% elif column.html_type == "datetime" %}
-
+
{% elif column.html_type == "textarea" %}
-
+
{% endif %}
@@ -351,8 +352,8 @@ export default {
{% if column.html_type == "datetime" and column.query_type == "BETWEEN" %}
{% set AttrName = column.python_field[0] | upper + column.python_field[1:] %}
if (null != this.daterange{{ AttrName }} && '' != this.daterange{{ AttrName }}) {
- this.queryParams.params["begin{{ AttrName }}"] = this.daterange{{ AttrName }}[0];
- this.queryParams.params["end{{ AttrName }}"] = this.daterange{{ AttrName }}[1];
+ this.queryParams.begin{{ AttrName }} = this.daterange{{ AttrName }}[0];
+ this.queryParams.end{{ AttrName }} = this.daterange{{ AttrName }}[1];
}
{% endif %}
{% endfor %}
@@ -485,6 +486,10 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
+ },
+ /** 是否渲染字段 */
+ renderField(insert, edit) {
+ return this.form.{{ pkColumn.python_field }} == null ? insert : edit;
}
},
};
diff --git a/ruoyi-fastapi-backend/module_generator/templates/vue/index.vue.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/vue/index.vue.jinja2
index a1b7f4b03ec3f6803a6cd6ce843b5d74afbbe3b4..39f861de28cdcd1773b6fd21b72cb6d0e1c29766 100644
--- a/ruoyi-fastapi-backend/module_generator/templates/vue/index.vue.jinja2
+++ b/ruoyi-fastapi-backend/module_generator/templates/vue/index.vue.jinja2
@@ -35,12 +35,13 @@
{% elif column.html_type == "datetime" and column.query_type != "BETWEEN" %}
-
-
+ placeholder="请选择{{ comment }}"
+ clearable
+ />
{% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
@@ -52,7 +53,7 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
- >
+ />
{% endif %}
{% endif %}
@@ -173,29 +174,29 @@
{% for column in columns %}
{% set field = column.python_field %}
- {% if column.insert and not column.pk %}
+ {% if (column.insert or column.edit) and not column.pk and column.column_name not in column_not_add_show + column_not_edit_show %}
{% 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 %}
-
+
{% elif column.html_type == "checkbox" and not dictType %}
-
+
请选择字典生成
{% elif column.html_type == "radio" and dictType %}
-
+
{% elif column.html_type == "radio" and not dictType %}
-
+
{% elif column.html_type == "datetime" %}
-
+
{% elif column.html_type == "textarea" %}
-
+
{% endif %}
@@ -426,8 +427,8 @@ export default {
{% if column.html_type == "datetime" and column.query_type == "BETWEEN" %}
{% set AttrName = column.python_field[0] | upper + column.python_field[1:] %}
if (null != this.daterange{{ AttrName }} && '' != this.daterange{{ AttrName }}) {
- this.queryParams.params["begin{{ AttrName }}"] = this.daterange{{ AttrName }}[0];
- this.queryParams.params["end{{ AttrName }}"] = this.daterange{{ AttrName }}[1];
+ this.queryParams.begin{{ AttrName }} = this.daterange{{ AttrName }}[0];
+ this.queryParams.end{{ AttrName }} = this.daterange{{ AttrName }}[1];
}
{% endif %}
{% endfor %}
@@ -580,6 +581,10 @@ export default {
this.download('{{ moduleName }}/{{ businessName }}/export', {
...this.queryParams
}, `{{ businessName }}_${new Date().getTime()}.xlsx`);
+ },
+ /** 是否渲染字段 */
+ renderField(insert, edit) {
+ return this.form.{{ pkColumn.python_field }} == null ? insert : edit;
}
},
};
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
index 433c162de5999e8c679dff27aea75c11410848f7..52eeda9afc679ec5069f871e2527e87c2f44683b 100644
--- 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
@@ -13,12 +13,13 @@
v-model="queryParams.{{ column.python_field }}"
placeholder="请输入{{ comment }}"
clearable
+ style="width: 240px"
@keyup.enter="handleQuery"
/>
{% 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" %}
-
-
+ placeholder="请选择{{ comment }}"
+ clearable
+ style="width: 240px"
+ />
{% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
@@ -51,7 +54,8 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
- >
+ style="width: 240px"
+ />
{% endif %}
{% endif %}
@@ -136,13 +140,13 @@
{% for column in columns %}
{% set field = column.python_field %}
- {% if column.insert and not column.pk %}
+ {% if (column.insert or column.edit) and not column.pk and column.column_name not in column_not_add_show + column_not_edit_show %}
{% 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 %}
-
+
{% elif column.html_type == "checkbox" and not dictType %}
-
+
请选择字典生成
{% elif column.html_type == "radio" and dictType %}
-
+
{% elif column.html_type == "radio" and not dictType %}
-
+
{% elif column.html_type == "datetime" %}
-
+
{% elif column.html_type == "textarea" %}
-
+
{% endif %}
@@ -315,8 +319,8 @@ function getList() {
{% if column.html_type == "datetime" and column.query_type == "BETWEEN" %}
{% set AttrName = column.python_field[0] | upper + column.python_field[1:] %}
if (null != daterange{{ AttrName }} && '' != daterange{{ AttrName }}) {
- queryParams.value.params["begin{{ AttrName }}"] = daterange{{ AttrName }}.value[0];
- queryParams.value.params["end{{ AttrName }}"] = daterange{{ AttrName }}.value[1];
+ queryParams.value.begin{{ AttrName }} = daterange{{ AttrName }}.value[0];
+ queryParams.value.end{{ AttrName }} = daterange{{ AttrName }}.value[1];
}
{% endif %}
{% endfor %}
@@ -450,5 +454,10 @@ function handleDelete(row) {
}).catch(() => {});
}
+/** 是否渲染字段 */
+function renderField(insert, edit) {
+ return form.value.{{ pkColumn.python_field }} == null ? insert : edit;
+}
+
getList();
\ 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
index 981124f821599cce9ec5e286d06f4962dba16214..73dae7d52ac3937f6be36ccabc59adfc8bdf8978 100644
--- a/ruoyi-fastapi-backend/module_generator/templates/vue/v3/index.vue.jinja2
+++ b/ruoyi-fastapi-backend/module_generator/templates/vue/v3/index.vue.jinja2
@@ -13,12 +13,13 @@
v-model="queryParams.{{ column.python_field }}"
placeholder="请输入{{ comment }}"
clearable
+ style="width: 240px"
@keyup.enter="handleQuery"
/>
{% 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" %}
-
-
+ placeholder="请选择{{ comment }}"
+ clearable
+ style="width: 240px"
+ />
{% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
@@ -51,7 +54,8 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
- >
+ style="width: 240px"
+ />
{% endif %}
{% endif %}
@@ -159,29 +163,29 @@
{% for column in columns %}
{% set field = column.python_field %}
- {% if column.insert and not column.pk %}
+ {% if (column.insert or column.edit) and not column.pk and column.column_name not in column_not_add_show + column_not_edit_show %}
{% 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 %}
-
+
{% elif column.html_type == "checkbox" and not dictType %}
-
+
请选择字典生成
{% elif column.html_type == "radio" and dictType %}
-
+
{% elif column.html_type == "radio" and not dictType %}
-
+
{% elif column.html_type == "datetime" %}
-
+
{% elif column.html_type == "textarea" %}
-
+
{% endif %}
@@ -397,8 +401,8 @@ function getList() {
{% if column.html_type == "datetime" and column.query_type == "BETWEEN" %}
{% set AttrName = column.python_field[0] | upper + column.python_field[1:] %}
if (null != daterange{{ AttrName }} && '' != daterange{{ AttrName }}) {
- queryParams.value.params["begin{{ AttrName }}"] = daterange{{ AttrName }}.value[0];
- queryParams.value.params["end{{ AttrName }}"] = daterange{{ AttrName }}.value[1];
+ queryParams.value.begin{{ AttrName }} = daterange{{ AttrName }}.value[0];
+ queryParams.value.end{{ AttrName }} = daterange{{ AttrName }}.value[1];
}
{% endif %}
{% endfor %}
@@ -567,5 +571,10 @@ function handleExport() {
}, `{{ businessName }}_${new Date().getTime()}.xlsx`);
}
+/** 是否渲染字段 */
+function renderField(insert, edit) {
+ return form.value.{{ pkColumn.python_field }} == null ? insert : edit;
+}
+
getList();
\ No newline at end of file
diff --git a/ruoyi-fastapi-backend/requirements-pg.txt b/ruoyi-fastapi-backend/requirements-pg.txt
index 3caa988da5f63fccebf7ce801b6e670557be217a..095197fd1b036f26b405a66a16a47dce04f50f32 100644
--- a/ruoyi-fastapi-backend/requirements-pg.txt
+++ b/ruoyi-fastapi-backend/requirements-pg.txt
@@ -14,4 +14,5 @@ psycopg2==2.9.10
redis==5.2.1
requests==2.32.3
SQLAlchemy[asyncio]==2.0.38
+sqlglot[rs]==26.6.0
user-agents==2.2.0
diff --git a/ruoyi-fastapi-backend/utils/template_util.py b/ruoyi-fastapi-backend/utils/template_util.py
index 55a8f879c7fd775fbeb60c6756963aa30e3e0306..6765bd07306ffcbef865afe979136850e6ebfd6d 100644
--- a/ruoyi-fastapi-backend/utils/template_util.py
+++ b/ruoyi-fastapi-backend/utils/template_util.py
@@ -91,6 +91,8 @@ class TemplateUtils:
'table': gen_table,
'dicts': cls.get_dicts(gen_table),
'dbType': DataBaseConfig.db_type,
+ 'column_not_add_show': GenConstant.COLUMNNAME_NOT_ADD_SHOW,
+ 'column_not_edit_show': GenConstant.COLUMNNAME_NOT_EDIT_SHOW,
}
# 设置菜单、树形结构、子表的上下文
diff --git a/ruoyi-fastapi-backend/utils/time_format_util.py b/ruoyi-fastapi-backend/utils/time_format_util.py
index 380537ebaa28be2ed2e0d291d87847cd5c651ac4..bfb048156ff98f4fe19086cac687567e7d4d0b90 100644
--- a/ruoyi-fastapi-backend/utils/time_format_util.py
+++ b/ruoyi-fastapi-backend/utils/time_format_util.py
@@ -1,4 +1,7 @@
-import datetime
+from copy import deepcopy
+from datetime import datetime
+from dateutil.parser import parse
+from typing import Dict, List, Union
def object_format_datetime(obj):
@@ -8,7 +11,7 @@ def object_format_datetime(obj):
"""
for attr in dir(obj):
value = getattr(obj, attr)
- if isinstance(value, datetime.datetime):
+ if isinstance(value, datetime):
setattr(obj, attr, value.strftime('%Y-%m-%d %H:%M:%S'))
return obj
@@ -21,7 +24,7 @@ def list_format_datetime(lst):
for obj in lst:
for attr in dir(obj):
value = getattr(obj, attr)
- if isinstance(value, datetime.datetime):
+ if isinstance(value, datetime):
setattr(obj, attr, value.strftime('%Y-%m-%d %H:%M:%S'))
return lst
@@ -41,7 +44,7 @@ def format_datetime_dict_list(dicts):
if isinstance(v, dict):
# 递归遍历子字典
new_item[k] = format_datetime_dict_list([v])[0]
- elif isinstance(v, datetime.datetime):
+ elif isinstance(v, datetime):
# 如果值是 datetime 类型，则格式化为字符串
new_item[k] = v.strftime('%Y-%m-%d %H:%M:%S')
else:
@@ -50,3 +53,89 @@ def format_datetime_dict_list(dicts):
result.append(new_item)
return result
+
+
+class TimeFormatUtil:
+ """
+ 时间格式化工具类
+ """
+
+ @classmethod
+ def format_time(cls, time_info: Union[str, datetime], format: str = '%Y-%m-%d %H:%M:%S'):
+ """
+ 格式化时间字符串或datetime对象为指定格式
+
+ :param time_info: 时间字符串或datetime对象
+ :param format: 格式化格式，默认为'%Y-%m-%d %H:%M:%S'
+ :return: 格式化后的时间字符串
+ """
+ if isinstance(time_info, datetime):
+ format_date = time_info.strftime(format)
+ else:
+ try:
+ date = parse(time_info)
+ format_date = date.strftime(format)
+ except Exception:
+ format_date = time_info
+
+ return format_date
+
+ @classmethod
+ def parse_date(cls, time_str: str):
+ """
+ 解析时间字符串提取日期部分
+
+ :param time_str: 时间字符串
+ :return: 日期部分
+ """
+ try:
+ dt = parse(time_str)
+ return dt.date()
+ except Exception:
+ return time_str
+
+ @classmethod
+ def format_time_dict(cls, time_dict: Dict, format: str = '%Y-%m-%d %H:%M:%S'):
+ """
+ 格式化时间字典
+
+ :param time_dict: 时间字典
+ :param format: 格式化格式，默认为'%Y-%m-%d %H:%M:%S'
+ :return: 格式化后的时间字典
+ """
+ copy_time_dict = deepcopy(time_dict)
+ for k, v in copy_time_dict.items():
+ if isinstance(v, (str, datetime)):
+ copy_time_dict[k] = cls.format_time(v, format)
+ elif isinstance(v, dict):
+ copy_time_dict[k] = cls.format_time_dict(v, format)
+ elif isinstance(v, list):
+ copy_time_dict[k] = cls.format_time_list(v, format)
+ else:
+ copy_time_dict[k] = v
+
+ return copy_time_dict
+
+ @classmethod
+ def format_time_list(cls, time_list: List, format: str = '%Y-%m-%d %H:%M:%S'):
+ """
+ 格式化时间列表
+
+ :param time_list: 时间列表
+ :param format: 格式化格式，默认为'%Y-%m-%d %H:%M:%S'
+ :return: 格式化后的时间列表
+ """
+ format_time_list = []
+ for item in time_list:
+ if isinstance(item, (str, datetime)):
+ format_item = cls.format_time(item, format)
+ elif isinstance(item, dict):
+ format_item = cls.format_time_dict(item, format)
+ elif isinstance(item, list):
+ format_item = cls.format_time_list(item, format)
+ else:
+ format_item = item
+
+ format_time_list.append(format_item)
+
+ return format_time_list
diff --git a/ruoyi-fastapi-frontend/package.json b/ruoyi-fastapi-frontend/package.json
index 0345c5fe934e8c577e064c713796a7376e42629a..a599d822b000692d4120017fb4fbcffdd235c625 100644
--- a/ruoyi-fastapi-frontend/package.json
+++ b/ruoyi-fastapi-frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "vfadmin",
- "version": "1.6.1",
+ "version": "1.6.2",
"description": "vfadmin管理系统",
"author": "insistence",
"license": "MIT",
diff --git a/ruoyi-fastapi-frontend/src/assets/styles/index.scss b/ruoyi-fastapi-frontend/src/assets/styles/index.scss
index 2f3b9ef9c3d69628cdefc69f63b9ff30a70dddd3..bb87292cbad056766d770120ce1efcad132eb703 100644
--- a/ruoyi-fastapi-frontend/src/assets/styles/index.scss
+++ b/ruoyi-fastapi-frontend/src/assets/styles/index.scss
@@ -129,10 +129,6 @@ aside {
position: relative;
}
-.pagination-container {
- margin-top: 30px;
-}
-
.text-center {
text-align: center
}
diff --git a/ruoyi-fastapi-frontend/src/assets/styles/ruoyi.scss b/ruoyi-fastapi-frontend/src/assets/styles/ruoyi.scss
index 7e44513cc5b0649a9a154d365787e7efcfb31154..3d51d6d4cd80e8646ef8161a6dd1693d55d24256 100644
--- a/ruoyi-fastapi-frontend/src/assets/styles/ruoyi.scss
+++ b/ruoyi-fastapi-frontend/src/assets/styles/ruoyi.scss
@@ -117,11 +117,9 @@
/** 表格布局 **/
.pagination-container {
- position: relative;
- height: 32px;
- margin-bottom: 10px;
- margin-top: 15px;
- padding: 10px 20px !important;
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 20px;
}
/* tree border */
@@ -132,11 +130,6 @@
border-radius: 4px;
}
-.pagination-container .el-pagination {
- right: 0;
- position: absolute;
-}
-
@media (max-width: 768px) {
.pagination-container .el-pagination > .el-pagination__jump {
display: none !important;
diff --git a/ruoyi-fastapi-frontend/src/components/FileUpload/index.vue b/ruoyi-fastapi-frontend/src/components/FileUpload/index.vue
index 12ad4ea710a164cf41e449af4068506e969181da..149206528763dc753b0e6e2f4168a2f847ac8721 100644
--- a/ruoyi-fastapi-frontend/src/components/FileUpload/index.vue
+++ b/ruoyi-fastapi-frontend/src/components/FileUpload/index.vue
@@ -13,6 +13,7 @@
:headers="headers"
class="upload-file-uploader"
ref="fileUpload"
+ v-if="!disabled"
>
选取文件
@@ -32,7 +33,7 @@
{{ getFileName(file.name) }}
- 删除
+ 删除
@@ -50,22 +51,27 @@ export default {
// 数量限制
limit: {
type: Number,
- default: 5,
+ default: 5
},
// 大小限制(MB)
fileSize: {
type: Number,
- default: 5,
+ default: 5
},
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
- default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+ default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf"]
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: true
+ },
+ // 禁用组件（仅查看文件）
+ disabled: {
+ type: Boolean,
+ default: false
}
},
data() {
diff --git a/ruoyi-fastapi-frontend/src/components/Pagination/index.vue b/ruoyi-fastapi-frontend/src/components/Pagination/index.vue
index 56f5a6b9da18e6b5f9361a08ccf99caf87f6fd5c..b807863e88208e4384cdd9d83978233bc19a4791 100644
--- a/ruoyi-fastapi-frontend/src/components/Pagination/index.vue
+++ b/ruoyi-fastapi-frontend/src/components/Pagination/index.vue
@@ -106,7 +106,6 @@ export default {