From 6a28769feba807f21c39c8a5ef6e721a25703420 Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Wed, 21 Feb 2024 01:03:32 -0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E5=AD=97=E6=AE=B5=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/src/DataSourceRemoteForm.vue   | 34 ++++++++++---------
 .../datasource/src/DataSourceRemotePanel.vue  | 17 +++++-----
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRemoteForm.vue b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
index e38cc11217..d54f7ec4c7 100644
--- a/packages/plugins/datasource/src/DataSourceRemoteForm.vue
+++ b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
@@ -8,27 +8,20 @@
     :rules="rules"
     validate-type="text"
   >
-    <!-- <tiny-form-item label="名称" prop="name">
-      <tiny-input v-model="state.serviceForm.name" placeholder="只能包含数字字母及下划线"></tiny-input>
-    </tiny-form-item> -->
-
-    <tiny-form-item label="描述" prop="description">
-      <tiny-input v-model="state.serviceForm.description" placeholder="请输入"></tiny-input>
-    </tiny-form-item>
-
     <tiny-form-item label="请求地址" prop="uri">
       <div class="textarea-warp">
+        <tiny-select class="selectResType" v-model="state.serviceForm.method" placeholder="请选择">
+          <tiny-option v-for="item in state.requestData" :key="item.value" :label="item.value" :value="item.value">
+          </tiny-option>
+        </tiny-select>
         <tiny-input class="border-input" v-model="state.serviceForm.uri" resize="none" placeholder="请输入">
-          <template #prepend>
-            <tiny-select class="selectResType" v-model="state.serviceForm.method" placeholder="请选择">
-              <tiny-option v-for="item in state.requestData" :key="item.value" :label="item.value" :value="item.value">
-              </tiny-option>
-            </tiny-select>
-          </template>
           <template #append><a class="requestBtn" type="info" @click="$emit('sendRequest')">发送请求</a></template>
         </tiny-input>
       </div>
     </tiny-form-item>
+    <tiny-form-item label="描述" prop="description">
+      <tiny-input v-model="state.serviceForm.description" placeholder="请输入"></tiny-input>
+    </tiny-form-item>
   </tiny-form>
 </template>
 
@@ -70,6 +63,7 @@ export default {
 
     watchEffect(() => {
       state.serviceForm = props.modelValue
+      state.serviceForm.method = state.serviceForm.method || state.requestData[0].value
     })
 
     const rules = {
@@ -119,9 +113,11 @@ export default {
         }
       }
     }
