Merge remote-tracking branch 'origin/v2' into v2

ui/src/components/ai-chat/index.vue

@@ -583,16 +583,17 @@ function chatMessage(chat?: any, problem?: string, re_chat?: boolean, other_para
         if (props.chatId === 'new') {
           emit('refresh', chartOpenId.value)
         }
-        if (props.type === 'debug-ai-chat') {
         getSourceDetail(chat)
-        } else {
+        // if (props.type === 'debug-ai-chat') {
-          if (
+        //   getSourceDetail(chat)
-            props.applicationDetails &&
+        // } else {
-            (props.applicationDetails.show_exec || props.applicationDetails.show_source)
+        //   if (
-          ) {
+        //     props.applicationDetails &&
-            getSourceDetail(chat)
+        //     (props.applicationDetails.show_exec || props.applicationDetails.show_source)
-          }
+        //   ) {
-        }
+        //     getSourceDetail(chat)
+        //   }
+        // }
       })
       .finally(() => {
         ChatManagement.close(chat.id)

ui/src/components/common-list/index.vue

@@ -79,7 +79,7 @@ defineExpose({
     line-height: 24px;
     &.active {
       background: var(--el-color-primary-light-9);
-      border-radius: var();
+      border-radius: var(--app-border-radius-small);
       color: var(--el-color-primary);
       font-weight: 500;
       &:hover {
@@ -87,7 +87,7 @@ defineExpose({
       }
     }
     &:hover {
-      border-radius: var();
+      border-radius: var(--app-border-radius-small);
       background: var(--app-text-color-light-1);
     }
     &.is-active {

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

@@ -377,7 +377,7 @@ onUnmounted(() => {
     margin-bottom: 4px;
     &.active {
       background: var(--el-color-primary-light-9);
-      border-radius: var();
+      border-radius: var(--app-border-radius-small);
       color: var(--el-color-primary);
       font-weight: 500;
       &:hover {
@@ -385,7 +385,7 @@ onUnmounted(() => {
       }
     }
     &:hover {
-      border-radius: var();
+      border-radius: var(--app-border-radius-small);
       background: var(--app-text-color-light-1);
     }
     &.is-active {

ui/src/components/layout-container/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="layout-container flex h-full">
-    <div :class="`layout-container__left border-r ${isCollapse ? 'hidden' : ''}`">
+    <div
+      :class="`layout-container__left border-r ${isCollapse ? 'hidden' : ''}`"
+      :style="{ width: isCollapse ? 0 : `${leftWidth}px` }"
+    >
       <div class="layout-container__left_content">
         <slot name="left"></slot>
       </div>
@@ -17,6 +20,12 @@
           :icon="isCollapse ? 'ArrowRightBold' : 'ArrowLeftBold'"
         />
       </el-tooltip>
+      <div
+        v-if="props.resizable"
+        class="splitter-bar-line"
+        :class="isResizing ? 'hover' : ''"
+        @mousedown="onSplitterMouseDown"
+      ></div>
     </div>
     <div class="layout-container__right">
       <slot></slot>
@@ -25,20 +34,56 @@
 </template>
 
 <script setup lang="ts">
-import { computed, useSlots, ref } from 'vue'
+import { onUnmounted, ref } from 'vue'
 defineOptions({ name: 'LayoutContainer' })
-const slots = useSlots()
+
 const props = defineProps({
-  header: String || null,
-  backTo: String,
   showCollapse: Boolean,
+  resizable: Boolean,
+  minLeftWidth: {
+    type: Number,
+    default: 240,
+  },
+  maxLeftWidth: {
+    type: Number,
+    default: 400,
+  },
 })
 
 const isCollapse = ref(false)
+const leftWidth = ref(props.minLeftWidth)
+const isResizing = ref(false)
 
-const showBack = computed(() => {
+const onSplitterMouseDown = (e: MouseEvent) => {
-  const { backTo } = props
+  if (!props.resizable) return
-  return backTo
+  e.preventDefault()
+  isResizing.value = true
+  document.body.style.userSelect = 'none'
+  const startX = e.clientX
+  const startWidth = leftWidth.value
+  const onMouseMove = (moveEvent: MouseEvent) => {
+    if (!isResizing.value) return
+    const deltaX = moveEvent.clientX - startX
+    let newWidth = startWidth + deltaX
+
+    // 限制宽度在最小和最大值之间
+    newWidth = Math.max(props.minLeftWidth, Math.min(props.maxLeftWidth, newWidth))
+    leftWidth.value = newWidth
+  }
+
+  const onMouseUp = () => {
+    isResizing.value = false
+    document.body.style.userSelect = ''
+    document.removeEventListener('mousemove', onMouseMove)
+    document.removeEventListener('mouseup', onMouseUp)
+  }
+  document.addEventListener('mousemove', onMouseMove)
+  document.addEventListener('mouseup', onMouseUp)
+}
+
+onUnmounted(() => {
+  document.removeEventListener('mousemove', () => {})
+  document.removeEventListener('mouseup', () => {})
 })
 </script>
 
@@ -47,17 +92,34 @@ const showBack = computed(() => {
   &__left {
     position: relative;
     box-sizing: border-box;
-    transition: width 0.28s;
+    // transition: width 0.28s;
     width: var(--sidebar-width);
-    min-width: var(--sidebar-width);
+    .splitter-bar-line {
-    box-sizing: border-box;
+      z-index: 1;
+      position: absolute;
+      top: 0;
+      right: 0;
+      cursor: col-resize;
+      width: 4px;
+      height: 100%;
+      &.hover:after {
+        width: 1px;
+        height: 100%;
+        content: '';
+        z-index: 2;
+        position: absolute;
+        right: -1px;
+        top: 0;
+        background: var(--el-color-primary);
+      }
+    }
 
     .collapse {
       position: absolute;
       top: 36px;
       right: -12px;
       box-shadow: 0px 5px 10px 0px var(--app-text-color-light-1);
-      z-index: 1;
+      z-index: 2;
     }
 
     .layout-container__left_content {

ui/src/views/application/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <LayoutContainer showCollapse class="application-manage">
+  <LayoutContainer showCollapse resizable class="application-manage">
     <template #left>
       <h4 class="p-12-16 pb-0 mt-12">{{ $t('views.application.title') }}</h4>
 

ui/src/views/knowledge/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <LayoutContainer showCollapse class="knowledge-manage">
+  <LayoutContainer showCollapse resizable class="knowledge-manage">
     <template #left>
       <h4 class="p-12-16 pb-0 mt-12">{{ $t('views.knowledge.title') }}</h4>
 

ui/src/views/model/component/Provider.vue

@@ -160,12 +160,12 @@ const handleSharedNodeClick = () => {
     padding: 10px 8px;
     font-weight: 400;
     &:hover {
-      border-radius: var();
+      border-radius: var(--app-border-radius-small);
       background: var(--app-text-color-light-1);
     }
   }
   .all-mode-active {
-    border-radius: var();
+    border-radius: var(--app-border-radius-small);
     color: var(--el-color-primary);
     font-weight: 500 !important;
     background: var(--el-color-primary-light-9);
@@ -185,7 +185,7 @@ const handleSharedNodeClick = () => {
       background: none;
       &:hover {
         background: var(--app-text-color-light-1);
-        border-radius: var();
+        border-radius: var(--app-border-radius-small);
       }
     }
     :deep(.el-collapse-item) {
@@ -211,7 +211,7 @@ const handleSharedNodeClick = () => {
     margin-bottom: 4px;
     &.active {
       background: var(--el-color-primary-light-9);
-      border-radius: var();
+      border-radius: var(--app-border-radius-small);
       color: var(--el-color-primary);
       font-weight: 500;
       &:hover {
@@ -219,7 +219,7 @@ const handleSharedNodeClick = () => {
       }
     }
     &:hover {
-      border-radius: var();
+      border-radius: var(--app-border-radius-small);
       background: var(--app-text-color-light-1);
     }
     &.is-active {

ui/src/views/tool/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <LayoutContainer showCollapse class="tool-manage">
+  <LayoutContainer showCollapse resizable class="tool-manage">
     <template #left>
       <h4 class="p-12-16 pb-0 mt-12">{{ $t('views.tool.title') }}</h4>