Переглянути джерело

fix: 增加查询数据-接口

liuc 7 місяців тому
батько
коміт
f56097584f

+ 25 - 2
src/views/flow/setting/queryService.vue

@@ -17,6 +17,10 @@
             <a @click="() => edit(record)">编辑</a>
           </div>
         </template>
+        <template v-if="column.dataIndex === 'queryType'">
+          <span v-show="text=='0'">SQL</span>
+          <span v-show="text=='1'">接口</span>
+        </template>
       </template>
     </a-table>
 
@@ -34,10 +38,23 @@
         </a-col>
       </a-row>
       <a-row class="top-row">
-        <a-col :span="2"> 查询SQL</a-col>
+        <a-col :span="2"> 查询类型</a-col>
         <a-col :span="22">
+          <a-radio-group v-model:value="record.queryType">
+            <a-radio-button value="0">SQL</a-radio-button>
+            <a-radio-button value="1">接口</a-radio-button>
+          </a-radio-group>
+        </a-col>
+      </a-row>
+      <a-row class="top-row">
+        <a-col v-show="record.queryType=='0'" :span="2"> 查询SQL</a-col>
+        <a-col v-show="record.queryType=='1'" :span="2"> 查询接口</a-col>
+        <a-col v-show="record.queryType=='0'" :span="22">
           <a-textarea v-model:value="record.querySql" :rows="8"></a-textarea>
         </a-col>
+        <a-col v-show="record.queryType=='1'" :span="22">
+          <a-input v-model:value="record.querySql"  placeholder="示例(全局搜索后端“/queryTest”):/setting/engine/queryTest" ></a-input>
+        </a-col>
       </a-row>
       <a-button class="addBtn" @click="addChild">新增子项</a-button>
       <a-table size="small" :columns="columnsZi" :data-source="dataZi" bordered :pagination="false">
@@ -112,7 +129,12 @@ const columns = [
     width: '20%',
   },
   {
-    title: '查询服务SQL',
+    title: '查询服务类型',
+    dataIndex: 'queryType',
+    width: '20%',
+  },
+  {
+    title: '查询服务SQL/接口',
     dataIndex: 'querySql',
     width: '30%',
   },
@@ -169,6 +191,7 @@ export default {
       this.record = {
         queryName: '',
         queryCode: '',
+        queryType: '',
         querySql: '',
         queryColumnList: [
           {

+ 4 - 2
src/views/flow/stFormDesign/packages/PopUpMapping/index.vue

@@ -42,8 +42,10 @@
             </div>
             <a-popover placement="leftBottom">
               <template #content>
-                <p>例:select * from table t1 where t1.code='需要映射值' </p>
-                <p> 查询Key的值:${t1.code}</p>
+                <p>SQL例:select * from table t1 where t1.code='需要映射值' </p>
+                <p>SQL查询Key的值:${t1.code}</p>
+                <p>接口例:/setting/queryTest?code=01 </p>
+                <p>接口查询Key的值:code</p>
               </template>
               <template #title>
                 <span>Key格式</span>

+ 1 - 0
src/views/flow/stFormDesign/packages/PopUpQueryGlobal/index.vue

@@ -71,6 +71,7 @@
 import {getPopUpData, getQueryPopupData} from '/@/api/flow/settingApi'
 import {isMobile} from '/@/utils'
 import {DownOutlined, UpOutlined} from '@ant-design/icons-vue';
+import {formGet} from "/@/api/flow/formApi.js";
 
 export default {
   data() {