diff --git a/src/api/doc/index.ts b/src/api/doc/index.ts index df9310a..52932c3 100644 --- a/src/api/doc/index.ts +++ b/src/api/doc/index.ts @@ -99,6 +99,23 @@ export function getMatterList( uid:string,data?: matterPage): AxiosPromise { +export function getRecyclingList( uid:string,data?: matterPage): AxiosPromise { + return request({ + url: '/hxpan/api/matter/recycling', + method: 'post', + headers: { + 'Identifier':uid, + 'Content-Type': 'application/x-www-form-urlencoded' + }, + data: data + }); +} + /** * 新建目录 */ 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 6f4cdfb..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 @@ -4463,6 +4504,9 @@ const aiAgentList = ref([ show-checkbox multiple style="width: 200px" + collapse-tags + collapse-tags-tooltip + :max-collapse-tags="2" /> @@ -4476,6 +4520,13 @@ const aiAgentList = ref([ + + + {{controlData.control.range}} + 可选用户设置 + + + @@ -5629,6 +5680,37 @@ const aiAgentList = ref([ + + + + + + + + + +
+ 根据角色筛选 + +
+ + + + +
+ + 确定 + +
+ + + +
diff --git a/src/components/DesignForm/public/expand/userDialog.vue b/src/components/DesignForm/public/expand/userDialog.vue index 30fc785..b7eaa0a 100644 --- a/src/components/DesignForm/public/expand/userDialog.vue +++ b/src/components/DesignForm/public/expand/userDialog.vue @@ -196,7 +196,7 @@ const defaultProps = { draggable > - +
- +
查询 diff --git a/src/views/doc/manage.vue b/src/views/doc/manage.vue index 8825cbc..f489804 100644 --- a/src/views/doc/manage.vue +++ b/src/views/doc/manage.vue @@ -7,7 +7,8 @@ import { getExpirTime, getFileIcon, readableSize,fileType} from "./tools" import sharePermission from './sharePermission.vue'; import { useUserStore } from "@/store/modules/user"; -import { getMatterList,postCreateDir,postDelMatter,postCreateShare,postMatterRename,postDelMatBatch,getMySpaces,doCreateSpace} from "@/api/doc/index" +import { getMatterList,postCreateDir,postDelMatter,postCreateShare,postMatterRename, + postDelMatBatch,getMySpaces,doCreateSpace,getRecyclingList} from "@/api/doc/index" import { matterPage,matterInfo,respCreateShare,matterTree, doFileUpload,matterPermit} from "@/api/doc/type" import { h } from 'vue' import router from "@/router"; @@ -22,7 +23,7 @@ import preview from './preview.vue'; import space from './space.vue'; import spacePermission from './spacePermission.vue'; import SvgIcon from "@/components/SvgIcon/index.vue"; -import {doDelSpace,doAccessManage} from "@/api/doc/space" +import {doDelSpace,doAccessManage,doCreateAiagent} from "@/api/doc/space" import Space from "./space.vue"; //TODO: add file icons done! @@ -69,6 +70,7 @@ const spaceTreeRef = ref(); //space的树树组件的引用 let spaceNodeUid="" //用来判断树组件的展开和关闭，如何只是展开和关闭的点击事件不在刷新，通currentNode的作用 const modListOrGrild=ref(true) +const modRecycling=ref(false) const Departs = computed(() => { return `${'p0'+userStore.userInfoCont.userId},${userStore.userInfoCont.company},${userStore.userInfoCont.department},${userStore.userInfoCont.organization}` @@ -182,8 +184,12 @@ function showShareMessage(row:respCreateShare){ } //---------------------------------------- + +function onDelNodeMatter(row:matterInfo){ + onDelMatter(row,true) +} //删除 -function onDelMatter(row:matterInfo){ +function onDelMatter(row:matterInfo,dir?:boolean){ if (row.uuid){ ElMessageBox.confirm(`确认删除( ${row.name}) ?删除后不可恢复！取消则放弃删除操作。`, "警告", { confirmButtonText: "确定", @@ -193,11 +199,12 @@ function onDelMatter(row:matterInfo){ postDelMatter(uid,{ "uuid":row.uuid }).then(()=>{ - if (row.dir) { - currentNode.value.uuid = row.puuid ?? "" - currentNode.value.name = row.path ? row.path.replace(`/${row.name}`,'').match(/[^/]+$/g)?.pop() :"上级目录" - - treeRef.value.remove(row.uuid) + if (row.dir || dir) { + const node = treeRef.value.getNode(row.uuid) + if (node) { + treeRef.value.remove(node) + } + currentNode.value.uuid = row.puuid ?? "root" } onLoadMatterList() }) @@ -282,6 +289,41 @@ function onSearchFile(name?:string){ }) } +//获取回收站文件 +function showRecycling(){ + modRecycling.value=true + currentNode.value={} //清空当前节点 + if(!PRIVATESPACE.value) { //共享空间模式要切换到个人空间 + PRIVATESPACE.value=true + } + + getRecyclingList(uid,{}).then((resp)=>{ + paginInfo.value={total:1,page:0} + matterList.value=resp.data + }) +} +//恢复删除文件 +function restoreMatter(row:matterInfo){ + if (row.uuid){ + ElMessageBox.confirm(`确认要恢复( ${row.name}) ?`, "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then(()=>{ + postDelMatter(uid,{ + "uuid":row.uuid, + "restore":"true", + }).then(()=>{ + ElMessage({ + message: '已成功恢复文件，请在个人空间查看。', + type: 'success', + plain: true, + }) + }) + }) + } +} + //加载目录文件列表 function onLoadMatterList(){ let _page: matterPage = { @@ -349,45 +391,54 @@ function onDBclickMatter(row:matterInfo){ //树节点展开 function onNodeExpand(node: TreeNode, resolve: (data: matterTree[]) => void, reject: () => void) { + modRecycling.value=false + let cuuid ="root" if ((node.data as matterTree).uuid) { - const cuuid = (node.data as matterTree).uuid + cuuid= (node.data as matterTree).uuid currentNode.value = node.data - - let _page: matterPage = { - page: 0, - pageSize: 50, - orderCreateTime: "DESC", - orderDir: "DESC", - puuid: cuuid, - deleted: false - }; - - getMatterList(uid, _page).then((resp) => { - paginInfo.value = { total: resp.data.totalPages, page: resp.data.page } - matterList.value = resp.data.data - // .filter((item)=>{ - // return !item.dir - // }) - let node_data = resp.data.data.filter((item) => { - return item.dir - }).map((val) => { - const copy = structuredClone(val) - copy.dir = !copy.dir - return copy - }) - - resolve(node_data) - }).catch(() => reject()) } + + let _page: matterPage = { + page: 0, + pageSize: 50, + orderCreateTime: "DESC", + orderDir: "DESC", + puuid: cuuid, + deleted: false + }; + + getMatterList(uid, _page).then((resp) => { + paginInfo.value = { total: resp.data.totalPages, page: resp.data.page } + matterList.value = resp.data.data + // .filter((item)=>{ + // return !item.dir + // }) + let node_data = resp.data.data.filter((item) => { + return item.dir + }).map((val) => { + const copy = structuredClone(val) + copy.dir = !copy.dir + return copy + }) + + resolve(node_data) + }).catch(() => reject()) + } //树节点单击 function onNodeClick(data:matterTree,node:TreeNode,self:any,env:any){ + modRecycling.value=false if(!PRIVATESPACE.value) { PRIVATESPACE.value=true } - if (currentNode.value.uuid === data.uuid) return; - const cuuid = data.uuid - currentNode.value = data + if (data){ + if (currentNode.value.uuid === data.uuid) return; + //const cuuid = data.uuid + currentNode.value = data + }else{ + currentNode.value={uuid:"root"} + } + onLoadMatterList() return let _page: matterPage = { @@ -528,7 +579,7 @@ async function handleFolderFile(option:File){ const _path = option.webkitRelativePath const _dir=_path.replace(/\/[^/]+\w+$/,"") //只保留文件夹目录,[^/]就是用来限制，只能是最后一个目录 const node = matterList.value.filter((item)=>{ - return item.dir && item.path?.endsWith(_dir) + return item.dir && _dir.endsWith(item.name!) }) let puuid="" @@ -536,10 +587,11 @@ async function handleFolderFile(option:File){ if(node.length==0){ const subs= await doCreateMultyDir(_dir,currentNode.value.uuid) matterList.value.push(...subs) //这里如果子文件夹多的时候，可能会造成第一级路径多次创建，只是造成资源浪费，问题不大 - + const newnodes=matterList.value.filter((item)=>{ - return item.dir && item.path?.endsWith(_dir) + return item.dir && _dir.endsWith(item.name!) }) + if(newnodes.length>0){ puuid=newnodes[0].uuid }else{ @@ -567,6 +619,13 @@ async function doCreateMultyDir(path:string,uuid:string){ const list=[]; const dirs=path.split("/") for(let i=0;i{ + return item.dir && dirs[i].endsWith(item.name!) + }) + if(node.length>0) { + uuid = node[0].uuid + continue; + } await postCreateDir(uid,{ userUuid:uid, puuid:uuid, @@ -580,7 +639,7 @@ async function doCreateMultyDir(path:string,uuid:string){ } function handleMouseEnter(row:any){ - currentHoverRow.value=row.name + currentHoverRow.value=row.uuid } //上传成功 function handleSingleUpload(response:any){ @@ -626,6 +685,7 @@ function onNewSpace(){ function onSpaceNodeClick(data:matterTree,node:TreeNode,self:any,env:any){ if(PRIVATESPACE.value) { //如果打开了个人空间，突然点击共享空间，要及时切换状态 PRIVATESPACE.value=false + modRecycling.value=false } //如果在单个组件上重复点击，不在刷新请求 if(spaceNodeUid==data.uuid) return; @@ -719,15 +779,35 @@ function onSpacePManage(row:matterInfo){ }) } +//处理空间智能体创建 +function onAiAgent(row:matterInfo){ + if(row.agent){ + alert("当前目录已经是智能体目录") + return + } + + ElMessageBox.confirm(`确认创建智能体( ${row.name}) ?`, "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then(()=>{ + doCreateAiagent(uid,{ + space:SpaceID.value.uuid, + matter:row.uuid + }).then(()=>{ + router.replace({ query: { t: Date.now() } }) + }) + }) +} //------------------------------------------------------ //http://172.20.2.87:6010/api/alien/preview/5a10aaf6-396e-4d9a-7e87-3c5c8029d4db/123.png?ir=fill_100_100 //渲染完页面再执行 onMounted(() => { - treeRef.value.append( - {name:'个人空间',uuid:'root',dir:false}, - currentNode.value.uuid - ) + // treeRef.value.append( + // {name:'个人空间',uuid:'root',dir:false}, + // currentNode.value.uuid + // ) //加载我的空间列表 getMySpaces(uid,{roles:Departs.value}).then((resp)=>{ resp.data.forEach((item)=>{ @@ -753,7 +833,10 @@ const handleSelectionChange = (val:matterInfo[]) => { +
+ 回收站 +
- + 回收站 + 根目录/ @@ -815,7 +915,7 @@ const handleSelectionChange = (val:matterInfo[]) => { - +
{ :row-style ="() => ({ lineHeight: '36px' })" @selection-change="handleSelectionChange" @cell-mouse-enter="handleMouseEnter"> - + @@ -711,7 +693,7 @@ function isOwner(){
  • 下载
  • 编辑
    • -
  • 重命名
    • +
  • 重命名
    •
  • 删除
    • @@ -744,7 +726,7 @@ function isOwner(){ } .search{ margin-left: auto; - margin-right: 20px; + margin-right: -4px; display:inherit; } diff --git a/src/widget/lowcodetransfer/lowcodeTransfer.vue b/src/widget/lowcodetransfer/lowcodeTransfer.vue index a7b9525..b0b79e7 100644 --- a/src/widget/lowcodetransfer/lowcodeTransfer.vue +++ b/src/widget/lowcodetransfer/lowcodeTransfer.vue @@ -196,7 +196,70 @@ const selectedValueCompu = computed({ const url = transferConfig.value.apiUrl;/* '/javasys/lowCode/transfer/getOrgAndManTree' */ let resData = ref([]) - +function endsWithGetOrgAndManTree(str) { + // 检查输入是否为字符串 + if (typeof str !== 'string') { + return false; + } + const suffix = 'getOrgAndManTree'; + // 当字符串长度小于后缀长度时，直接返回false + if (str.length < suffix.length) { + return false; + } + // 获取字符串末尾与后缀长度相同的子字符串并比较 + return str.slice(-suffix.length) === suffix; +} +function processTreeData(node) { + if(!endsWithGetOrgAndManTree(url)){ + return node + } + // 检查节点及其所有子孙节点中是否存在id长度大于4的节点 + function hasLongIdNode(node) { + // 检查当前节点id长度 + if (node.id && node.id.length > 4) { + return true; + } + + // 处理子节点（考虑children为null的情况） + if (node.children && Array.isArray(node.children) && node.children.length > 0) { + for (const child of node.children) { + if (hasLongIdNode(child)) { + return true; + } + } + } + + return false; + } + + // 递归处理节点 + function processNode(node) { + // 如果当前节点及其所有子孙都没有长id，则移除该节点 + if (!hasLongIdNode(node)) { + return null; + } + + // 复制节点避免修改原对象 + const newNode = {...node}; + + // 处理子节点 + if (newNode.children && Array.isArray(newNode.children) && newNode.children.length > 0) { + // 递归处理每个子节点并过滤掉需要移除的 + newNode.children = newNode.children + .map(child => processNode(child)) + .filter(child => child !== null); + + // 如果所有子节点都被移除，保持children为null + if (newNode.children.length === 0) { + newNode.children = null; + } + } + + return newNode; + } + + return processNode(node); +} function getDetail() { //console.log(11111) @@ -209,8 +272,15 @@ function getDetail() { } if (transferConfig.value.transferDataSource === "数据源") { getDetail().then(({ data }) => { + + + const data1 = processTreeData(data) + + + + //console.log(`获取穿梭框接口数据`); - resData.value = data.children + resData.value = data1.children // 全选方法2:插入 全选node userList.value = [{ id: '全选', @@ -408,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) @@ -614,8 +684,10 @@ watch(transferConfig, (newValue, oldValue) => { getDetail().then(({ data }) => { + + const data1 = processTreeData(data) //console.log(`获取穿梭框接口数据`); - resData.value = data.children + resData.value = data1.children // 全选方法2:插入 全选node userList.value = [{ id: '全选', diff --git a/src/widget/lowcodetransfer/lowcodeTransfer1.vue b/src/widget/lowcodetransfer/lowcodeTransfer1.vue new file mode 100644 index 0000000..33c733d --- /dev/null +++ b/src/widget/lowcodetransfer/lowcodeTransfer1.vue @@ -0,0 +1,896 @@ + + + + + + + +