From e05205493ff02777c265f64f98bdd84b30f994a6 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 23 Sep 2025 11:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=94=A8=E6=88=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=8C=83=E5=9B=B4=20=E6=A0=B9=E6=8D=AE=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E8=AE=BE=E7=BD=AE=E5=8F=AF=E9=80=89=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  4 +-
 .../DesignForm/formControlPropertiNew.vue     | 79 +++++++++++++++++++
 .../lowcodetransfer/lowcodeTransfer.vue       |  2 +-
 3 files changed, 83 insertions(+), 2 deletions(-)

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([
 
               </el-row>
 
+              <el-row v-else-if="item.type === 'expand-user'">
+                
+                  {{controlData.control.range}}
+                  <el-button @click="handleUserRangeDialogFlag">可选用户设置</el-button>
+
+              </el-row>
+
               
 
 
@@ -5632,6 +5680,37 @@ const aiAgentList = ref([
       </el-tab-pane>
     </el-tabs>
   </div>
+
+  <el-dialog
+    v-model="userRangeDialogFlag"
+    title="可选用户设置"
+    top="20px"
+    style="margin-top:70px;margin-left:270px;height:650px;width:750px"
+  >
+
+    <el-tabs v-model="controlData.control.queryBy" class="demo-tabs" @tab-change="handleExpandTabChange" >
+      <el-tab-pane label="根据组织筛选" name="org">
+        <TransferSelectUserRange v-if="controlData.control.queryBy=='org'" :key="componentKey" :data="transferSelectUserRangeData"  :selected-value="controlData.control.range" @checked-id-list-changed="checkedIdListChangedIndex"   @re-render-component="reRenderComponent" />
+      </el-tab-pane>
+      <el-tab-pane label="根据角色筛选" name="role">
+
+        <div style="width: 600px;">
+          根据角色筛选
+
+        </div>
+      </el-tab-pane>
+      
+    </el-tabs>
+
+      <div style="position: absolute; top:587px;left:616px">
+        <el-button type="primary" @click="userRangeDialogFlag = false">
+          确定
+        </el-button>
+      </div>
+    
+  </el-dialog>
+
+
   <!-- 轮播图设置弹窗 20240122 start -->
 
   <el-dialog
diff --git a/src/widget/lowcodetransfer/lowcodeTransfer.vue b/src/widget/lowcodetransfer/lowcodeTransfer.vue
index facde37..b0b79e7 100644
--- a/src/widget/lowcodetransfer/lowcodeTransfer.vue
+++ b/src/widget/lowcodetransfer/lowcodeTransfer.vue
@@ -478,7 +478,7 @@ const filterNode = (value, data, node) => {
 }
 // 通过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)