diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 34da915..54376a1 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -1561,7 +1561,7 @@ const submit = (params = {}) => {
// })
} else {
// 没通过校验
- afterSubmit("validate", fields);
+ // afterSubmit("validate", fields);
}
});
};
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index b5dacab..747b307 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -7,17 +7,17 @@ const tagsViewStore = useTagsViewStore();
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index 8e9337c..d80b289 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -1,9 +1,9 @@
@@ -85,7 +96,27 @@ function resolvePath(routePath: string) {
(!onlyOneChild.children || onlyOneChild.noShowingChildren)
"
>
-
+
+
+
+
+ {{ translateRouteTitleI18n(onlyOneChild.meta.title) }}
+
+
+
+
{{ translateRouteTitleI18n(onlyOneChild.meta.title) }}
-
@@ -102,10 +132,7 @@ function resolvePath(routePath: string) {
-
+
{{
translateRouteTitleI18n(item.meta.title)
}}
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 59d1d30..b6eec4f 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -42,126 +42,159 @@ const { sidebarLogo } = storeToRefs(settingsStore);
diff --git a/src/views/hr/teams/anchorPage.vue b/src/views/hr/teams/anchorPage.vue
index 3ba7708..0fc32c1 100644
--- a/src/views/hr/teams/anchorPage.vue
+++ b/src/views/hr/teams/anchorPage.vue
@@ -62,16 +62,16 @@ const closeDialog = () => {
const gaveAllAppList = () => {
gaveAllApp()
.then(({ data }) => {
- console.log(" 获取app列表应用", data);
+ // console.log(" 获取app列表应用", data);
appList.value = data;
})
.finally(() => {
ginTeamRule().then(({ data }) => {
- console.log(" 获取app列表应用=====>", data);
+ // console.log(" 获取app列表应用=====>", data);
if (data.appid != 0) {
formContent.appKey = data.appid.toString();
}
- formContent.tableKey = data.tableKey;
+ formContent.sdatableKey = data.tableKey.toString();
});
});
};
@@ -83,6 +83,7 @@ watch(
appList.value.forEach((iten: any) => {
if (iten.app_id == val) {
tableList.value = iten.list;
+ // console.log(" 获取app列表应用==选中的===>", iten);
}
});
}
@@ -106,7 +107,14 @@ const onSubmitPick = () => {
}
if (tableList.value && appList.value.length > 0) {
tableList.value.forEach((iten: any) => {
- if (iten.table_key == formContent.tableKey) {
+ // console.log(
+ // " 获取app列表应用==路边内需===>",
+ // iten.table_key,
+ // "---------->",
+ // formContent.sdatableKey
+ // );
+
+ if (iten.table_key == formContent.sdatableKey) {
sendData.dataBaseName = iten.dataBaseName;
sendData.ip = iten.ip;
sendData.port = iten.port;
@@ -120,9 +128,10 @@ const onSubmitPick = () => {
}
});
}
- console.log("提交调班配置表", sendData);
+ // console.log("提交调班配置表", sendData);
setupRulerForm(sendData).then((data: any) => {
- console.log("提交调班配置表===========234===========>", data);
+ // console.log("提交调班配置表===========234===========>", data);
+ closeDialog();
});
};
@@ -149,7 +158,7 @@ onMounted(() => {
-
+
({
visible: false,
});
-
+const appList = ref([]);
+const tableList = ref([]);
const queryParams = reactive({});
const menuList = ref([]);
@@ -37,7 +40,7 @@ const formData = reactive({
visible: 1,
sort: 1,
type: MenuTypeEnum.MENU,
- outside:1
+ outside: 1,
});
const rules = reactive({
@@ -45,9 +48,7 @@ const rules = reactive({
name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
type: [{ required: true, message: "请选择菜单类型", trigger: "blur" }],
path: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
- component: [
- { required: true, message: "请输入组件完整路径", trigger: "blur" },
- ],
+ component: [{ required: true, message: "请输入组件完整路径", trigger: "blur" }],
});
// 选择表格的行菜单ID
@@ -105,7 +106,7 @@ function openDialog(parentId?: number, menuId?: number) {
dialog.visible = true;
if (menuId) {
dialog.title = "编辑菜单";
- getMenuForm({id:menuId.toString()}).then(({ data }) => {
+ getMenuForm({ id: menuId.toString() }).then(({ data }) => {
Object.assign(formData, data);
menuCacheData.type = data.type;
menuCacheData.path = data.path ?? "";
@@ -114,6 +115,9 @@ function openDialog(parentId?: number, menuId?: number) {
dialog.title = "新增菜单";
formData.parentId = parentId;
}
+ })
+ .finally(() => {
+ gaveAllAppList();
});
}
@@ -168,7 +172,7 @@ function handleDelete(menuId: number) {
type: "warning",
})
.then(() => {
- deleteMenu({id:menuId.toString()}).then(() => {
+ deleteMenu({ id: menuId.toString() }).then(() => {
ElMessage.success("删除成功");
handleQuery();
});
@@ -197,6 +201,42 @@ function resetForm() {
formData.sort = 1;
}
+/**
+@ 作者: 秦东
+@ 时间: 2025-02-18 10:44:01
+@ 功能: 获取app列表应用
+*/
+const gaveAllAppList = () => {
+ gaveAllApp()
+ .then(({ data }) => {
+ console.log(" 获取app列表应用", data);
+ appList.value = data;
+ })
+ .finally(() => {
+ ginTeamRule().then(({ data }) => {
+ console.log(" 获取app列表应用=====>", data);
+ if (data.appid != 0) {
+ formData.appKey = data.appid.toString();
+ }
+ formData.sdatableKey = data.tableKey;
+ });
+ });
+};
+watch(
+ () => formData.appKey,
+ (val: any) => {
+ if (appList && appList.value.length > 0) {
+ appList.value.forEach((iten: any) => {
+ if (iten.app_id == val) {
+ tableList.value = iten.list;
+ }
+ });
+ }
+ },
+ {
+ deep: true,
+ }
+);
onMounted(() => {
handleQuery();
});
@@ -208,18 +248,17 @@ onMounted(() => {
-
-
-
-
-
+
+
+
+
-
+
搜索
@@ -229,16 +268,14 @@ onMounted(() => {
>
-
-
- 新增
+
+ 新增
-
{
{{ scope.row.name }}
@@ -263,9 +298,7 @@ onMounted(() => {
- 目录
{
>
-
+
@@ -298,7 +327,7 @@ onMounted(() => {
{
{
编辑
+ >
删除
@@ -341,12 +370,7 @@ onMounted(() => {
width="750px"
@close="closeDialog"
>
-
+
{
菜单
按钮
外链
+ 绑定自建应用
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -403,9 +443,7 @@ onMounted(() => {
placeholder="system/user/index"
style="width: 95%"
>
- src/views/
+ src/views/
.vue
@@ -419,19 +457,12 @@ onMounted(() => {
-->
-
+
-
+
@@ -441,11 +472,11 @@ onMounted(() => {
隐藏
-
+
内部使用
外部使用
- 内外使用
+ 内外使用
diff --git a/src/views/sysworkflow/lowCodeTasks/index.vue b/src/views/sysworkflow/lowCodeTasks/index.vue
new file mode 100644
index 0000000..b17a61c
--- /dev/null
+++ b/src/views/sysworkflow/lowCodeTasks/index.vue
@@ -0,0 +1,404 @@
+
+
+
+
+
+
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
index 421a630..672d124 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
@@ -486,6 +486,7 @@ let objMastesform: any;
@ 功能: 初始化数据
*/
const initLoadData = () => {
+ console.log("获取初始化表单数据-------------->", props.pickAppMenu);
// console.log("initLoadData",props.pickAppMenu.type,props.pickAppMenu.type != 1)
if (props.pickAppMenu.type != 1) {
// appFormTitle.value = props.pickAppMenu.label
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
index eb766f6..499fb2f 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -325,34 +325,33 @@ watch(
}
);
-
//liwenxuan 二维码表格组织人员名称显示 start
interface Tree {
- id?: string;
- label: string;
- disabled?: boolean;
- children?: Tree[];
- parentId?: string;
- [key: string]: any;
+ id?: string;
+ label: string;
+ disabled?: boolean;
+ children?: Tree[];
+ parentId?: string;
+ [key: string]: any;
}
const orgAndManTree = ref();
- function getAssociatedFormsOrgAndManTree() {
- return request({
- url: "/javasys/lowCode/transfer/getOrgAndManTree",
- method: "post",
- });
+function getAssociatedFormsOrgAndManTree() {
+ return request({
+ url: "/javasys/lowCode/transfer/getOrgAndManTree",
+ method: "post",
+ });
}
getAssociatedFormsOrgAndManTree().then(({ data }) => {
- let resData = ref(data.children);
- orgAndManTree.value = [
- {
- id: data.id,
- //label: data.label,
- label: "组织机构",
- children: [...resData.value],
- },
- ];
+ let resData = ref(data.children);
+ orgAndManTree.value = [
+ {
+ id: data.id,
+ //label: data.label,
+ label: "组织机构",
+ children: [...resData.value],
+ },
+ ];
});
//liwenxuan 二维码表格组织人员名称显示 end
@@ -367,8 +366,6 @@ function optionsValue3Get3(data: any, fieldName: string) {
}
}
}
-
-
@@ -390,8 +387,8 @@ function optionsValue3Get3(data: any, fieldName: string) {
:pickAppMenu="props.pickAppMenu"
:viewPage="stateList.view"
:form-basic-config="stateForm.formData.form"
- :fields-detail-list="stateForm.formData.list"
- :org-and-man-tree = "orgAndManTree"
+ :fields-detail-list="stateForm.formData.list"
+ :org-and-man-tree="orgAndManTree"
/>