feat: shared workspace

Author: wangdan-fit2cloud

ui/src/api/folder.ts

@@ -1,7 +1,6 @@
 import { Result } from '@/request/Result'
 import { get, post, del, put } from '@/request/index'
 import { type Ref } from 'vue'
-import type { pageRequest } from '@/api/type/common'
 
 import useStore from '@/stores'
 const prefix: any = { _value: '/workspace/' }

ui/src/api/model/model.ts

@@ -9,7 +9,6 @@ import type {
 } from '@/api/type/model'
 import type { FormField } from '@/components/dynamics-form/type'
 
-
 import useStore from '@/stores'
 const prefix: any = { _value: '/workspace/' }
 Object.defineProperty(prefix, 'value', {
@@ -24,7 +23,7 @@ Object.defineProperty(prefix, 'value', {
  * @params 参数 name, model_type, model_name
  */
 const getModel: (
-  request?: ListModelRequest,
+  data?: ListModelRequest,
   loading?: Ref<boolean>,
 ) => Promise<Result<Array<Model>>> = (data, loading) => {
   return get(`${prefix.value}`, data, loading)

ui/src/api/shared/workspace.ts ui/src/api/shared-workspace.tsui/src/api/shared/workspace.ts renamed to ui/src/api/shared-workspace.ts

@@ -15,13 +15,13 @@ Object.defineProperty(prefix_workspace, 'value', {
   },
 })
 
-const getSharedWorkspaceKnowledge: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
+const getKnowledgeList: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
   loading,
 ) => {
   return get(`${prefix}/${prefix_workspace.value}/knowledge`, {}, loading)
 }
 
-const getSharedWorkspaceKnowledgePage: (
+const getKnowledgeListPage: (
   page: pageRequest,
   param: any,
   loading?: Ref<boolean>,
@@ -33,46 +33,31 @@ const getSharedWorkspaceKnowledgePage: (
   )
 }
 
-const getSharedWorkspaceModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
-  loading,
-) => {
-  return get(`${prefix}/${prefix_workspace.value}/model`, {}, loading)
-}
-
-const getCESharedWorkspaceModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
-  loading,
-) => {
-  return get(`/${prefix_workspace.value}/model`, {}, loading)
-
-}
-
-const getSharedWorkspaceModelPage: (
+const getModel: (
   param: any,
   loading?: Ref<boolean>,
 ) => Promise<Result<Array<any>>> = (param: any, loading) => {
-  console.log(`${prefix}/${prefix_workspace.value}/model`)
   return get(`${prefix}/${prefix_workspace.value}/model`, param, loading)
 }
 
-const getSharedWorkspaceTool: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
+const getToolList: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
   loading,
 ) => {
   return get(`${prefix}/${prefix_workspace.value}/tool`, {}, loading)
 }
 
-const getSharedWorkspaceToolPage: (
-  param: any,
+const getToolListPage: (
+  page: pageRequest,
+  param?: any,
   loading?: Ref<boolean>,
-) => Promise<Result<Array<any>>> = (param: any, loading) => {
-  return get(`${prefix}/${prefix_workspace.value}/tool`, param, loading)
+) => Promise<Result<any>> = (page, param, loading) => {
+  return get(`${prefix}/${prefix_workspace.value}/tool/${page.current_page}/${page.page_size}`, param, loading)
 }
 
 export default {
-  getSharedWorkspaceKnowledge,
-  getSharedWorkspaceKnowledgePage,
-  getSharedWorkspaceModel,
-  getSharedWorkspaceModelPage,
-  getSharedWorkspaceTool,
-  getSharedWorkspaceToolPage,
-  getCESharedWorkspaceModel
+  getKnowledgeList,
+  getKnowledgeListPage,
+  getModel,
+  getToolList,
+  getToolListPage
 }

ui/src/api/shared/provider.ts

@@ -2,8 +2,6 @@ import { Result } from '@/request/Result'
 import { get, put, post, del } from '@/request/index'
 import type { pageRequest } from '@/api/type/common'
 import type { Ref } from 'vue'
-
-import useStore from '@/stores'
 const prefix = '/workspace'
 
 /**

ui/src/api/user/resource-authorization.ts …src/api/system/resource-authorization.tsui/src/api/user/resource-authorization.ts renamed to ui/src/api/system/resource-authorization.ts ui/src/api/user/resource-authorization.ts renamed to ui/src/api/system/resource-authorization.ts

@@ -17,10 +17,10 @@
               </div>
             </slot>
             <slot name="subTitle"> </slot>
-            <div class="shared" v-if="isShared">{{t('views.system.shared')}}</div>
           </div>
+
           <div class="status-tag">
-            <slot name="tag"> </slot>
+            <slot name="tag"> <!-- 放标签 --> </slot>
           </div>
         </div>
       </slot>
@@ -61,9 +61,8 @@ const props = withDefaults(
      * 是否展示icon
      */
     showIcon?: boolean
-    isShared?: boolean
   }>(),
-  { title: t('common.title'), description: '', showIcon: true, border: true, isShared: false },
+  { title: t('common.title'), description: '', showIcon: true, border: true },
 )
 
 const show = ref(false)
@@ -104,28 +103,6 @@ function subHoveredEnter() {
     }
   }
 