-    :deep(.tiny-input-display-only) {
+    :deep(.tiny-input-suffix) {
+      width: 100px;
       .tiny-input__inner {
-        border-left: none;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
       }
     }
     :deep(.tiny-input-group__append) {
@@ -131,6 +127,12 @@ export default {
     .requestBtn {
       color: var(--ti-lowcode-datasource-respones-border-color-bg);
     }
+    :deep(.border-input) {
+      input {
+        border-radius: 0;
+        border-left: none;
+      }
+    }
   }
   .tiny-button-group {
     width: 100%;
diff --git a/packages/plugins/datasource/src/DataSourceRemotePanel.vue b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
index 3d68648b3e..78bed17f5a 100644
--- a/packages/plugins/datasource/src/DataSourceRemotePanel.vue
+++ b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
@@ -46,7 +46,7 @@ import DataSourceRemoteAutoload from './DataSourceRemoteAutoload.vue'
 import DataSourceRemoteAdapter from './DataSourceRemoteDataAdapter.vue'
 import DataSrouceRemoteDataResult, { getResponseData } from './DataSourceRemoteDataResult.vue'
 import { open as openRemoteMapping } from './DataSourceRemoteMapping.vue'
-import { useModal, useDataSource, useNotify } from '@opentiny/tiny-engine-controller'
+import { useDataSource, useNotify } from '@opentiny/tiny-engine-controller'
 import { isEmptyObject } from '@opentiny/vue-renderless/common/type'
 import { obj2String, string2Obj } from '@opentiny/tiny-engine-controller/adapter'
 import { getRequest } from './js/datasource'
@@ -94,7 +94,6 @@ export default {
   emits: ['confirm'],
   setup(props, { emit }) {
     const dataSourceRemoteAdapteRef = ref(null)
-    const { confirm } = useModal()
     const { dataSourceState } = useDataSource()
 
     const state = reactive({
@@ -156,14 +155,16 @@ export default {
     }
 
     const sendRequest = async () => {
-      const valid = await getServiceForm().validate()
+      let valid = false
 
-      if (!valid) {
-        confirm({
-          title: '提示',
-          message: '请求地址和请求方式必填！！！'
-        })
+      try {
+        // await validate() 如果验证不通过会抛出异常，而不是返回 false
+        valid = await getServiceForm().validate()
+      } catch (error) {
+        /* empty */
+      }
 
+      if (!valid) {
         return
       }
 

From 22547303488620c2350e644eb91510f19963dd56 Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Wed, 21 Feb 2024 01:30:28 -0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E8=BF=9C=E7=A8=8B=E5=AD=97=E6=AE=B5=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?label?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/datasource/src/DataSourceRemoteForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/datasource/src/DataSourceRemoteForm.vue b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
index d54f7ec4c7..622fc3993e 100644
--- a/packages/plugins/datasource/src/DataSourceRemoteForm.vue
+++ b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
@@ -19,7 +19,7 @@
         </tiny-input>
       </div>
     </tiny-form-item>
-    <tiny-form-item label="描述" prop="description">
+    <tiny-form-item label="请求描述" prop="description">
       <tiny-input v-model="state.serviceForm.description" placeholder="请输入"></tiny-input>
     </tiny-form-item>
   </tiny-form>

From 6df2ee85e9aebd5c879a8fecaabae37362a130bd Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Wed, 21 Feb 2024 17:46:35 -0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E5=AD=97=E6=AE=B5=E4=B8=AD=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A6=82=E6=9E=9C=E5=87=BA=E9=94=99=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E4=B8=8D=E9=80=9A=E7=9F=A5=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/datasource/src/js/datasource.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/datasource/src/js/datasource.js b/packages/plugins/datasource/src/js/datasource.js
index 27184f40f9..a41b44c420 100644
--- a/packages/plugins/datasource/src/js/datasource.js
+++ b/packages/plugins/datasource/src/js/datasource.js
@@ -82,9 +82,10 @@ export const getRequest = (config) => {
   }
 
   const errorHandler = (error) => {
-    createFn(config.errorHandler.value)(error)
+    const reject = createFn(config.errorHandler.value)(error)
     dataSource.status = 'error'
     dataSource.error = error
+    return reject
   }
 
   http.interceptors.request.use(willFetch, errorHandler)

From 9043d46bbce246f176b17661314267f00f6051e4 Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Wed, 21 Feb 2024 19:37:20 -0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96tiny-select=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/src/DataSourceRemoteForm.vue   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRemoteForm.vue b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
index 622fc3993e..f011777ea1 100644
--- a/packages/plugins/datasource/src/DataSourceRemoteForm.vue
+++ b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
@@ -10,9 +10,12 @@
   >
     <tiny-form-item label="请求地址" prop="uri">
       <div class="textarea-warp">
-        <tiny-select class="selectResType" v-model="state.serviceForm.method" placeholder="请选择">
-          <tiny-option v-for="item in state.requestData" :key="item.value" :label="item.value" :value="item.value">
-          </tiny-option>
+        <tiny-select
+          class="selectResType"
+          v-model="state.serviceForm.method"
+          placeholder="请选择"
+          :options="state.requestData"
+        >
         </tiny-select>
         <tiny-input class="border-input" v-model="state.serviceForm.uri" resize="none" placeholder="请输入">
           <template #append><a class="requestBtn" type="info" @click="$emit('sendRequest')">发送请求</a></template>
@@ -27,7 +30,7 @@
 
 <script>
 import { reactive, watchEffect, ref } from 'vue'
-import { Form, FormItem, Input, Select, Option } from '@opentiny/vue'
+import { Form, FormItem, Input, Select } from '@opentiny/vue'
 
 const serviceFormRef = ref(null)
 
@@ -40,8 +43,7 @@ export default {
     TinyForm: Form,
     TinyFormItem: FormItem,
     TinyInput: Input,
-    TinySelect: Select,
-    TinyOption: Option
+    TinySelect: Select
   },
   props: {
     modelValue: {
@@ -53,11 +55,11 @@ export default {
     const state = reactive({
       serviceForm: {},
       requestData: [
-        { text: 'JSONP', value: 'JSONP' },
-        { text: 'GET', value: 'GET' },
-        { text: 'POST', value: 'POST' },
-        { text: 'PUT', value: 'PUT' },
-        { text: 'DELETE', value: 'DELETE' }
+        { label: 'JSONP', value: 'JSONP' },
+        { label: 'GET', value: 'GET' },
+        { label: 'POST', value: 'POST' },
+        { label: 'PUT', value: 'PUT' },
+        { label: 'DELETE', value: 'DELETE' }
       ]
     })
 
@@ -67,8 +69,8 @@ export default {
     })
 
     const rules = {
-      uri: [{ required: true, message: '必填', trigger: 'change' }],
-      method: { required: true, message: '必选', trigger: 'change' }
+      uri: [{ required: true, message: '必填', trigger: ['change', 'blur'] }],
+      method: { required: true, message: '必选', trigger: ['change', 'blur'] }
     }
 
     return {

From 8083b2577459b186d490996ba54a448029d3805f Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Wed, 21 Feb 2024 23:56:35 -0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/datasource/src/DataSourceRemotePanel.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRemotePanel.vue b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
index 78bed17f5a..11028c634a 100644
--- a/packages/plugins/datasource/src/DataSourceRemotePanel.vue
+++ b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
@@ -155,16 +155,10 @@ export default {
     }
 
     const sendRequest = async () => {
-      let valid = false
-
       try {
         // await validate() 如果验证不通过会抛出异常，而不是返回 false
-        valid = await getServiceForm().validate()
+        await getServiceForm().validate()
       } catch (error) {
-        /* empty */
-      }
-
-      if (!valid) {
         return
       }