From a9de2914cf5c8e521303761e01bb131a7282e23b Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Wed, 18 Oct 2023 19:55:33 -0700
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=8F=92=E4=BB=B6=E6=A0=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=8D=A2=E5=8C=BA=E8=BF=9C=E7=A8=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=9B=B4=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  |  1 +
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRemoteForm.vue b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
index e38cc11217..20faafd960 100644
--- a/packages/plugins/datasource/src/DataSourceRemoteForm.vue
+++ b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
@@ -8,19 +8,11 @@
     :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-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-select class="selectResType" v-model="state.serviceForm.medthod" placeholder="请选择">
               <tiny-option v-for="item in state.requestData" :key="item.value" :label="item.value" :value="item.value">
               </tiny-option>
             </tiny-select>
@@ -29,6 +21,9 @@
         </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>
 
@@ -76,7 +71,6 @@ export default {
       uri: [{ required: true, message: '必填', trigger: 'change' }],
       method: { required: true, message: '必选', trigger: 'change' }
     }
-
     return {
       state,
       rules,
@@ -167,4 +161,24 @@ export default {
     line-height: 30px;
   }
 }
+:deep(.is-error) {
+  .tiny-input-group__prepend {
+    border-color: var(--ti-form-item-error-border-color) !important;
+    background-color: var(--ti-form-item-error-bg-color) !important;
+    border-right: 1px solid var(--ti-lowcode-datasource-select-border-right-color-bg) !important;
+  }
+  .tiny-input__inner {
+    border-right: none;
+    border-color: var(--ti-form-item-error-border-color) !important;
+  }
+  .tiny-input .tiny-input__inner:hover {
+    border-color: var(--ti-form-item-error-border-color) !important;
+  }
+}
+:deep(.tiny-input .tiny-input__inner:hover) {
+  border-color: var(--ti-lowcode-datasource-select-border-right-color-bg);
+}
+:deep(.tiny-input .tiny-input__inner:focus) {
+  border-color: var(--ti-lowcode-datasource-select-border-right-color-bg);
+}
 </style>
diff --git a/packages/plugins/datasource/src/DataSourceRemotePanel.vue b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
index e726a2338e..a641a0653a 100644
--- a/packages/plugins/datasource/src/DataSourceRemotePanel.vue
+++ b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
@@ -111,6 +111,7 @@ export default {
       (value) => {
         const { willFetch, dataHandler, shouldFetch, errorHandler, columns } = value
         state.remoteData.options = { ...value?.options } || {}
+        state.remoteData.options.medthod = value.medthod || 'JSONP'
         state.remoteData.options.params = obj2String(value?.options?.params)
         state.responseData.willFetch = willFetch?.value || ''
         state.responseData.dataHandler = dataHandler?.value || ''

From 4afdf8fb3120cb4cdfbddeb48405921a9d9e8792 Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Wed, 1 Nov 2023 18:07:46 -0700
Subject: [PATCH 2/2] =?UTF-8?q?fix(data-panel):=E6=8F=92=E4=BB=B6=E6=A0=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8D=A2=E5=8C=BA=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/datasource/src/DataSourceRemoteForm.vue  | 2 +-
 packages/plugins/datasource/src/DataSourceRemotePanel.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRemoteForm.vue b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
index 20faafd960..e9c38eca8e 100644
--- a/packages/plugins/datasource/src/DataSourceRemoteForm.vue
+++ b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
@@ -12,7 +12,7 @@
       <div class="textarea-warp">
         <tiny-input class="border-input" v-model="state.serviceForm.uri" resize="none" placeholder="请输入">
           <template #prepend>
-            <tiny-select class="selectResType" v-model="state.serviceForm.medthod" placeholder="请选择">
+            <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>
diff --git a/packages/plugins/datasource/src/DataSourceRemotePanel.vue b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
index a641a0653a..4bce4cbf6b 100644
--- a/packages/plugins/datasource/src/DataSourceRemotePanel.vue
+++ b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
@@ -111,7 +111,7 @@ export default {
       (value) => {
         const { willFetch, dataHandler, shouldFetch, errorHandler, columns } = value
         state.remoteData.options = { ...value?.options } || {}
-        state.remoteData.options.medthod = value.medthod || 'JSONP'
+        state.remoteData.options.method = value.method || 'JSONP'
         state.remoteData.options.params = obj2String(value?.options?.params)
         state.responseData.willFetch = willFetch?.value || ''
         state.responseData.dataHandler = dataHandler?.value || ''