diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 1d8c278..8ce24d1 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -1043,7 +1043,9 @@ export default [
iconFont: 'fa-user-o',
control: {
// 组件所有属性
- modelValue: ''
+ modelValue: '',
+ range:[],
+ queryBy:'org'
},
config: {}, // 其他配置信息
styles: {
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 3bd987b..c522f0b 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -15,6 +15,8 @@ import { ElMessage } from "element-plus";
import { formatNumber } from "@/api/DesignForm/utils";
import { getOrgTreeList } from "@/api/hr/org/index";
import { orgInfo } from "@/api/hr/org/type";
+
+
import {
PublicAtrr,
formStruct,
@@ -851,6 +853,14 @@ const attrList = computed(() => {
vIf: state.isSearch,
vShow: ["orgCentent"],
},
+ {
+ label: "数据范围",
+ value: config.expandUser,
+ path: "config.expand-user",
+ type: "expand-user",
+ vIf: state.isSearch,
+ vShow: ["expand-user"],
+ },
/* {
label: "添加时间水印",
value: config.lowcodeImage,
@@ -2068,6 +2078,8 @@ watch(
.toString();
}else if(controlData.value.type === "orgCentent"){
haveOrgTreeInfo()
+ }else if(controlData.value.type === "expand-user"){
+
}
//实现关联表单设置可选字段中没有当前字段效果 start
// console.log(controlData.value.name)
@@ -2386,6 +2398,10 @@ import AssociatedFormsTinyace from "@/widget/associatedforms/associatedFormsTiny
import AssociatedFormsTinyaceRange from "@/widget/associatedforms/associatedFormsTinyaceRange.vue";
import AssociatedFormsFillRole from "@/widget/associatedforms/associatedFormsFillRole.vue";
import AssociatedFormsChildFillRole from "@/widget/associatedforms/associatedFormsChildFillRole.vue";
+import TransferSelectUserRange from "@/widget/lowcodetransfer/lowcodeTransfer1.vue";
+
+const transferSelectUserRangeData = ref({"type":"lowcodeTransfer","unitName":"请选择","iconFont":"fa-arrows-h","control":{"modelValue":[],"fixedOptions":[{"id":"thefirstrootnode","label":"根节点1","unitName":"","disabled":false,"children":[]},{"id":"thesecondrootnode","label":"根节点2","unitName":"","disabled":false,"children":[]}]},"config":{"transferName":"请选择","transferDataSource":"数据源","apiUrl":"/javasys/lowCode/transfer/getOrgAndManTree","method":"post"},"name":"lowcodeTransfer1758525493710","item":{"label":"穿梭框"},"styles":{"divStyle":{"divbox":"all","transparency":100},"labelStyle":{"divbox":"all","transparency":100},"inputStyle":{"transparency":100}}})
+
const treeDefaultProps = {
//
@@ -4044,6 +4060,31 @@ watch(
}
);
+//选择用户数据范围
+
+const userRangeDialogFlag = ref(false)
+function handleUserRangeDialogFlag(){
+ userRangeDialogFlag.value = true
+}
+
+function checkedIdListChangedIndex(val:any){
+ //console.log(val)
+ controlData.value.control.range = val
+}
+
+let componentKey = 0
+
+function reRenderComponent() {
+ componentKey++;
+}
+
+function handleExpandTabChange(){
+ controlData.value.control.range = []
+}
+
+
+
+
/**
@ 作者: 秦东
@ 时间: 2024-12-23 10:39:48
@@ -4479,6 +4520,13 @@ const aiAgentList = ref([
+
+
+ {{controlData.control.range}}
+ 可选用户设置
+
+
+
@@ -5632,6 +5680,37 @@ const aiAgentList = ref([
+
+
+
+
+
+
+
+
+
+
+ 根据角色筛选
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
{
}
// 通过tag 取消勾选
const handleCloseTag = (tag) => {
-
+ checkedIdList.value = checkedIdList.value.filter(item => item !== tag.data.id);
if (!treeRef?.value) return
checkList.value = checkList.value.filter(item => {
treeRef.value.setChecked(tag, false)