diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue index d28b252..8b62ff6 100644 --- a/src/components/DesignForm/public/form/childTable.vue +++ b/src/components/DesignForm/public/form/childTable.vue @@ -73,11 +73,13 @@ const delColumn = (index: number) => { :width="item.item.span" > + {{scope.row}} {{ scope.$index + 1 }} {{ getText(scope.row[item.name]) }} + - + + 创建时间 - + 修改时间 - + 拥有者 - + 所属部门 @@ -589,10 +589,10 @@ function optionsValue3Get1(data: any,fieldName: string){ - + --> - - + + diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue index 9d36e37..f3ffc4f 100644 --- a/src/components/DesignForm/public/form/formItem.vue +++ b/src/components/DesignForm/public/form/formItem.vue @@ -48,6 +48,9 @@ const props = withDefaults( tProp?: string // 子表时的form-item的prop值,用于子表校验用 nodeKey?:string purview?:any[] + optionsValue3Get1?:any + tablekey?:any + numrun?:any }>(), {} ) @@ -536,7 +539,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown" @ 功能: 判断此组件是否可见 */ const judgeIsShow = (key:string) => { - // console.log("判断此组件是否可见---->",props.nodeKey,props.purview) + console.log("判断此组件是否可见---->",key) if(props.nodeKey != undefined && props.purview != undefined && props.purview != null && props.purview != null && props.purview != "" && props.purview != "") { if(props.purview.length < 1){ return true; @@ -839,10 +842,11 @@ const pickUserVal = (val:any) => { } - + + { v-model="value" /> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/widget/baidumap/index.vue b/src/widget/baidumap/index.vue index dce5757..3527abb 100644 --- a/src/widget/baidumap/index.vue +++ b/src/widget/baidumap/index.vue @@ -11,7 +11,8 @@ :class="config.className" :rules="itemRules" :label="getLabel(data.item as FormItem)" - > + > + {{ getLabel(data.item) }}