-
+
+
+
-
-
-
-
+ v-bind="element.control"
+ :class="[element.config?.className]"
+ >
+
+
+
+
+
-
+
{
/>
-
+
{
>
-
+
{{element.item.name}}}
-
+
+
{
-
+
@@ -163,25 +181,27 @@ const clickBtn = (control: any) => {
-
+
{{ element.item && element.item.label }}
-
+
-
+
@@ -195,9 +215,10 @@ const clickBtn = (control: any) => {
-
-
+
+
@@ -210,10 +231,9 @@ const clickBtn = (control: any) => {
-
-
+
-
+
\ No newline at end of file
diff --git a/src/components/lowCode/assistant/org.vue b/src/components/lowCode/assistant/org.vue
new file mode 100644
index 0000000..2eff4cc
--- /dev/null
+++ b/src/components/lowCode/assistant/org.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/lowCode/assistant/user.vue b/src/components/lowCode/assistant/user.vue
index 7acac64..73456ef 100644
--- a/src/components/lowCode/assistant/user.vue
+++ b/src/components/lowCode/assistant/user.vue
@@ -19,7 +19,7 @@ const emits = defineEmits<{
const userDialogEl = ref()
const value = computed({
get: () => {
- // console.log("value-get",props.modelValue)
+ console.log("value-get",props.modelValue)
// userlist.value = props.modelValue
return props.modelValue
},
diff --git a/src/components/lowCode/assistant/userDrawer.vue b/src/components/lowCode/assistant/userDrawer.vue
index cb721e5..a0d9fee 100644
--- a/src/components/lowCode/assistant/userDrawer.vue
+++ b/src/components/lowCode/assistant/userDrawer.vue
@@ -64,6 +64,7 @@ const getTreeData = () => {
onMounted(() => {
nextTick(() => {
// 可根据实际情况放在点击打开弹窗后加载，会出现loading
+ userCount.value = 0
getTreeData()
getUserList()
})
@@ -95,6 +96,12 @@ const getUserList = () => {
sertchData.total = data.total
+ // console.log("获取列表内容------total------->",data.total)
+ // console.log("获取列表内容------userCount------->",userCount.value)
+ // console.log("获取列表内容------pagenum------->",sertchData.pageSize - data.count)
+
+
+
if(data.total > 0){
if(userCount.value < data.total){
let pagenum = sertchData.pageSize - data.count
@@ -109,10 +116,15 @@ const getUserList = () => {
loadText.value = ""
userLoad.value = true
}
+
+
+
}else{
loadText.value = "此选项没有数据！"
userLoad.value = true
}
+
+ // console.log("获取列表内容------userLoad------->",userLoad.value)
})
.finally(()=>{
@@ -124,7 +136,7 @@ const getUserList = () => {
@ 功能: 监听滚动条状态
*/
const onHandleUserScroll = (event:any) => {
- // console.log("onHandleScroll", event)
+ // console.log("onHandleScroll", event,userLoad.value)
if (userLoad.value === true) {
return
}
@@ -222,6 +234,7 @@ watch(()=>sertchData.current,(val:number)=>{
@ 功能: 查询人员
*/
const queryUser = () => {
+ userCount.value = 0
sertchData.current = 1
tableData.value = []
getUserList()
diff --git a/src/components/lowCode/formItem.vue b/src/components/lowCode/formItem.vue
index 98c59b2..aa1a4eb 100644
--- a/src/components/lowCode/formItem.vue
+++ b/src/components/lowCode/formItem.vue
@@ -37,7 +37,9 @@ import SignatureMap from '@/components/lowCode/assistant/signatureMap.vue'
import AssociatedForms from '@/components/lowCode/assistant/associatedForms.vue'
import LowcodeTransfer from '@/components/lowCode/assistant/lowcodeTransfer.vue'
import UrlLink from '@/components/lowCode/assistant/urlLink.vue'
-import DepartmentOrg from '@/components/lowCode/assistant/departmentOrg.vue'
+import DepartmentOrg from '@/components/lowCode/assistant/departmentOrg.vue'
+import DigitpagePage from '@/components/lowCode/assistant/digitpage.vue'
+import OrgCentent from '@/components/lowCode/assistant/org.vue'
@@ -460,6 +462,12 @@ const currentComponent = computed(() => {
if (props.data.type === "deptOrg") {
return markRaw(DepartmentOrg);
}
+ if (props.data.type === "digitpage") {
+ return markRaw(DigitpagePage);
+ }
+ if (props.data.type === "orgCentent") {
+ return markRaw(OrgCentent);
+ }
return `el-${props.data.type}`
})
@@ -468,9 +476,9 @@ const currentComponent = computed(() => {
2
-
+
+
-
{
{{ getLabel(data.item) }}
+
{
:form-table-set-up="props.alldata"
v-model="value"
/>
-
+
{
-
+
diff --git a/src/utils/lowCode/const.ts b/src/utils/lowCode/const.ts
index d30969e..19554ee 100644
--- a/src/utils/lowCode/const.ts
+++ b/src/utils/lowCode/const.ts
@@ -103,66 +103,25 @@ export let submitButton = {
},
list: [
{
- type: "grid",
- iconFont: "fa-th-large",
- columns: [
- {
- attr:{
- span: 5
- },
- list: [],
- type: "gridChild"
- },
- {
- attr:{
- span: 14
- },
- list: [
- {
- type: "button",
- iconFont: "fa-square-o",
- control:{
- label: "确认提交",
- type: "primary",
- key: "submit"
- },
- config:{
- textAlign: "center"
- }
- }
- ],
- type: "gridChild"
+ type: "button",
+ iconFont: "fa-square-o",
+ control:{
+ label: "确认提交",
+ type: "primary",
+ key: "submit"
+ },
+ config:{
+ span: 24,
+ textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "100%"
},
- //{
- // list: [
- // {
- // type: "button",
- // iconFont: "fa-square-o",
- // control:{
- // label: "保存草稿",
- // type: "warning",
- // key: "saveDraft"
- // },
- // config:{
- // textAlign: "center"
- // }
- // }
- // ],
- // attr:{
- // span: 7
- // },
- // type: "gridChild"
- // },
- {
- list: [],
- attr:{
- span: 5
- },
- type: "gridChild"
- }
- ],
- control:{},
- config:{}
+ labelStyle:{},
+ inputStyle:{}
+ }
}
]
}
@@ -178,67 +137,49 @@ export let afreshSubmitButton = {
},
list: [
{
- type: "grid",
- iconFont: "fa-th-large",
- columns: [
- {
- attr:{
- span: 5
- },
- list: [],
- type: "gridChild"
- },
- {
- attr:{
- span: 7
- },
- list: [
- {
- type: "button",
- iconFont: "fa-square-o",
- control:{
- label: "确认提交",
- type: "primary",
- key: "afreshSubmit"
- },
- config:{
- textAlign: "center"
- }
- }
- ],
- type: "gridChild"
+ type: "button",
+ iconFont: "fa-square-o",
+ control:{
+ label: "确认提交",
+ type: "primary",
+ key: "afreshSubmit"
+ },
+ config:{
+ span: 12,
+ textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "50%"
},
- {
- list: [
- {
- type: "button",
- iconFont: "fa-square-o",
- control:{
- label: "保存草稿",
- type: "warning",
- key: "saveEditDraft"
- },
- config:{
- textAlign: "center"
- }
- }
- ],
- attr:{
- span: 7
- },
- type: "gridChild"
+ labelStyle:{},
+ inputStyle:{}
+ }
+ },
+ {
+ type: "button",
+ iconFont: "fa-square-o",
+ control:{
+ label: "保存1草稿",
+ type: "warning",
+ key: "saveEditDraft"
+ },
+ config:{
+ span: 12,
+ textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "50%"
},
- {
- list: [],
- attr:{
- span: 5
- },
- type: "gridChild"
- }
- ],
- control:{},
- config:{}
+ labelStyle:{},
+ inputStyle:{}
+ }
}
+
+
]
}
@@ -279,7 +220,16 @@ export let editFormCont = {
key: "submitEdit"
},
config:{
+ span: 24,
textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "100%"
+ },
+ labelStyle:{},
+ inputStyle:{}
}
}
]
@@ -296,66 +246,46 @@ export let draftSubmitButton = {
},
list: [
{
- type: "grid",
- iconFont: "fa-th-large",
- columns: [
- {
- attr:{
- span: 5
- },
- list: [],
- type: "gridChild"
- },
- {
- attr:{
- span: 7
- },
- list: [
- {
- type: "button",
- iconFont: "fa-square-o",
- control:{
- label: "确认提交",
- type: "primary",
- key: "draftSubmit"
- },
- config:{
- textAlign: "center"
- }
- }
- ],
- type: "gridChild"
+ type: "button",
+ iconFont: "fa-square-o",
+ control:{
+ label: "确认提交",
+ type: "primary",
+ key: "draftSubmit"
+ },
+ config:{
+ span: 12,
+ textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "50%"
},
- {
- list: [
- {
- type: "button",
- iconFont: "fa-square-o",
- control:{
- label: "保存草稿",
- type: "warning",
- key: "saveEditDraft"
- },
- config:{
- textAlign: "center"
- }
- }
- ],
- attr:{
- span: 7
- },
- type: "gridChild"
+ labelStyle:{},
+ inputStyle:{}
+ }
+ },
+ {
+ type: "button",
+ iconFont: "fa-square-o",
+ control:{
+ label: "保存草稿",
+ type: "warning",
+ key: "saveEditDraft"
+ },
+ config:{
+ span: 12,
+ textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "50%"
},
- {
- list: [],
- attr:{
- span: 5
- },
- type: "gridChild"
- }
- ],
- control:{},
- config:{}
+ labelStyle:{},
+ inputStyle:{}
+ }
}
]
}
@@ -403,8 +333,17 @@ export const submitButtonEs = {
type: "primary",
key: "editSubmit"
},
- config:{
+ config:{
+ span: 24,
textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "100%"
+ },
+ labelStyle:{},
+ inputStyle:{}
}
}
]
@@ -421,66 +360,47 @@ export let submitFlowButton = {
},
list: [
{
- type: "grid",
- iconFont: "fa-th-large",
- columns: [
- {
- attr:{
- span: 5
- },
- list: [],
- type: "gridChild"
- },
- {
- attr:{
- span: 7
- },
- list: [
- {
- type: "button",
- iconFont: "fa-square-o",
- control:{
- label: "确认提交",
- type: "primary",
- key: "submitFlow"
- },
- config:{
- textAlign: "center"
- }
- }
- ],
- type: "gridChild"
+ type: "button",
+ iconFont: "fa-square-o",
+ control:{
+ label: "确认提交",
+ type: "primary",
+ key: "submitFlow"
+ },
+ config:{
+ span: 12,
+ textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "50%"
},
- {
- list: [
- {
- type: "button",
- iconFont: "fa-square-o",
- control:{
- label: "保存草稿",
- type: "warning",
- key: "saveDraftFlow"
- },
- config:{
- textAlign: "center"
- }
- }
- ],
- attr:{
- span: 7
- },
- type: "gridChild"
+ labelStyle:{},
+ inputStyle:{}
+ }
+ },
+ {
+ type: "button",
+ iconFont: "fa-square-o",
+ control:{
+ label: "保存草稿",
+ type: "warning",
+ key: "saveDraftFlow"
+ },
+ config:{
+ span: 12,
+ textAlign: "center"
+ },
+ styles:{
+ divStyle:{
+ marginBot: "15",
+ width: "50%"
},
- {
- list: [],
- attr:{
- span: 5
- },
- type: "gridChild"
- }
- ],
- control:{},
- config:{}
+ labelStyle:{},
+ inputStyle:{}
+ }
}
+
]
}
\ No newline at end of file
diff --git a/src/views/common/header/formTable/header.vue b/src/views/common/header/formTable/header.vue
index b1006a1..98c4bdc 100644
--- a/src/views/common/header/formTable/header.vue
+++ b/src/views/common/header/formTable/header.vue
@@ -64,12 +64,13 @@ const defaultProps = {
}
//返回首页
const callBackPage = () => {
- if(props.appKey != ""){
- router.push({ path: "/form_table",query:{id: props.appKey}});
- }else{
- router.push({ path: "/"});
- }
-
+ // if(props.appKey != ""){
+ // router.push({ path: "/form_table",query:{id: props.appKey}});
+ // }else{
+ // router.push({ path: "/"});
+ // }
+ // router.go(-1);
+ router.back();
}
diff --git a/src/views/common/user/visitingCard.vue b/src/views/common/user/visitingCard.vue
index 2495b15..85a61e7 100644
--- a/src/views/common/user/visitingCard.vue
+++ b/src/views/common/user/visitingCard.vue
@@ -43,7 +43,7 @@ const orgCont = () => {
\ No newline at end of file
diff --git a/src/views/news/index.vue b/src/views/news/index.vue
index 43acc34..9d0d94b 100644
--- a/src/views/news/index.vue
+++ b/src/views/news/index.vue
@@ -11,6 +11,7 @@ import SvgIcon from '@/components/svgIcon/index.vue'
import Header from '@/views/common/header/formTable/header.vue'
import NewPageInfo from '@/views/news/pageInfo.vue'
+import BottomPage from '@/views/common/bottom/index.vue'
const route = useRoute()
const router = useRouter()
@@ -166,7 +167,9 @@ const lookNewInfo = (val:any) => {
数据已全部展示！
+
+