-  .shared {
-    position: absolute;
-    right: 20px;
-    top: 17px;
-    font-weight: 400;
-    font-size: 12px;
-    line-height: 20px;
-    color: #646a73;
-
-    &::after {
-        content: '';
-        background-color: #1f23291a;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        width: 32px;
-        height: 20px;
-        border-radius: 4px;
-      }
-  }
-
   .card-footer {
     position: absolute;
     bottom: 8px;

ui/src/api/user/user-manage.ts ui/src/api/system/user-manage.tsui/src/api/user/user-manage.ts renamed to ui/src/api/system/user-manage.ts

@@ -9,7 +9,7 @@
     />
     <div
       @click="handleSharedNodeClick"
-      v-if="!!shareTitle"
+      v-if="showShared && hasPermission(EditionConst.IS_EE, 'OR')"
       class="shared-knowledge"
       :class="currentNodeKey === 'share' && 'active'"
     >
@@ -83,6 +83,8 @@ import type { TreeInstance } from 'element-plus'
 import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue'
 import { t } from '@/locales'
 import folderApi from '@/api/folder'
+import { EditionConst } from '@/utils/permission/data'
+import { hasPermission } from '@/utils/permission/index'
 defineOptions({ name: 'FolderTree' })
 const props = defineProps({
   data: {
@@ -97,7 +99,7 @@ const props = defineProps({
     type: String,
     default: 'APPLICATION',
   },
-  isShared: {
+  showShared: {
     type: Boolean,
     default: false,
   },

ui/src/components/card-box/index.vue

@@ -47,7 +47,7 @@
 import { ref } from 'vue'
 import type { ResetCurrentUserPasswordRequest } from '@/api/type/user'
 import type { FormInstance, FormRules } from 'element-plus'
-import UserApi from '@/api/user/user-manage'
+import UserApi from '@/api/system/user-manage'
 import useStore from '@/stores'
 import { useRouter } from 'vue-router'
 import { t } from '@/locales'

ui/src/components/folder-tree/index.vue

@@ -4,9 +4,11 @@
   border-radius: var(--el-border-radius-base);
   .el-select__wrapper {
     box-shadow: none !important;
+    border-radius: var(--el-border-radius-base) 0 0 var(--el-border-radius-base);
   }
   .el-input__wrapper {
     box-shadow: none !important;
+    border-radius: 0 var(--el-border-radius-base) var(--el-border-radius-base) 0;
   }
   &__left {
     border-right: 1px solid var(--el-border-color);