-
-
{{ formatDate(data.day) }}
- - -
+
+ {{ formatDate(data.day) }} +
+
{{ event.content }}
@@ -30,7 +28,6 @@
-
@@ -38,15 +35,15 @@
-
- {{ type.label }}
+
+ {{ et.label }}
diff --git a/frontend/new-web/src/views/module_common/ljdoc/index.vue b/frontend/new-web/src/views/module_common/ljdoc/index.vue
deleted file mode 100644
index a6ddab50..00000000
--- a/frontend/new-web/src/views/module_common/ljdoc/index.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row.status ? "启用" : "停用" }}
-
-
-
-
- {{ row.d ? "是" : "否" }}
-
-
-
- {{ row.created_by?.name }}
-
-
- {{ row.updated_by?.name }}
-
-
-
- 详情
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
- {{ detailFormData.name }}
-
-
- {{ detailFormData.uuid }}
-
-
-
- {{ detailFormData.status == "0" ? "启用" : "停用" }}
-
-
-
- {{ detailFormData.a }}
-
-
- {{ detailFormData.b }}
-
-
- {{ detailFormData.c }}
-
-
-
- {{ detailFormData.d ? "是" : "否" }}
-
-
-
- {{ detailFormData.e }}
-
-
- {{ detailFormData.f }}
-
-
- {{ detailFormData.g }}
-
-
- {{ detailFormData.h }}
-
-
-
-
- {{ detailFormData.description }}
-
-
- {{ detailFormData.created_by?.name }}
-
-
- {{ detailFormData.updated_by?.name }}
-
-
- {{ detailFormData.created_time }}
-
-
- {{ detailFormData.updated_time }}
-
-
+
+
+
+ {{ detailFormData.name }}
+
+
+ {{ detailFormData.uuid }}
+
+
+
+ {{ detailFormData.status === "0" ? "启用" : "停用" }}
+
+
+
+ {{ detailFormData.a }}
+
+
+ {{ detailFormData.b }}
+
+
+ {{ detailFormData.c }}
+
+
+
+ {{ detailFormData.d ? "是" : "否" }}
+
+
+
+ {{ detailFormData.e }}
+
+
+ {{ detailFormData.f }}
+
+
+ {{ detailFormData.g }}
+
+
+ {{ detailFormData.h }}
+
+
+
+
+ {{ detailFormData.description }}
+
+
+ {{ detailFormData.created_by?.name }}
+
+
+ {{ detailFormData.updated_by?.name }}
+
+
+ {{ detailFormData.created_time }}
+
+
+ {{ detailFormData.updated_time }}
+
+
+
-
-
-
-
-
- 启用
- 停用
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/new-web/src/views/module_common/redoc/index.vue b/frontend/new-web/src/views/module_common/redoc/index.vue
deleted file mode 100644
index 659242cd..00000000
--- a/frontend/new-web/src/views/module_common/redoc/index.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/new-web/src/views/module_example/demo/index.vue b/frontend/new-web/src/views/module_example/demo/index.vue
index 1a7013b3..ef0dae85 100644
--- a/frontend/new-web/src/views/module_example/demo/index.vue
+++ b/frontend/new-web/src/views/module_example/demo/index.vue
@@ -1,562 +1,520 @@
-
+
-
-
-
+
+
+
+
+
+ 启用
+ 停用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 添加元数据
-
-
-
-
+
+
+
-
+function runBatchStatus(status: string) {
+ const ids = selectedIds.value;
+ if (ids.length === 0) {
+ ElMessage.warning("请先在列表中勾选数据");
+ return;
+ }
+ ElMessageBox.confirm(
+ `确认对选中的 ${ids.length} 条数据${status === "0" ? "启用" : "停用"}？`,
+ "批量设置",
+ { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }
+ )
+ .then(async () => {
+ await DemoAPI.batchDemo({ ids, status });
+ ElMessage.success("操作成功");
+ artTableRef.value?.elTableRef?.clearSelection();
+ await refreshData();
+ })
+ .catch(() => {});
+}
-
+function openImportModal() {
+ importModalVisible.value = true;
+}
+
+function handleCrudImportUpload(formData: FormData) {
+ DemoAPI.importDemo(formData)
+ .then((res) => {
+ if (res.data.code !== ResultEnum.SUCCESS) {
+ ElMessage.error(res.data.msg || "导入失败");
+ return;
+ }
+ ElMessage.success(res.data.msg || "导入成功");
+ importModalVisible.value = false;
+ return refreshData();
+ })
+ .catch(console.error);
+}
+
+function openExportModal() {
+ exportModalVisible.value = true;
+}
+
diff --git a/frontend/new-web/src/views/module_example/demo01/index.vue b/frontend/new-web/src/views/module_example/demo01/index.vue
index 31f2e94a..c7f4dfff 100644
--- a/frontend/new-web/src/views/module_example/demo01/index.vue
+++ b/frontend/new-web/src/views/module_example/demo01/index.vue
@@ -1,462 +1,385 @@
-
+
-
+
-
+
+
-
+
-
-
-
+
+
+
-
-
+
-
-
- {{ detailFormData.name }}
-
-
- {{ detailFormData.uuid }}
-
-
-
- {{ detailFormData.status == "0" ? "启用" : "停用" }}
-
-
-
- {{ detailFormData.description }}
-
-
- {{ detailFormData.created_by?.name }}
-
-
- {{ detailFormData.updated_by?.name }}
-
-
- {{ detailFormData.created_time }}
-
-
- {{ detailFormData.updated_time }}
-
-
+
+
+
+ {{ detailFormData.name }}
+
+
+ {{ detailFormData.uuid }}
+
+
+
+ {{ detailFormData.status === "0" ? "正常" : "停用" }}
+
+
+
+ {{ detailFormData.description }}
+
+
+ {{ detailFormData.created_by?.name ?? "—" }}
+
+
+ {{ detailFormData.updated_by?.name ?? "—" }}
+
+
+ {{ detailFormData.created_time }}
+
+
+ {{ detailFormData.updated_time }}
+
+
+
-
-
-
-
-
- 启用
- 停用
-
-
-
-
-
+
+
+
+
+
+
+ 正常
+ 停用
+
+
+
+
+
+
-
+function runBatchStatus(status: string) {
+ const ids = selectedIds.value;
+ if (ids.length === 0) {
+ ElMessage.warning("请先在列表中勾选数据");
+ return;
+ }
+ ElMessageBox.confirm(
+ `确认对选中的 ${ids.length} 条数据${status === "0" ? "启用" : "停用"}？`,
+ "批量设置",
+ { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }
+ )
+ .then(async () => {
+ await Demo01API.batchDemo01({ ids, status });
+ ElMessage.success("操作成功");
+ artTableRef.value?.elTableRef?.clearSelection();
+ await refreshData();
+ })
+ .catch(() => {});
+}
-
+function openImportModal() {
+ importModalVisible.value = true;
+}
+
+function handleCrudImportUpload(formDataUpload: FormData) {
+ Demo01API.importDemo01(formDataUpload)
+ .then((res) => {
+ if (res.data.code !== ResultEnum.SUCCESS) {
+ ElMessage.error(res.data.msg || "导入失败");
+ return;
+ }
+ ElMessage.success(res.data.msg || "导入成功");
+ importModalVisible.value = false;
+ return refreshData();
+ })
+ .catch(console.error);
+}
+
+function openExportModal() {
+ exportModalVisible.value = true;
+}
+
diff --git a/frontend/new-web/src/views/module_generator/gencode/components/CreateTableDialog.vue b/frontend/new-web/src/views/module_generator/gencode/components/CreateTableDialog.vue
index 74d86390..c54eeb92 100644
--- a/frontend/new-web/src/views/module_generator/gencode/components/CreateTableDialog.vue
+++ b/frontend/new-web/src/views/module_generator/gencode/components/CreateTableDialog.vue
@@ -1,5 +1,5 @@
-
-
+
@@ -16,40 +16,40 @@
自带示例一键插入；会写 DDL 的可直接粘贴，支持多条语句。
-
+
+
+
+
diff --git a/frontend/new-web/src/views/module_system/dict/components/DataDrawer.vue b/frontend/new-web/src/views/module_system/dict/components/DataDrawer.vue
index 3fb91734..7a0123cb 100644
--- a/frontend/new-web/src/views/module_system/dict/components/DataDrawer.vue
+++ b/frontend/new-web/src/views/module_system/dict/components/DataDrawer.vue
@@ -1,436 +1,302 @@
-
+
-
+
+
+
diff --git a/frontend/new-web/src/views/module_system/tenant/index.vue b/frontend/new-web/src/views/module_system/tenant/index.vue
index af3bc7b6..4f5b7659 100644
--- a/frontend/new-web/src/views/module_system/tenant/index.vue
+++ b/frontend/new-web/src/views/module_system/tenant/index.vue
@@ -1,407 +1,492 @@
-
+
-
+
-
-
-
+
+
diff --git a/frontend/new-web/src/views/module_task/cronjob/job/index.vue b/frontend/new-web/src/views/module_task/cronjob/job/index.vue
index 0da849c7..da7a13e8 100644
--- a/frontend/new-web/src/views/module_task/cronjob/job/index.vue
+++ b/frontend/new-web/src/views/module_task/cronjob/job/index.vue
@@ -1,35 +1,54 @@
+
-
-
-
-
-
- {{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}
-
-
-
-
-
- {{ scope.row.status === "0" ? "启用" : "停用" }}
-
-
-
-
-
- {{ scope.row.created_by?.name }}
-
-
-
-
- {{ scope.row.updated_by?.name }}
-
-
-
-
-
- 详情
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
-
+
+
插入示例模板
-
+
- 单表 · MySQL
- 单表 · PostgreSQL
- 主子表 · MySQL
- 主子表 · PostgreSQL
-
+
+ 单表 · MySQL
+ 单表 · PostgreSQL
+ 主子表 · MySQL
+ 主子表 · PostgreSQL
+
-
+
从模板开始比自己写更省事
-
-
-
+
+
-
+
+
-
-
+
选项
-
-
- MySQL
- PostgreSQL
-
-
-
-
- 只要一张表
- 主表 + 子表明细
-
-
-
+
+
+ MySQL
+ PostgreSQL
+
+
+
+
+ 只要一张表
+ 主表 + 子表明细
+
+
+
-
+
主表
-
+
*
表名
-
-
-
-
+
+
+
+
-
子表
-
+
*
表名
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
+
需要手写调整？生成 SQL 并切到「写 SQL」
-
+
将要执行的 SQL（随上面表格自动更新）
-
-
-
-
+
+
+
-
-
+
-
-
- {{ detailFormData.dict_label }}
-
-
- {{ detailFormData.dict_type }}
-
-
- {{ detailFormData.dict_value }}
-
-
- {{ detailFormData.css_class }}
-
-
- {{ detailFormData.list_class }}
-
-
- 是
- 否
-
-
- 启用
- 停用
-
-
- {{ detailFormData.dict_sort }}
-
-
- {{ detailFormData.description }}
-
-
- {{ detailFormData.created_time }}
-
-
- {{ detailFormData.updated_time }}
-
-
+
+
+
+ {{ detailFormData.dict_label }}
+
+
+ {{ detailFormData.dict_type }}
+
+
+ {{ detailFormData.dict_value }}
+
+
+ {{ detailFormData.css_class }}
+
+
+ {{ detailFormData.list_class }}
+
+
+ 是
+ 否
+
+
+ 启用
+ 停用
+
+
+ {{ detailFormData.dict_sort }}
+
+
+ {{ detailFormData.description }}
+
+
+ {{ detailFormData.created_time }}
+
+
+ {{ detailFormData.updated_time }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- 主要(primary)
-
-
-
-
- 成功(success)
-
-
-
-
- 警告(warning)
-
-
-
-
- 危险(danger)
-
-
-
-
- 信息(info)
-
-
-
-
-
-
-
- 默认(default)
-
-
-
- 主要(primary)
-
-
-
-
- 成功(success)
-
-
-
-
- 警告(warning)
-
-
-
-
- 危险(danger)
-
-
-
-
- 信息(info)
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 主要(primary)
+
+
+
+
+ 成功(success)
+
+
+
+
+ 警告(warning)
+
+
+
+
+ 危险(danger)
+
+
+
+
+ 信息(info)
+
+
+
+
+
+
+
+
+ 默认(default)
+
+
+
+
+ 主要(primary)
+
+
+
+
+ 成功(success)
+
+
+
+
+ 警告(warning)
+
+
+
+
+ 危险(danger)
+
+
+
+
+ 信息(info)
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -790,10 +824,9 @@ async function handleMoreClick(status: string) {
min-height: 0;
}
-.drawer-content :deep(.el-card.data-table) {
+.drawer-table-card {
flex: 1;
min-height: 0;
- margin-top: 16px;
}
.tag-option-preview {
diff --git a/frontend/new-web/src/views/module_system/dict/index.vue b/frontend/new-web/src/views/module_system/dict/index.vue
index 4c30a3c5..f73b16e9 100644
--- a/frontend/new-web/src/views/module_system/dict/index.vue
+++ b/frontend/new-web/src/views/module_system/dict/index.vue
@@ -1,270 +1,145 @@
-
+
-
+
-
+
+
-
-
-
-
-
- {{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}
-
-
-
-
-
- {{ scope.row.status === "0" ? "启用" : "停用" }}
-
-
-
-
-
- {{ scope.row.dict_type }}
-
-
-
-
- 是
- 否
-
-
-
-
-
- 详情
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
-
-
+
-
-
- {{ detailFormData.dict_name }}
-
-
- {{ detailFormData.dict_type }}
-
-
- 启用
- 停用
-
-
- {{ detailFormData.description }}
-
-
- {{ detailFormData.created_time }}
-
-
- {{ detailFormData.updated_time }}
-
-
+
+
+
+ {{ detailFormData.dict_name }}
+
+
+ {{ detailFormData.dict_type }}
+
+
+ 启用
+ 停用
+
+
+ {{ detailFormData.description }}
+
+
+ {{ detailFormData.created_time }}
+
+
+ {{ detailFormData.updated_time }}
+
+
+
-
-
-
-
-
-
-
- 启用
- 停用
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 启用
+ 停用
+
+
+
+
+
+
-
-
-
-
+
+
+
- 取消
- 取消
+
保存
-
+
-
+
+
+
diff --git a/frontend/new-web/src/views/module_system/position/index.vue b/frontend/new-web/src/views/module_system/position/index.vue
index 069f2ccb..7fac757c 100644
--- a/frontend/new-web/src/views/module_system/position/index.vue
+++ b/frontend/new-web/src/views/module_system/position/index.vue
@@ -1,467 +1,546 @@
-
+
-
-
+
-
-
-
-
-
- {{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}
-
-
-
-
- {{ scope.row.dict_type }}
-
-
-
-
-
- {{ scope.row.status === "0" ? "启用" : "停用" }}
-
-
-
-
-
-
- 字典
-
-
- 详情
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
-
+
+
-
-
- {{ detailFormData.name }}
-
-
- {{ detailFormData.order }}
-
-
- 启用
- 停用
-
-
- {{ detailFormData.created_by?.name }}
-
-
- {{ detailFormData.updated_by?.name }}
-
-
- {{ detailFormData.created_time }}
-
-
- {{ detailFormData.updated_time }}
-
-
- {{ detailFormData.description }}
-
-
+
+
+
+ {{ detailFormData.name }}
+
+
+ {{ detailFormData.order }}
+
+
+ 启用
+ 停用
+
+
+ {{ detailFormData.created_by?.name }}
+
+
+ {{ detailFormData.updated_by?.name }}
+
+
+ {{ detailFormData.created_time }}
+
+
+ {{ detailFormData.updated_time }}
+
+
+ {{ detailFormData.description }}
+
+
+
-
-
-
-
-
-
-
- 启用
- 停用
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 启用
+ 停用
+
+
+
+
+
+
-
-
+
-
+
+
diff --git a/frontend/new-web/src/views/module_system/role/components/PermissonDrawer.vue b/frontend/new-web/src/views/module_system/role/components/PermissonDrawer.vue
index 7cf0e081..0b9ee394 100644
--- a/frontend/new-web/src/views/module_system/role/components/PermissonDrawer.vue
+++ b/frontend/new-web/src/views/module_system/role/components/PermissonDrawer.vue
@@ -1,6 +1,6 @@
-
-
-
-
-
- {{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}
-
-
-
-
-
- {{ scope.row.status === "0" ? "启用" : "停用" }}
-
-
-
-
-
- {{ scope.row.created_by?.name }}
-
-
-
-
- {{ scope.row.updated_by?.name }}
-
-
-
-
-
- 详情
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
+
-
+
@@ -19,36 +19,36 @@
数据授权
-
+
授权用户可操作的数据范围
-
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
菜单授权
-
+
授权用户可操作的菜单权限
-
+
-
+
+
-
-
+
-
+
父子联动
-
+
-
+
如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动
-
+
-
+
+
-
-
+
-
-
+
-
-
+
+
+
-
-
+
-
-
- {{ detailFormData.name }}
-
-
- {{ detailFormData.code }}
-
-
-
- {{ detailFormData.status === "0" ? "正常" : "禁用" }}
-
-
-
- {{ detailFormData.start_time }}
-
-
- {{ detailFormData.end_time }}
-
-
- {{ detailFormData.description }}
-
-
- {{ detailFormData.created_time }}
-
-
+
+
+
+ {{ detailFormData.name }}
+
+
+ {{ detailFormData.code }}
+
+
+
+ {{ detailFormData.status === "0" ? "正常" : "禁用" }}
+
+
+
+ {{ detailFormData.start_time }}
+
+
+ {{ detailFormData.end_time }}
+
+
+ {{ detailFormData.description }}
+
+
+ {{ detailFormData.created_time }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
diff --git a/frontend/new-web/src/views/module_system/user/components/DeptTree.vue b/frontend/new-web/src/views/module_system/user/components/DeptTree.vue
index 8230be1e..1fa6cb83 100644
--- a/frontend/new-web/src/views/module_system/user/components/DeptTree.vue
+++ b/frontend/new-web/src/views/module_system/user/components/DeptTree.vue
@@ -1,29 +1,29 @@
-
-
-
-
-
- {{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}
-
-
-
-
-
- {{ scope.row.status === "0" ? "正常" : "禁用" }}
-
-
-
-
-
-
- 详情
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
+
-
-
+
+
+
-
+
+
-
-
调度器监控
-
状态：
-
+
{{ schedulerStatus.status }}
-
+
运行中：
-
+
{{ schedulerStatus.is_running ? "是" : "否" }}
-
+
任务数量：
- {{ schedulerStatus.job_count }}
+ {{ schedulerStatus.job_count }}
-
启动
-
-
+
暂停
-
-
+
恢复
-
-
+
关闭
-
-
+
清空任务
-
-
+
控制台
-
-
+
同步
-
-
+
刷新
-
+
-
-
-
-
-
-
- {{ getJobStatusLabel(job.status) }}
-
-
-
-
-
- {{ index + 1 }}
- {{ job.name }}
-
-
-
刷新
- 清空
- 关闭
+ 刷新
+ 清空
+ 关闭
-
+
-
- ({
status: "未知",
@@ -388,78 +373,136 @@ const schedulerStatus = ref({
job_count: 0,
});
-const searchConfig = reactive({
- permPrefix: "module_task:cronjob:job",
- colon: true,
- isExpandable: false,
- showNumber: 2,
- form: { labelWidth: "auto" },
- formItems: [
- {
- prop: "name",
- label: "任务名称",
- type: "input",
- attrs: { placeholder: "请输入任务名称", clearable: true, style: { width: "150px" } },
- },
- {
- prop: "status",
- label: "任务状态",
- type: "select",
+type JobSearchForm = {
+ name?: string;
+ status?: string;
+};
+
+function buildJobReplaceParams(u: JobSearchForm): Record {
+ return {
+ name: u.name,
+ status: u.status,
+ };
+}
+
+const searchForm = ref({
+ name: undefined,
+ status: undefined,
+});
+
+const showSearchBar = ref(true);
+const searchBarRef = ref | null>(null);
+const searchBarRules: Record = {};
+
+const jobSearchItems = computed(() => [
+ {
+ label: "任务名称",
+ key: "name",
+ type: "input",
+ placeholder: "请输入任务名称",
+ clearable: true,
+ span: 6,
+ },
+ {
+ label: "任务状态",
+ key: "status",
+ type: "select",
+ props: {
+ placeholder: "请选择状态",
+ clearable: true,
options: [
{ label: "运行中", value: "运行中" },
{ label: "暂停", value: "暂停" },
{ label: "停止", value: "停止" },
],
- attrs: { placeholder: "请选择状态", clearable: true, style: { width: "150px" } },
},
- ],
-});
+ span: 6,
+ },
+]);
-const contentConfig = reactive({
- permPrefix: "module_task:cronjob:job",
- cols: [],
- hideColumnFilter: true,
- showToolbar: false,
- pagination: false,
- indexAction: async (params) => {
- try {
- const statusRes = await JobAPI.getSchedulerStatus();
- schedulerStatus.value = statusRes.data.data;
- } catch (error: unknown) {
- console.error(error);
- }
- const response = await JobAPI.getSchedulerJobs();
- const raw = response.data?.data;
- let jobs = Array.isArray(raw) ? raw : [];
- const p = params as { name?: string; status?: string };
- const name = typeof p.name === "string" ? p.name.trim() : "";
- if (name) jobs = jobs.filter((job) => job.name.includes(name));
- if (p.status) jobs = jobs.filter((job) => job.status === p.status);
- // pagination 为 false 时 CrudContent 将整段返回值赋给 pageData，必须为列表数组
- return jobs;
+async function loadSchedulerStatus() {
+ try {
+ const statusRes = await JobAPI.getSchedulerStatus();
+ schedulerStatus.value = statusRes.data.data;
+ } catch (error: unknown) {
+ console.error(error);
+ }
+}
+
+const {
+ data: jobList,
+ loading: jobLoading,
+ columnChecks: jobColumnChecks,
+ getData: getJobList,
+ replaceSearchParams: replaceJobSearchParams,
+ resetSearchParams: resetJobSearchParams,
+ refreshData: refreshJobList,
+} = useTable({
+ core: {
+ apiFn: JobAPI.getSchedulerJobs,
+ apiParams: {
+ page_no: 1,
+ page_size: 10,
+ },
+ columnsFactory: (): ColumnOption[] => [
+ { type: "selection", width: 48, fixed: "left" },
+ { type: "globalIndex", width: 56, label: "序号" },
+ { prop: "id", label: "任务ID", minWidth: 80, showOverflowTooltip: true },
+ { prop: "name", label: "任务名称", minWidth: 140, showOverflowTooltip: true },
+ { prop: "trigger", label: "触发器", minWidth: 120, showOverflowTooltip: true },
+ { prop: "next_run_time", label: "下次执行时间", minWidth: 200, showOverflowTooltip: true },
+ { prop: "status", label: "状态", minWidth: 80, showOverflowTooltip: true },
+ ],
+ },
+ hooks: {
+ onSuccess: () => {
+ void loadSchedulerStatus();
+ },
},
});
-const consoleVisible = ref(false);
+async function handleJobSearchBarSearch(params: JobSearchForm) {
+ await searchBarRef.value?.validate?.();
+ replaceJobSearchParams(buildJobReplaceParams(params));
+ getJobList();
+}
-const executionLogDrawerVisible = ref(false);
-const currentLogJobId = ref(undefined);
-const logSearchRef = ref>();
-const logContentRef = ref>();
-const jobStateVisible = ref(false);
-const jobStateData = ref(null);
+async function onJobResetSearch() {
+ searchForm.value = {
+ name: undefined,
+ status: undefined,
+ };
+ await resetJobSearchParams();
+}
-const logSearchConfig = reactive({
- permPrefix: "module_task:cronjob:job",
- colon: true,
- isExpandable: false,
- showNumber: 2,
- form: { labelWidth: "auto" },
- formItems: [
- {
- prop: "status",
- label: "执行状态",
- type: "select",
+type LogSearchForm = {
+ status?: string;
+ trigger_type?: string;
+};
+
+function buildLogReplaceParams(u: LogSearchForm): Record {
+ return {
+ status: u.status,
+ trigger_type: u.trigger_type,
+ };
+}
+
+const logSearchForm = ref({
+ status: undefined,
+ trigger_type: undefined,
+});
+
+const logSearchBarRef = ref | null>(null);
+const logSearchBarRules: Record = {};
+
+const logSearchItems = computed(() => [
+ {
+ label: "执行状态",
+ key: "status",
+ type: "select",
+ props: {
+ placeholder: "请选择状态",
+ clearable: true,
options: [
{ label: "待执行", value: "pending" },
{ label: "执行中", value: "running" },
@@ -468,68 +511,225 @@ const logSearchConfig = reactive({
{ label: "超时", value: "timeout" },
{ label: "已取消", value: "cancelled" },
],
- attrs: { placeholder: "请选择状态", clearable: true, style: { width: "120px" } },
},
- {
- prop: "trigger_type",
- label: "触发方式",
- type: "select",
+ span: 8,
+ },
+ {
+ label: "触发方式",
+ key: "trigger_type",
+ type: "select",
+ props: {
+ placeholder: "请选择",
+ clearable: true,
options: [
{ label: "Cron表达式", value: "cron" },
{ label: "时间间隔", value: "interval" },
{ label: "固定日期", value: "date" },
{ label: "一次性任务", value: "manual" },
],
- attrs: { placeholder: "请选择", clearable: true, style: { width: "120px" } },
},
- ],
+ span: 8,
+ },
+]);
+
+const currentLogJobId = ref(undefined);
+const logArtTableRef = ref<{ elTableRef?: { clearSelection: () => void } } | null>(null);
+const logSelectedRows = ref([]);
+const logSelectedIds = computed(() =>
+ logSelectedRows.value.map((r) => r.id).filter((id): id is number => typeof id === "number")
+);
+const logBatchDeleting = ref(false);
+
+function onLogTableSelectionChange(rows: JobLogTable[]) {
+ logSelectedRows.value = rows;
+}
+
+const {
+ columns: logColumns,
+ columnChecks: logColumnChecks,
+ data: logTableData,
+ loading: logLoading,
+ pagination: logPagination,
+ getData: getLogData,
+ replaceSearchParams: replaceLogSearchParams,
+ resetSearchParams: resetLogSearchParams,
+ handleSizeChange: logHandleSizeChange,
+ handleCurrentChange: logHandleCurrentChange,
+ refreshData: refreshLogData,
+ refreshRemove: refreshLogRemove,
+} = useTable({
+ core: {
+ apiFn: JobAPI.getJobLogList,
+ immediate: false,
+ apiParams: {
+ page_no: 1,
+ page_size: 10,
+ job_id: "",
+ status: undefined,
+ trigger_type: undefined,
+ },
+ columnsFactory: (): ColumnOption[] => [
+ { type: "selection", width: 48, fixed: "left" },
+ { type: "globalIndex", width: 56, label: "序号" },
+ {
+ prop: "job_id",
+ label: "任务ID",
+ minWidth: 80,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "job_name",
+ label: "任务名称",
+ minWidth: 140,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "trigger_type",
+ label: "触发方式",
+ minWidth: 120,
+ formatter: (row) =>
+ h(ElTag, { size: "small" }, () => getTriggerTypeLabel(row.trigger_type)),
+ },
+ {
+ prop: "status",
+ label: "状态",
+ minWidth: 80,
+ formatter: (row) =>
+ h(ElTag, { type: getLogStatusType(row.status), size: "small" }, () =>
+ getLogStatusLabel(row.status)
+ ),
+ },
+ {
+ prop: "next_run_time",
+ label: "下次执行时间",
+ minWidth: 200,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "result",
+ label: "执行结果",
+ minWidth: 100,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "error",
+ label: "错误信息",
+ minWidth: 100,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "job_state",
+ label: "执行元数据",
+ minWidth: 100,
+ useSlot: true,
+ slotName: "log_job_state",
+ },
+ {
+ prop: "created_time",
+ label: "创建时间",
+ minWidth: 160,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "updated_time",
+ label: "更新时间",
+ minWidth: 160,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "operation",
+ label: "操作",
+ width: 88,
+ fixed: "right",
+ align: "center",
+ useSlot: true,
+ slotName: "log_operation",
+ },
+ ],
+ },
});
-const logContentConfig = reactive({
- permPrefix: "module_task:cronjob:job",
- cols: [],
- hideColumnFilter: true,
- toolbar: ["delete"],
- defaultToolbar: ["refresh"],
- pagination: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50],
- },
- request: { page_no: "page_no", page_size: "page_size" },
- indexAction: async (params) => {
- const jobId = currentLogJobId.value;
- if (!jobId) {
- return { total: 0, list: [] };
- }
- const p = params as JobLogPageQuery;
- const res = await JobAPI.getJobLogList({
- page_no: p.page_no ?? 1,
- page_size: p.page_size ?? 10,
- job_id: jobId,
- job_name: undefined,
- status: p.status,
- trigger_type: p.trigger_type,
- });
- const page = res.data.data;
- return {
- total: page?.total ?? 0,
- list: page?.items ?? [],
- };
- },
- deleteAction: (ids) =>
- JobAPI.deleteJobLog(
- ids
- .split(",")
- .map((s) => Number(s.trim()))
- .filter((n) => !Number.isNaN(n))
- ),
- deleteConfirm: {
- title: "警告",
- message: "确认删除选中的执行记录？",
+function deleteLogRow(id: number | undefined) {
+ if (id == null) return;
+ ElMessageBox.confirm("确认删除该执行记录？", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
type: "warning",
- },
+ })
+ .then(async () => {
+ await JobAPI.deleteJobLog([id]);
+ ElMessage.success("删除成功");
+ logArtTableRef.value?.elTableRef?.clearSelection();
+ await refreshLogRemove();
+ })
+ .catch(() => {});
+}
+
+function handleLogBatchDelete() {
+ const ids = logSelectedIds.value;
+ if (ids.length === 0) return;
+ ElMessageBox.confirm("确认删除选中的执行记录？", "批量删除", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(async () => {
+ try {
+ logBatchDeleting.value = true;
+ await JobAPI.deleteJobLog(ids);
+ ElMessage.success("删除成功");
+ logSelectedRows.value = [];
+ await refreshLogRemove();
+ } finally {
+ logBatchDeleting.value = false;
+ }
+ })
+ .catch(() => {});
+}
+
+const logPaginationBind = computed(() => {
+ const p = logPagination as unknown as {
+ current?: number;
+ size?: number;
+ total?: number;
+ page_no?: number;
+ page_size?: number;
+ };
+ return {
+ current: p.current ?? p.page_no ?? 1,
+ size: p.size ?? p.page_size ?? 10,
+ total: p.total ?? 0,
+ };
});
+async function handleLogSearchBarSearch(params: LogSearchForm) {
+ await logSearchBarRef.value?.validate?.();
+ if (!currentLogJobId.value) return;
+ replaceLogSearchParams({
+ ...buildLogReplaceParams(params),
+ job_id: currentLogJobId.value,
+ });
+ getLogData();
+}
+
+async function onLogResetSearch() {
+ logSearchForm.value = {
+ status: undefined,
+ trigger_type: undefined,
+ };
+ await resetLogSearchParams();
+ if (currentLogJobId.value) {
+ replaceLogSearchParams({ job_id: currentLogJobId.value });
+ getLogData();
+ }
+}
+
+const consoleVisible = ref(false);
+
+const executionLogDrawerVisible = ref(false);
+const jobStateVisible = ref(false);
+const jobStateData = ref(null);
+
function getSchedulerStatusType(status: string) {
switch (status) {
case "运行中":
@@ -623,7 +823,7 @@ function formatTrigger(trigger: string) {
async function handleSyncJobs() {
try {
await JobAPI.syncJobsToDb();
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
console.error(error);
}
@@ -632,7 +832,7 @@ async function handleSyncJobs() {
async function handleStartScheduler() {
try {
await JobAPI.startScheduler();
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
console.error(error);
}
@@ -641,7 +841,7 @@ async function handleStartScheduler() {
async function handlePauseScheduler() {
try {
await JobAPI.pauseScheduler();
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
console.error(error);
}
@@ -650,7 +850,7 @@ async function handlePauseScheduler() {
async function handleResumeScheduler() {
try {
await JobAPI.resumeScheduler();
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
console.error(error);
}
@@ -664,7 +864,7 @@ async function handleShutdownScheduler() {
type: "warning",
});
await JobAPI.shutdownScheduler();
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
if (error !== "cancel") {
console.error(error);
@@ -687,7 +887,7 @@ async function handleClearAllJobs() {
}
);
await JobAPI.clearAllJobs();
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
if (error !== "cancel") {
console.error(error);
@@ -725,7 +925,7 @@ function handleClearConsole() {
async function handlePauseJob(jobId: string) {
try {
await JobAPI.pauseJob(jobId);
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
console.error(error);
}
@@ -734,7 +934,7 @@ async function handlePauseJob(jobId: string) {
async function handleResumeJob(jobId: string) {
try {
await JobAPI.resumeJob(jobId);
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
console.error(error);
}
@@ -743,7 +943,7 @@ async function handleResumeJob(jobId: string) {
async function handleRunJobNow(jobId: string) {
try {
await JobAPI.runJobNow(jobId);
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
console.error(error);
}
@@ -758,7 +958,7 @@ async function handleRemoveJob(jobId: string) {
.then(async () => {
try {
await JobAPI.removeJob(jobId);
- await refreshMain();
+ await refreshJobList();
} catch (error: any) {
console.error(error);
}
@@ -768,23 +968,20 @@ async function handleRemoveJob(jobId: string) {
});
}
-async function handleOpenExecutionLogDrawer(job: IObject) {
- currentLogJobId.value = (job as SchedulerJob).id;
+async function handleOpenExecutionLogDrawer(job: SchedulerJob) {
+ currentLogJobId.value = job.id;
+ logSearchForm.value = {
+ status: undefined,
+ trigger_type: undefined,
+ };
executionLogDrawerVisible.value = true;
await nextTick();
- logContentRef.value?.fetchPageData(logSearchRef.value?.getQueryParams() ?? {}, true);
-}
-
-function handleLogQueryClick() {
- logContentRef.value?.fetchPageData(logSearchRef.value!.getQueryParams(), true);
-}
-
-function handleLogResetClick() {
- logContentRef.value?.fetchPageData(logSearchRef.value!.getQueryParams(), true);
-}
-
-function handleLogRowDelete(id: number) {
- logContentRef.value?.handleDelete(id);
+ replaceLogSearchParams({
+ job_id: job.id,
+ page_no: 1,
+ page_size: 10,
+ });
+ getLogData();
}
function getTriggerTypeLabel(type: string | undefined) {
@@ -821,8 +1018,8 @@ function getLogStatusLabel(status: string) {
return map[status] || status;
}
-function handleViewJobState(row: JobLogTable | IObject) {
- const jobState = (row as JobLogTable).job_state;
+function handleViewJobState(row: JobLogTable) {
+ const jobState = row.job_state;
if (jobState) {
try {
jobStateData.value = JSON.parse(jobState);
@@ -939,15 +1136,16 @@ function handleViewJobState(row: JobLogTable | IObject) {
}
.execution-log-drawer {
- display: flex;
- flex-direction: column;
height: 100%;
+}
+
+.log-table-card {
+ flex: 1;
min-height: 0;
}
.execution-log-drawer :deep(.el-card.data-table) {
flex: 1;
min-height: 0;
- margin-top: 16px;
}
diff --git a/frontend/new-web/src/views/module_task/cronjob/node/index.vue b/frontend/new-web/src/views/module_task/cronjob/node/index.vue
index e9ef4ae4..bd75f52b 100644
--- a/frontend/new-web/src/views/module_task/cronjob/node/index.vue
+++ b/frontend/new-web/src/views/module_task/cronjob/node/index.vue
@@ -1,95 +1,65 @@
+
-
- 任务ID:
- {{ job.id }}
-
-
- 触发器:
-
-
-
-
-
-
-
- {{ formatTrigger(job.trigger) }}
-
-
-
- 下次执行:
- {{ job.next_run_time || "无" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+ {{ getJobStatusLabel(job.status) }}
+
+
-
-
-
-
-
-
-
+ {{ index + 1 }}
+ {{ job.name }}
+
+
-
+ 任务ID:
+ {{ job.id }}
+
+
+ 触发器:
+
+
+
+
+
+
+
+ {{ formatTrigger(job.trigger) }}
+
+
+
+ 下次执行:
+ {{ job.next_run_time || "无" }}
+
+
-
+
+
关闭
+ 关闭
-
+
@@ -363,24 +351,21 @@ defineOptions({
inheritAttrs: false,
});
-import JobAPI, {
- SchedulerStatus,
- SchedulerJob,
- JobLogPageQuery,
- JobLogTable,
-} from "@/api/module_task/cronjob/job";
-import CrudSearch from "@/components/CURD/CrudSearch.vue";
-import CrudContent from "@/components/CURD/CrudContent.vue";
-import EnhancedDialog from "@/components/Core/overlays/EnhancedDialog.vue";
-import EnhancedDrawer from "@/components/Core/overlays/EnhancedDrawer.vue";
-import type { ISearchConfig, IContentConfig, IObject } from "@/components/Crud/types";
-import { ref, reactive, nextTick } from "vue";
-import { Terminal, TerminalApi } from "vue-web-terminal";
+import JobAPI, { SchedulerStatus, SchedulerJob, JobLogTable } from "@/api/module_task/cronjob/job";
+import ArtDialog from "@/components/Core/modal/art-dialog/index.vue";
+import ArtDrawer from "@/components/Core/modal/art-drawer/index.vue";
+import ArtSearchBar from "@/components/Core/forms/art-search-bar/index.vue";
+import type { SearchFormItem } from "@/components/Core/forms/art-search-bar/index.vue";
+import ArtTable from "@/components/Core/tables/art-table/index.vue";
+import ArtTableHeader from "@/components/Core/tables/art-table-header/index.vue";
+import ArtTableHeaderLeft from "@/components/Core/tables/art-table-header-left/index.vue";
import JsonPretty from "@/components/JsonPretty/index.vue";
-import { useCrudList } from "@/components/Crud/useCrudList";
-
-const { searchRef, contentRef, handleQueryClick, handleResetClick, refreshList } = useCrudList();
-const refreshMain = refreshList;
+import { useTable } from "@/hooks/core/useTable";
+import type { ColumnOption } from "@/types/component";
+import { Calendar, Clock, Timer } from "@element-plus/icons-vue";
+import { ElMessage, ElMessageBox, ElTag } from "element-plus";
+import { computed, h, nextTick, ref } from "vue";
+import { Terminal, TerminalApi } from "vue-web-terminal";
const schedulerStatus = ref
+
-
-
+ 查看
+
+ -
+
+
+
+ 删除
+
+
+
+
-
+
-
-
+
+
+
+
+
+
-
-
-
- {{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}
-
-
-
-
- {{ getTriggerTypeLabel(scope.row.trigger_type) }}
-
-
-
-
-
- {{ getLogStatusLabel(scope.row.status) }}
-
-
-
-
-
-
- 查看
-
- -
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
+
-
-
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
添加位置参数
-
+
-
-
+
+
添加关键词参数
-
+
-
-
-
- 是
- 否
-
-
-
-
+
+
+ 是
+ 否
+
+
+
+
-
-
-
+
+
+
+
-
+
-
-
-
-
-
- 立即执行
- Cron表达式
- 时间间隔
- 固定日期
-
-
+
+
+
+
+ 立即执行
+ Cron表达式
+ 时间间隔
+ 固定日期
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
+
-
-
+
-
-
+
+
+
-
+
- 取消
-
- 确认
-
+ 取消
+ 确认
-
+
@@ -341,23 +309,22 @@ defineOptions({
inheritAttrs: false,
});
-import NodeAPI, {
- NodeTable,
- NodeForm,
- NodePageQuery,
- TriggerType,
-} from "@/api/module_task/cronjob/node";
+import NodeAPI, { NodeTable, NodeForm, TriggerType } from "@/api/module_task/cronjob/node";
import { useDictStore } from "@/store/index";
-import CrudSearch from "@/components/CURD/CrudSearch.vue";
-import CrudContent from "@/components/CURD/CrudContent.vue";
-import EnhancedDialog from "@/components/Core/overlays/EnhancedDialog.vue";
-import type { IContentConfig, ISearchConfig } from "@/components/Crud/types";
-import { useCrudList } from "@/components/Crud/useCrudList";
-import { nextTick, onMounted, reactive, ref } from "vue";
-import { ElMessage } from "element-plus";
+import ArtDialog from "@/components/Core/modal/art-dialog/index.vue";
+import ArtTable from "@/components/Core/tables/art-table/index.vue";
+import ArtTableHeader from "@/components/Core/tables/art-table-header/index.vue";
+import ArtTableHeaderLeft from "@/components/Core/tables/art-table-header-left/index.vue";
+import ArtSearchBar from "@/components/Core/forms/art-search-bar/index.vue";
+import type { SearchFormItem } from "@/components/Core/forms/art-search-bar/index.vue";
+import ArtButtonMore from "@/components/Core/forms/art-button-more/index.vue";
+import type { ButtonMoreItem } from "@/components/Core/forms/art-button-more/index.vue";
+import type { ColumnOption } from "@/types/component";
+import { useTable } from "@/hooks/core/useTable";
+import { h, computed, nextTick, onMounted, reactive, ref } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
import { vue3CronPlus } from "vue3-cron-plus";
import "vue3-cron-plus/dist/index.css";
-import OperationColumn from "@/components/OperationColumn/index.vue";
import IntervalTab from "@/components/IntervalTab/index.vue";
import Codemirror, { CmComponentRef } from "codemirror-editor-vue3";
import type { EditorConfiguration } from "codemirror";
@@ -366,6 +333,235 @@ import "codemirror/theme/dracula.css";
const dictStore = useDictStore();
+const BATCH_DELETE_NODE_MSG =
+ "确认删除选中的节点吗？\n" +
+ "此操作将同时删除节点定义并移除调度器中的相关任务。\n" +
+ "正在运行的任务会被立即移除，待执行任务的日志将被标记为已取消。";
+
+type NodeSearchForm = {
+ name?: string;
+ code?: string;
+};
+
+function buildNodeReplaceParams(u: NodeSearchForm): Record {
+ return {
+ name: u.name,
+ code: u.code,
+ };
+}
+
+const searchForm = ref({
+ name: undefined,
+ code: undefined,
+});
+
+const showSearchBar = ref(true);
+const searchBarRef = ref | null>(null);
+const searchBarRules: Record = {};
+
+const nodeSearchItems = computed(() => [
+ {
+ label: "节点名称",
+ key: "name",
+ type: "input",
+ placeholder: "请输入节点名称",
+ clearable: true,
+ span: 6,
+ },
+ {
+ label: "节点编码",
+ key: "code",
+ type: "input",
+ placeholder: "请输入节点编码",
+ clearable: true,
+ span: 6,
+ },
+]);
+
+const artTableRef = ref<{ elTableRef?: { clearSelection: () => void } } | null>(null);
+const selectedRows = ref([]);
+const selectedIds = computed(() =>
+ selectedRows.value.map((r) => r.id).filter((id): id is number => typeof id === "number")
+);
+const batchDeleting = ref(false);
+
+function onTableSelectionChange(rows: NodeTable[]) {
+ selectedRows.value = rows;
+}
+
+function buttonMoreClick(item: ButtonMoreItem, row: NodeTable) {
+ switch (item.key) {
+ case "execute":
+ handleOpenExecuteDialog(row);
+ break;
+ case "edit":
+ if (row.id != null) void handleOpenDialog("update", row.id);
+ break;
+ case "delete":
+ void deleteNodeRow(row.id);
+ break;
+ }
+}
+
+function deleteNodeRow(id: number | undefined) {
+ if (id == null) return;
+ ElMessageBox.confirm("确认删除该节点吗？将从调度器移除相关任务。", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(async () => {
+ await NodeAPI.deleteNode([id]);
+ ElMessage.success("删除成功");
+ artTableRef.value?.elTableRef?.clearSelection();
+ await refreshRemove();
+ })
+ .catch(() => {});
+}
+
+function handleBatchDelete() {
+ const ids = selectedIds.value;
+ if (ids.length === 0) return;
+ ElMessageBox.confirm(BATCH_DELETE_NODE_MSG, "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(async () => {
+ try {
+ batchDeleting.value = true;
+ await NodeAPI.deleteNode(ids);
+ ElMessage.success("删除成功");
+ selectedRows.value = [];
+ await refreshRemove();
+ } finally {
+ batchDeleting.value = false;
+ }
+ })
+ .catch(() => {});
+}
+
+const {
+ columns,
+ columnChecks,
+ data,
+ loading,
+ pagination,
+ getData,
+ replaceSearchParams,
+ resetSearchParams,
+ handleSizeChange,
+ handleCurrentChange,
+ refreshData,
+ refreshCreate,
+ refreshUpdate,
+ refreshRemove,
+} = useTable({
+ core: {
+ apiFn: NodeAPI.listNode,
+ apiParams: {
+ page_no: 1,
+ page_size: 10,
+ },
+ columnsFactory: (): ColumnOption[] => [
+ { type: "selection", width: 48, fixed: "left" },
+ { type: "globalIndex", width: 56, label: "序号" },
+ {
+ prop: "name",
+ label: "节点名称",
+ minWidth: 140,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "code",
+ label: "节点编码",
+ minWidth: 120,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "jobstore",
+ label: "存储器",
+ minWidth: 80,
+ },
+ {
+ prop: "executor",
+ label: "执行器",
+ minWidth: 80,
+ },
+ {
+ prop: "created_time",
+ label: "创建时间",
+ minWidth: 180,
+ sortable: true,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "operation",
+ label: "操作",
+ width: 88,
+ fixed: "right",
+ align: "center",
+ formatter: (row: NodeTable) =>
+ h("div", [
+ h(ArtButtonMore, {
+ list: [
+ {
+ key: "execute",
+ label: "调试",
+ icon: "ri:play-circle-line",
+ auth: "module_task:cronjob:node:execute",
+ },
+ {
+ key: "edit",
+ label: "编辑",
+ icon: "ri:edit-2-line",
+ auth: "module_task:cronjob:node:update",
+ },
+ {
+ key: "delete",
+ label: "删除",
+ icon: "ri:delete-bin-4-line",
+ color: "#f56c6c",
+ auth: "module_task:cronjob:node:delete",
+ },
+ ],
+ onClick: (item: ButtonMoreItem) => buttonMoreClick(item, row),
+ }),
+ ]),
+ },
+ ],
+ },
+});
+
+const paginationBind = computed(() => {
+ const p = pagination as unknown as {
+ current?: number;
+ size?: number;
+ total?: number;
+ page_no?: number;
+ page_size?: number;
+ };
+ return {
+ current: p.current ?? p.page_no ?? 1,
+ size: p.size ?? p.page_size ?? 10,
+ total: p.total ?? 0,
+ };
+});
+
+async function handleSearchBarSearch(params: NodeSearchForm) {
+ await searchBarRef.value?.validate?.();
+ replaceSearchParams(buildNodeReplaceParams(params));
+ getData();
+}
+
+async function onResetSearch() {
+ searchForm.value = {
+ name: undefined,
+ code: undefined,
+ };
+ await resetSearchParams();
+}
+
const codeEditorOptions: EditorConfiguration = {
mode: "python",
lineNumbers: true,
@@ -377,7 +573,6 @@ const codeEditorOptions: EditorConfiguration = {
autofocus: false,
};
-const { searchRef, contentRef, handleQueryClick, handleResetClick, refreshList } = useCrudList();
const dataFormRef = ref();
const executeFormRef = ref();
const submitLoading = ref(false);
@@ -385,63 +580,6 @@ const openCron = ref(false);
const openInterval = ref(false);
const codeEditorRef = ref();
-const searchConfig = reactive({
- permPrefix: "module_task:cronjob:node",
- colon: true,
- isExpandable: false,
- showNumber: 2,
- form: { labelWidth: "auto" },
- formItems: [
- {
- prop: "name",
- label: "节点名称",
- type: "input",
- attrs: { placeholder: "请输入节点名称", clearable: true },
- },
- {
- prop: "code",
- label: "节点编码",
- type: "input",
- attrs: { placeholder: "请输入节点编码", clearable: true },
- },
- ],
-});
-
-const contentConfig = reactive>({
- permPrefix: "module_task:cronjob:node",
- cols: [],
- hideColumnFilter: true,
- toolbar: ["add", "delete"],
- defaultToolbar: ["refresh", "filter"],
- pagination: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50],
- },
- request: { page_no: "page_no", page_size: "page_size" },
- indexAction: async (params) => {
- const res = await NodeAPI.listNode(params as NodePageQuery);
- return {
- total: res.data.data.total,
- list: res.data.data.items,
- };
- },
- deleteAction: (ids) =>
- NodeAPI.deleteNode(
- ids
- .split(",")
- .map((s) => Number(s.trim()))
- .filter((n) => !Number.isNaN(n) && n > 0)
- ),
- deleteConfirm: {
- title: "警告",
- message:
- "确认删除选中的节点吗？\n" +
- "此操作将同时删除节点定义并移除调度器中的相关任务。\n" +
- "正在运行的任务会被立即移除，待执行任务的日志将被标记为已取消。",
- type: "warning",
- },
-});
-
const defaultCodeBlock = `def handler(*args, **kwargs):
"""
Demo: 调用工程中的方法处理数据
@@ -540,10 +678,6 @@ const executeRules = reactive({
trigger_args: [{ required: true, message: "请设置执行参数", trigger: "blur" }],
});
-function handleRowDelete(id: number) {
- contentRef.value?.handleDelete(id);
-}
-
const initialFormData: Partial = {
id: undefined,
name: "",
@@ -630,7 +764,11 @@ async function handleSubmit() {
}
dialogVisible.visible = false;
resetForm();
- refreshList();
+ if (id) {
+ await refreshUpdate();
+ } else {
+ await refreshCreate();
+ }
} catch (error: any) {
console.log(error);
} finally {
@@ -690,7 +828,7 @@ async function handleExecuteNode() {
handleCloseExecuteDialog();
- refreshList();
+ await refreshUpdate();
} catch (error: any) {
ElMessage.error({
message: error.response?.data?.msg || "调试失败",
@@ -705,7 +843,6 @@ async function handleExecuteNode() {
onMounted(async () => {
await dictStore.getDict(["sys_job_store", "sys_job_executor"]);
- refreshList();
});
diff --git a/frontend/new-web/src/views/module_task/workflow/components/WorkflowDesignDrawer.vue b/frontend/new-web/src/views/module_task/workflow/components/WorkflowDesignDrawer.vue
index b71bb7e1..56088c8b 100644
--- a/frontend/new-web/src/views/module_task/workflow/components/WorkflowDesignDrawer.vue
+++ b/frontend/new-web/src/views/module_task/workflow/components/WorkflowDesignDrawer.vue
@@ -1,5 +1,5 @@
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
+
+
-
-
-
-
+
+
[{{ getCategoryText(item.category) }}]
-
-
+
+
-
-
+
+
-
+
-
-
+
-
+
平滑曲线
-
-
+
阶梯折线
-
-
+
直线
-
-
+
+
-
-
+
-
-
+
+
+
-
-
+
横向布局
-
-
+
纵向布局
-
-
+
+
-
+
+
-
+
-
-
+
+
+
-
+
diff --git a/frontend/new-web/src/views/module_task/workflow/node-type/index.vue b/frontend/new-web/src/views/module_task/workflow/node-type/index.vue
index de9997be..b0db903b 100644
--- a/frontend/new-web/src/views/module_task/workflow/node-type/index.vue
+++ b/frontend/new-web/src/views/module_task/workflow/node-type/index.vue
@@ -1,135 +1,132 @@
+
- (null);
-const submitting = ref(false);
-const formRef = ref();
+type NodeTypeSearchForm = {
+ name?: string;
+ code?: string;
+ category?: string;
+};
-const searchConfig = reactive({
- permPrefix: "module_task:workflow:node-type",
- colon: true,
- isExpandable: true,
- showNumber: 2,
- form: { labelWidth: "auto" },
- formItems: [
- {
- prop: "name",
- label: "名称",
- type: "input",
- attrs: { placeholder: "名称", clearable: true },
- },
- {
- prop: "code",
- label: "编码",
- type: "input",
- attrs: { placeholder: "编码", clearable: true },
- },
- {
- prop: "category",
- label: "分类",
- type: "select",
+function buildNodeTypeReplaceParams(u: NodeTypeSearchForm): Record {
+ return {
+ name: u.name,
+ code: u.code,
+ category: u.category,
+ };
+}
+
+const searchForm = ref({
+ name: undefined,
+ code: undefined,
+ category: undefined,
+});
+
+const showSearchBar = ref(true);
+const searchBarRef = ref | null>(null);
+const searchBarRules: Record = {};
+
+const nodeTypeSearchItems = computed(() => [
+ {
+ label: "名称",
+ key: "name",
+ type: "input",
+ placeholder: "名称",
+ clearable: true,
+ span: 6,
+ },
+ {
+ label: "编码",
+ key: "code",
+ type: "input",
+ placeholder: "编码",
+ clearable: true,
+ span: 6,
+ },
+ {
+ label: "分类",
+ key: "category",
+ type: "select",
+ props: {
+ placeholder: "全部",
+ clearable: true,
options: [
{ label: "触发器", value: "trigger" },
{ label: "动作", value: "action" },
{ label: "条件", value: "condition" },
{ label: "控制", value: "control" },
],
- attrs: { placeholder: "全部", clearable: true, style: { width: "170px" } },
},
- ],
-});
-
-function normalizeNodeTypeQuery(params: Record): WorkflowNodeTypePageQuery {
- const p = { ...params } as Record;
- if (p.category === "" || p.category === null) p.category = undefined;
- return p as unknown as WorkflowNodeTypePageQuery;
-}
-
-const contentConfig = reactive>({
- permPrefix: "module_task:workflow:node-type",
- cols: [],
- hideColumnFilter: true,
- toolbar: [
- { name: "add", text: "新增", attrs: { icon: "plus", type: "success" }, perm: "create" },
- "delete",
- ],
- defaultToolbar: ["refresh"],
- initialFetch: false,
- pagination: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50],
+ span: 6,
},
- request: { page_no: "page_no", page_size: "page_size" },
- indexAction: async (params) => {
- const res = await WorkflowNodeTypeAPI.getWorkflowNodeTypeList(
- normalizeNodeTypeQuery(params as unknown as Record)
- );
- return {
- total: res.data.data.total,
- list: res.data.data.items,
- };
- },
- deleteAction: (ids) =>
- WorkflowNodeTypeAPI.deleteWorkflowNodeType(
- ids
- .split(",")
- .map((s) => Number(s.trim()))
- .filter((n) => !Number.isNaN(n) && n > 0)
- ),
- deleteConfirm: {
- title: "警告",
- message: "确认删除选中的编排节点类型吗？",
- type: "warning",
- },
-});
+]);
-function handleRowDelete(id?: number) {
- if (id == null) return;
- contentRef.value?.handleDelete(id);
+const artTableRef = ref<{ elTableRef?: { clearSelection: () => void } } | null>(null);
+const selectedRows = ref([]);
+const selectedIds = computed(() =>
+ selectedRows.value.map((r) => r.id).filter((id): id is number => typeof id === "number")
+);
+const batchDeleting = ref(false);
+
+function onTableSelectionChange(rows: WorkflowNodeTypeTable[]) {
+ selectedRows.value = rows;
}
function categoryLabel(c?: string) {
@@ -254,6 +234,164 @@ function categoryLabel(c?: string) {
return c ? m[c] || c : "-";
}
+function deleteNodeTypeRow(id: number | undefined) {
+ if (id == null) return;
+ ElMessageBox.confirm("确认删除该节点类型吗？", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(async () => {
+ await WorkflowNodeTypeAPI.deleteWorkflowNodeType([id]);
+ ElMessage.success("删除成功");
+ artTableRef.value?.elTableRef?.clearSelection();
+ await refreshRemove();
+ })
+ .catch(() => {});
+}
+
+function handleBatchDelete() {
+ const ids = selectedIds.value;
+ if (ids.length === 0) return;
+ ElMessageBox.confirm(BATCH_DELETE_MSG, "批量删除", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(async () => {
+ try {
+ batchDeleting.value = true;
+ await WorkflowNodeTypeAPI.deleteWorkflowNodeType(ids);
+ ElMessage.success("删除成功");
+ selectedRows.value = [];
+ await refreshRemove();
+ } finally {
+ batchDeleting.value = false;
+ }
+ })
+ .catch(() => {});
+}
+
+const {
+ columns,
+ columnChecks,
+ data,
+ loading,
+ pagination,
+ getData,
+ replaceSearchParams,
+ resetSearchParams,
+ handleSizeChange,
+ handleCurrentChange,
+ refreshData,
+ refreshRemove,
+ refreshCreate,
+ refreshUpdate,
+} = useTable({
+ core: {
+ apiFn: WorkflowNodeTypeAPI.getWorkflowNodeTypeList,
+ apiParams: {
+ page_no: 1,
+ page_size: 10,
+ },
+ columnsFactory: (): ColumnOption[] => [
+ { type: "selection", width: 48, fixed: "left" },
+ { type: "globalIndex", width: 56, label: "序号" },
+ {
+ prop: "id",
+ label: "ID",
+ width: 88,
+ align: "center",
+ },
+ {
+ prop: "name",
+ label: "名称",
+ minWidth: 140,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "code",
+ label: "编码",
+ minWidth: 120,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "category",
+ label: "分类",
+ minWidth: 100,
+ formatter: (row) => categoryLabel(row.category),
+ },
+ {
+ prop: "sort_order",
+ label: "排序",
+ width: 88,
+ align: "center",
+ },
+ {
+ prop: "is_active",
+ label: "启用",
+ width: 88,
+ align: "center",
+ formatter: (row) =>
+ h(ElTag, { type: row.is_active ? "success" : "info" }, () =>
+ row.is_active ? "是" : "否"
+ ),
+ },
+ {
+ prop: "created_time",
+ label: "创建时间",
+ minWidth: 170,
+ showOverflowTooltip: true,
+ },
+ {
+ prop: "operation",
+ label: "操作",
+ width: 140,
+ fixed: "right",
+ align: "center",
+ useSlot: true,
+ slotName: "node-type-operation",
+ },
+ ],
+ },
+});
+
+const paginationBind = computed(() => {
+ const p = pagination as unknown as {
+ current?: number;
+ size?: number;
+ total?: number;
+ page_no?: number;
+ page_size?: number;
+ };
+ return {
+ current: p.current ?? p.page_no ?? 1,
+ size: p.size ?? p.page_size ?? 10,
+ total: p.total ?? 0,
+ };
+});
+
+async function handleSearchBarSearch(params: NodeTypeSearchForm) {
+ await searchBarRef.value?.validate?.();
+ replaceSearchParams(buildNodeTypeReplaceParams(params));
+ getData();
+}
+
+async function onResetSearch() {
+ searchForm.value = {
+ name: undefined,
+ code: undefined,
+ category: undefined,
+ };
+ await resetSearchParams();
+}
+
+const dialogVisible = ref(false);
+const dialogTitle = ref("新增节点类型");
+const editingId = ref(null);
+const submitting = ref(false);
+const formRef = ref();
+
const defaultForm = (): WorkflowNodeTypeForm => ({
name: "",
code: "",
@@ -326,22 +464,20 @@ async function submitForm() {
if (editingId.value) {
await WorkflowNodeTypeAPI.updateWorkflowNodeType(editingId.value, form);
ElMessage.success("更新成功");
+ dialogVisible.value = false;
+ await refreshUpdate();
} else {
await WorkflowNodeTypeAPI.createWorkflowNodeType(form);
ElMessage.success("创建成功");
+ dialogVisible.value = false;
+ await refreshCreate();
}
- dialogVisible.value = false;
- refreshList();
} catch {
ElMessage.error(editingId.value ? "更新失败" : "创建失败");
} finally {
submitting.value = false;
}
}
-
-onMounted(() => {
- refreshList();
-});
diff --git a/frontend/new-web/src/views/safeguard/server/index.vue b/frontend/new-web/src/views/safeguard/server/index.vue
deleted file mode 100755
index 2f857795..00000000
--- a/frontend/new-web/src/views/safeguard/server/index.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
-
-
-
-
-
- {{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}
-
-
-
+
+
+
-
-
-
-
- 调试
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
处理器
@@ -193,48 +163,48 @@
width="100%"
/>
-
-
+
+
-
+
- 基础信息
- 节点
-
-
+
-
-
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
- 取消
- 保存
+ 取消
+ 保存
-
+
@@ -139,109 +136,92 @@ defineOptions({
inheritAttrs: false,
});
-import { onMounted, reactive, ref } from "vue";
-import { ElMessage, type FormInstance, type FormRules } from "element-plus";
-import CrudSearch from "@/components/CURD/CrudSearch.vue";
-import CrudContent from "@/components/CURD/CrudContent.vue";
-import EnhancedDialog from "@/components/Core/overlays/EnhancedDialog.vue";
-import type { IContentConfig, ISearchConfig } from "@/components/Crud/types";
-import { useCrudList } from "@/components/Crud/useCrudList";
-import OperationColumn from "@/components/OperationColumn/index.vue";
import WorkflowNodeTypeAPI, {
type WorkflowNodeTypeForm,
- type WorkflowNodeTypePageQuery,
type WorkflowNodeTypeTable,
} from "@/api/module_task/workflow/node-type";
+import ArtSearchBar from "@/components/Core/forms/art-search-bar/index.vue";
+import type { SearchFormItem } from "@/components/Core/forms/art-search-bar/index.vue";
+import ArtTable from "@/components/Core/tables/art-table/index.vue";
+import ArtTableHeader from "@/components/Core/tables/art-table-header/index.vue";
+import ArtTableHeaderLeft from "@/components/Core/tables/art-table-header-left/index.vue";
+import ArtDialog from "@/components/Core/modal/art-dialog/index.vue";
+import { useTable } from "@/hooks/core/useTable";
+import type { ColumnOption } from "@/types/component";
+import { ElMessage, ElMessageBox, ElTag } from "element-plus";
+import type { FormInstance, FormRules } from "element-plus";
+import { computed, h, reactive, ref } from "vue";
-const { searchRef, contentRef, handleQueryClick, handleResetClick, refreshList } = useCrudList();
+const BATCH_DELETE_MSG = "确认删除选中的编排节点类型吗？";
-const dialogVisible = ref(false);
-const dialogTitle = ref("新增节点类型");
-const editingId = ref
-
-
-
-
- {{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}
-
-
-
-
- {{ categoryLabel(scope.row.category) }}
-
-
-
-
-
- {{ scope.row.is_active ? "是" : "否" }}
-
-
-
-
+
+
+
-
-
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/new-web/src/views/system/nested/menu1/index.vue b/frontend/new-web/src/views/system/nested/menu1/index.vue
deleted file mode 100644
index 9eb2baba..00000000
--- a/frontend/new-web/src/views/system/nested/menu1/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.ip }}
-
-
-
-
- 
-
-
-
-
- 开机
- 关机
- 重启
-
-
-
-
-
-
- CPU
-
-
- RAM
-
-
- SWAP
-
-
- DISK
-
-
-
diff --git a/frontend/new-web/src/views/system/nested/menu2/index.vue b/frontend/new-web/src/views/system/nested/menu2/index.vue
deleted file mode 100644
index 8da183fe..00000000
--- a/frontend/new-web/src/views/system/nested/menu2/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
- 菜单-1
-
-
-
diff --git a/frontend/new-web/src/views/system/nested/menu3/index.vue b/frontend/new-web/src/views/system/nested/menu3/index.vue
deleted file mode 100644
index fc7d4965..00000000
--- a/frontend/new-web/src/views/system/nested/menu3/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
- 菜单-2-1
-
-
-
diff --git a/frontend/new-web/src/views/system/nested/menu3/menu3-2/index.vue b/frontend/new-web/src/views/system/nested/menu3/menu3-2/index.vue
deleted file mode 100644
index 7387a030..00000000
--- a/frontend/new-web/src/views/system/nested/menu3/menu3-2/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
- 菜单-3-1
-
-
-
diff --git a/frontend/new-web/src/views/system/user-center/index.vue b/frontend/new-web/src/views/system/user-center/index.vue
deleted file mode 100755
index db68d9b5..00000000
--- a/frontend/new-web/src/views/system/user-center/index.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-
-
- 菜单-3-2-1
-
-
-
-
-
diff --git a/frontend/new-web/src/views/article/comment/index.vue b/frontend/new-web/src/views/widgets/article/comment/index.vue
similarity index 100%
rename from frontend/new-web/src/views/article/comment/index.vue
rename to frontend/new-web/src/views/widgets/article/comment/index.vue
diff --git a/frontend/new-web/src/views/article/detail/index.vue b/frontend/new-web/src/views/widgets/article/detail/index.vue
similarity index 100%
rename from frontend/new-web/src/views/article/detail/index.vue
rename to frontend/new-web/src/views/widgets/article/detail/index.vue
diff --git a/frontend/new-web/src/views/article/list/index.vue b/frontend/new-web/src/views/widgets/article/list/index.vue
similarity index 100%
rename from frontend/new-web/src/views/article/list/index.vue
rename to frontend/new-web/src/views/widgets/article/list/index.vue
diff --git a/frontend/new-web/src/views/article/publish/index.vue b/frontend/new-web/src/views/widgets/article/publish/index.vue
similarity index 100%
rename from frontend/new-web/src/views/article/publish/index.vue
rename to frontend/new-web/src/views/widgets/article/publish/index.vue
diff --git a/frontend/new-web/src/views/template/banners/index.vue b/frontend/new-web/src/views/widgets/banners/index.vue
similarity index 100%
rename from frontend/new-web/src/views/template/banners/index.vue
rename to frontend/new-web/src/views/widgets/banners/index.vue
diff --git a/frontend/new-web/src/views/template/cards/index.vue b/frontend/new-web/src/views/widgets/cards/index.vue
similarity index 100%
rename from frontend/new-web/src/views/template/cards/index.vue
rename to frontend/new-web/src/views/widgets/cards/index.vue
diff --git a/frontend/new-web/src/views/change/log/index.vue b/frontend/new-web/src/views/widgets/change/log/index.vue
similarity index 100%
rename from frontend/new-web/src/views/change/log/index.vue
rename to frontend/new-web/src/views/widgets/change/log/index.vue
diff --git a/frontend/new-web/src/views/template/charts/index.vue b/frontend/new-web/src/views/widgets/charts/index.vue
similarity index 100%
rename from frontend/new-web/src/views/template/charts/index.vue
rename to frontend/new-web/src/views/widgets/charts/index.vue
diff --git a/frontend/new-web/src/views/examples/forms/index.vue b/frontend/new-web/src/views/widgets/examples/forms/index.vue
similarity index 100%
rename from frontend/new-web/src/views/examples/forms/index.vue
rename to frontend/new-web/src/views/widgets/examples/forms/index.vue
diff --git a/frontend/new-web/src/views/examples/forms/search-bar.vue b/frontend/new-web/src/views/widgets/examples/forms/search-bar.vue
similarity index 100%
rename from frontend/new-web/src/views/examples/forms/search-bar.vue
rename to frontend/new-web/src/views/widgets/examples/forms/search-bar.vue
diff --git a/frontend/new-web/src/views/examples/permission/button-auth/index.vue b/frontend/new-web/src/views/widgets/examples/permission/button-auth/index.vue
similarity index 100%
rename from frontend/new-web/src/views/examples/permission/button-auth/index.vue
rename to frontend/new-web/src/views/widgets/examples/permission/button-auth/index.vue
diff --git a/frontend/new-web/src/views/examples/permission/page-visibility/index.vue b/frontend/new-web/src/views/widgets/examples/permission/page-visibility/index.vue
similarity index 99%
rename from frontend/new-web/src/views/examples/permission/page-visibility/index.vue
rename to frontend/new-web/src/views/widgets/examples/permission/page-visibility/index.vue
index ad31ec80..6fd3f793 100644
--- a/frontend/new-web/src/views/examples/permission/page-visibility/index.vue
+++ b/frontend/new-web/src/views/widgets/examples/permission/page-visibility/index.vue
@@ -63,7 +63,7 @@
>
-
-
-
-
- 
- 
-
-
-
- {{ userInfo.userName }}
-专注于用户体验跟视觉设计
- -
-
-
-
-
-
-
-
-
-
-
-
-
- 标签
-
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 基本设置
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
- 更改密码
- -{
path: 'page-visibility',
name: 'PermissionPageVisibility',
- component: '/examples/permission/page-visibility',
+ component: "/widgets/examples/permission/page-visibility",
meta: {
title: 'menus.permission.pageVisibility',
roles: ['R_SUPER'], // 仅超级管理员可访问
diff --git a/frontend/new-web/src/views/examples/permission/switch-role/index.vue b/frontend/new-web/src/views/widgets/examples/permission/switch-role/index.vue
similarity index 100%
rename from frontend/new-web/src/views/examples/permission/switch-role/index.vue
rename to frontend/new-web/src/views/widgets/examples/permission/switch-role/index.vue
diff --git a/frontend/new-web/src/views/examples/socket-chat/index.vue b/frontend/new-web/src/views/widgets/examples/socket-chat/index.vue
similarity index 100%
rename from frontend/new-web/src/views/examples/socket-chat/index.vue
rename to frontend/new-web/src/views/widgets/examples/socket-chat/index.vue
diff --git a/frontend/new-web/src/views/examples/tables/basic.vue b/frontend/new-web/src/views/widgets/examples/tables/basic.vue
similarity index 100%
rename from frontend/new-web/src/views/examples/tables/basic.vue
rename to frontend/new-web/src/views/widgets/examples/tables/basic.vue
diff --git a/frontend/new-web/src/views/examples/tables/index.vue b/frontend/new-web/src/views/widgets/examples/tables/index.vue
similarity index 100%
rename from frontend/new-web/src/views/examples/tables/index.vue
rename to frontend/new-web/src/views/widgets/examples/tables/index.vue
diff --git a/frontend/new-web/src/views/examples/tables/tree.vue b/frontend/new-web/src/views/widgets/examples/tables/tree.vue
similarity index 100%
rename from frontend/new-web/src/views/examples/tables/tree.vue
rename to frontend/new-web/src/views/widgets/examples/tables/tree.vue
diff --git a/frontend/new-web/src/views/examples/tabs/index.vue b/frontend/new-web/src/views/widgets/examples/tabs/index.vue
similarity index 98%
rename from frontend/new-web/src/views/examples/tabs/index.vue
rename to frontend/new-web/src/views/widgets/examples/tabs/index.vue
index 0c1dbf47..a505429a 100644
--- a/frontend/new-web/src/views/examples/tabs/index.vue
+++ b/frontend/new-web/src/views/widgets/examples/tabs/index.vue
@@ -58,7 +58,7 @@ defineOptions({ name: "TabsExample" });
const worktabStore = useWorktabStore();
const currentTab = ref(null);
const newTabTitle = ref("");
-const routePath = "/examples/tabs";
+const routePath = "/widgets/examples/tabs";
/**
* 更新当前标签页标题
diff --git a/frontend/new-web/src/views/result/fail/index.vue b/frontend/new-web/src/views/widgets/result/fail/index.vue
similarity index 100%
rename from frontend/new-web/src/views/result/fail/index.vue
rename to frontend/new-web/src/views/widgets/result/fail/index.vue
diff --git a/frontend/new-web/src/views/result/success/index.vue b/frontend/new-web/src/views/widgets/result/success/index.vue
similarity index 100%
rename from frontend/new-web/src/views/result/success/index.vue
rename to frontend/new-web/src/views/widgets/result/success/index.vue