Merge remote-tracking branch 'upstream/main' into chore/i18n-patch-1

Author: guqing

apps/setting/models_provider/impl/siliconCloud_model_provider/icon/siliconCloud_icon_svg

@@ -1,4 +1,4 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_10835_2)">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M20.4785 0H18.7463C13.203 0 10.0078 3.54162 10.0078 8.96931V9.9C9.36946 9.71693 8.70867 9.62403 8.04462 9.624C4.11139 9.62377 0.92308 12.8123 0.92308 16.7453C0.92308 20.6785 4.11139 23.8668 8.04462 23.8668C11.9779 23.8668 15.1662 20.6785 15.1662 16.7453C15.1662 16.2669 15.1179 15.7899 15.0224 15.321H20.4785C21.915 15.3157 23.0769 14.1496 23.0769 12.7131C23.0769 11.2763 21.915 10.1102 20.4785 10.1049H15.0508V8.73831C15.0508 6.65954 16.5519 5.15838 18.7463 5.15838H20.4785C21.8878 5.13692 23.0192 3.98862 23.0192 2.57908C23.0192 1.16977 21.8878 0.0212308 20.4785 0ZM10.1619 16.7453C10.1619 16.1838 9.93885 15.6452 9.54178 15.2481C9.14471 14.8511 8.60616 14.628 8.04462 14.628C7.48307 14.628 6.94453 14.8511 6.54746 15.2481C6.15038 15.6452 5.92731 16.1838 5.92731 16.7453C5.92731 17.3069 6.15038 17.8454 6.54746 18.2425C6.94453 18.6395 7.48307 18.8626 8.04462 18.8626C8.60616 18.8626 9.14471 18.6395 9.54178 18.2425C9.93885 17.8454 10.1619 17.3069 10.1619 16.7453Z" fill="#8358F6"/>
 </g>

ui/src/components/ai-chat/component/chat-input-operate/index.vue

@@ -51,40 +51,7 @@
                 </div>
               </el-card>
             </el-col>
-            <el-col
-              :xs="24"
-              :sm="12"
-              :md="12"
-              :lg="12"
-              :xl="12"
-              class="mb-8"
-              v-for="(item, index) in uploadImageList"
-              :key="index"
-            >
-              <div
-                class="file cursor border border-r-4"
-                v-if="item.url"
-                @mouseenter.stop="mouseenter(item)"
-                @mouseleave.stop="mouseleave()"
-              >
-                <div
-                  @click="deleteFile(index, 'image')"
-                  class="delete-icon color-secondary"
-                  v-if="showDelete === item.url"
-                >
-                  <el-icon>
-                    <CircleCloseFilled />
-                  </el-icon>
-                </div>
-                <el-image
-                  :src="item.url"
-                  alt=""
-                  fit="cover"
-                  style="width: 40px; height: 40px; display: block"
-                  class="border-r-4"
-                />
-              </div>
-            </el-col>
+
             <el-col
               :xs="24"
               :sm="12"
@@ -118,6 +85,33 @@
               </el-card>
             </el-col>
           </el-row>
+          <div class="flex">
+            <template v-for="(item, index) in uploadImageList" :key="index">
+              <div
+                class="file cursor border border-r-4 mr-8"
+                v-if="item.url"
+                @mouseenter.stop="mouseenter(item)"
+                @mouseleave.stop="mouseleave()"
+              >
+                <div
+                  @click="deleteFile(index, 'image')"
+                  class="delete-icon color-secondary"
+                  v-if="showDelete === item.url"
+                >
+                  <el-icon>
+                    <CircleCloseFilled />
+                  </el-icon>
+                </div>
+                <el-image
+                  :src="item.url"
+                  alt=""
+                  fit="cover"
+                  style="width: 40px; height: 40px; display: block"
+                  class="border-r-4"
+                />
+              </div>
+            </template>
+          </div>
         </div>
       </el-scrollbar>
       <div class="flex">

ui/src/locales/lang/en-US/views/application-workflow.ts

@@ -1,6 +1,6 @@
 export default {
   node: 'Node',
-  baseComponent: 'Base Component',
+  baseComponent: 'Base',
   nodeSetting: 'Node Settings',
   workflow: 'Workflow',
   searchBar: {
@@ -18,7 +18,8 @@ export default {
     releaseHistory: 'Release History',
     autoSave: 'Auto Save',
     latestRelease: 'Latest Release',
-    copyParam: 'Copy Parameters'
+    copyParam: 'Copy Parameters',
+    debug: 'Run',
   },
   tip: {
     publicSuccess: 'Published successfully',
@@ -114,7 +115,7 @@ export default {
       is_hit_handling_method_list: 'List of segments that meet direct response criteria',
       result: 'Search Result',
       directly_return: 'Content of segments that meet direct response criteria',
-      selectDatasetText: 'Associated knowledge displayed here',
+      selectDatasetText: 'Related knowledge displayed here',
       searchParam: 'Search Parameters',
       searchQuestion: {
         label: 'Search Question',

ui/src/locales/lang/zh-CN/views/application-workflow.ts

@@ -18,7 +18,8 @@ export default {
     releaseHistory: '发布历史',
     autoSave: '自动保存',
     latestRelease: '最近发布',
-    copyParam: '复制参数'
+    copyParam: '复制参数',
+    debug: '调试',
   },
   tip: {
     publicSuccess: '发布成功',

ui/src/locales/lang/zh-Hant/views/application-workflow.ts

@@ -18,7 +18,8 @@ export default {
     releaseHistory: '發布歷史',
     autoSave: '自動保存',
     latestRelease: '最近發布',
-    copyParam: '複製參數'
+    copyParam: '複製參數',
+    debug: '調試',
   },
   tip: {
     publicSuccess: '發布成功',

ui/src/views/application-workflow/index.vue

@@ -30,7 +30,7 @@
         <el-button icon="Plus" @click="showPopover = !showPopover"> {{ $t('views.applicationWorkflow.setting.addComponent') }} </el-button>
         <el-button @click="clickShowDebug" :disabled="showDebug">
           <AppIcon iconName="app-play-outlined" class="mr-4"></AppIcon>
-          {{ $t('common.debug') }}</el-button
+          {{ $t('views.applicationWorkflow.setting.debug') }}</el-button
         >
         <el-button @click="saveApplication(true)">
           <AppIcon iconName="app-save-outlined" class="mr-4"></AppIcon>