外部服务

src/views/manage/service/complex-params.vue

@@ -35,6 +35,9 @@
         <div class="request-params">
           <div style="margin-bottom: 10px; display: flex">
             <CusButton type="main" title="新增" @click="state.params.data.push({type: '2'})"/>
+            <div class="tips" style="margin: 0 10px">
+              为了保证数据结构准确，提交时将默认触发“<span style="color: var(--cus-main-color)">逆向生成JSON结构</span>”
+            </div>
             <CusButton type="main" title="正向解析JSON结构" style="margin-left: auto" @click="jsonToTable"/>
             <CusButton type="main" title="逆向生成JSON结构" @click="tableToJson"/>
           </div>
@@ -123,7 +126,7 @@ const onSubmit = () => {
   }
   tableToJson()
   setTimeout(() => {
-    let flag = state.params.data.every(v => proxy.$util.isValue(v.key) && proxy.$util.isValue(v.value))
+    let flag = state.params.data.every(v => proxy.$util.isValue(v.key) && proxy.$util.isValue(v.value) && proxy.$util.isValue(v.label))
     if (!flag) {
       ElMessage.error('请完善参数信息！')
       return
@@ -201,4 +204,11 @@ const initDictionary = () => {
     flex-direction: column;
   }
 }
+.tips {
+  background-color: rgba(var(--cus-main-color-rgb), 0.1);
+  border-radius: 6px;
+  padding: 7px;
+  margin-bottom: 10px;
+  width: 100%;
+}
 </style>

src/views/manage/service/detail.vue

@@ -197,49 +197,51 @@
                   <CusButton type="main" title="逆向生成JSON结构" @click="tableToJson"/>
                 </template>
               </div>
-              <CusTable
-                :data="state.params.requestBody.data"
-                :table-head="state.params.requestBody.tableHead"
-                :no-page="true"
-              >
-                <template #key-column-value="{scope}">
-                  <CusFormColumn
-                    class="__cus-table-form-column"
-                    :span="24"
-                    v-model:param="scope.row.key"
-                  />
-                </template>
-                <template #type-column-value="{scope}">
-                  <CusFormColumn
-                    class="__cus-table-form-column"
-                    :span="24"
-                    v-model:param="scope.row.type"
-                    link="select"
-                    :options="['RAW_JSON', 'RAW_TEXT', 'RAW_XML', 'RAW_HTML'].includes(state.params.requestBody.type) ? DictionaryStore.requestParamsList.filter(v => v.dictValue != 3) : DictionaryStore.requestParamsList"
-                    :clearable="false"
-                    @change="(val) => (scope.row.value = '', scope.row.valueTable = [])"
-                  />
-                </template>
-                <template #value-column-value="{scope}">
-                  <CusFormColumn
-                    class="__cus-table-form-column"
-                    :span="24"
-                    v-model:param="scope.row.value"
-                    :readonly="scope.row.type == 3"
-                    @click="onClickComplexRequestBody(scope.row, scope.$index)"
-                  />
-                </template>
-                <template #label-column-value="{scope}">
-                  <CusFormColumn
-                    class="__cus-table-form-column"
-                    :span="24"
-                    v-model:param="scope.row.label"
-                  />
-                </template>
-                <template #do-column-value="{scope}">
-                  <CusButton v-if="state.params.requestBody.data.length > 1" type="table-del" @click="state.params.requestBody.data.splice(scope.$index, 1)"/>
-                </template>
-              </CusTable>
+              <div class="flex: 1; overflow: hidden;">
+                <CusTable
+                  :data="state.params.requestBody.data"
+                  :table-head="state.params.requestBody.tableHead"
+                  :no-page="true"
+                >
+                  <template #key-column-value="{scope}">
+                    <CusFormColumn
+                      class="__cus-table-form-column"
+                      :span="24"
+                      v-model:param="scope.row.key"
+                    />
+                  </template>
+                  <template #type-column-value="{scope}">
+                    <CusFormColumn
+                      class="__cus-table-form-column"
+                      :span="24"
+                      v-model:param="scope.row.type"
+                      link="select"
+                      :options="['RAW_JSON', 'RAW_TEXT', 'RAW_XML', 'RAW_HTML'].includes(state.params.requestBody.type) ? DictionaryStore.requestParamsList.filter(v => v.dictValue != 3) : DictionaryStore.requestParamsList"
+                      :clearable="false"
+                      @change="(val) => (scope.row.value = '', scope.row.valueTable = [])"
+                    />
+                  </template>
+                  <template #value-column-value="{scope}">
+                    <CusFormColumn
+                      class="__cus-table-form-column"
+                      :span="24"
+                      v-model:param="scope.row.value"
+                      :readonly="scope.row.type == 3"
+                      @click="onClickComplexRequestBody(scope.row, scope.$index)"
+                    />
+                  </template>
+                  <template #label-column-value="{scope}">
+                    <CusFormColumn
+                      class="__cus-table-form-column"
+                      :span="24"
+                      v-model:param="scope.row.label"
+                    />
+                  </template>
+                  <template #do-column-value="{scope}">
+                    <CusButton v-if="state.params.requestBody.data.length > 1" type="table-del" @click="state.params.requestBody.data.splice(scope.$index, 1)"/>
+                  </template>
+                </CusTable>
+              </div>
             </template>
           </div>
         </template>
@@ -652,7 +654,7 @@ const onSubmit = () => {
   ref_form.value.submit().then(() => {
     const params = {...state.form}
     // requestParams
-    if (!state.params.requestParams.data.every(v => proxy.$util.isValue(v.key) && proxy.$util.isValue(v.value))) {
+    if (!state.params.requestParams.data.every(v => proxy.$util.isValue(v.key) && proxy.$util.isValue(v.value) && proxy.$util.isValue(v.label))) {
       ElMessage.error('请完善Request Params参数信息！')
       state.params.tab = 1
       return
@@ -660,14 +662,14 @@ const onSubmit = () => {
     params.requestParams = state.params.requestParams.data.length > 0 ? JSON.stringify(state.params.requestParams.data) : null
     if (state.form.pluginType === 'http') {
       // requestHeaders
-      if (!state.params.requestHeaders.data.every(v => proxy.$util.isValue(v.key) && proxy.$util.isValue(v.value))) {
+      if (!state.params.requestHeaders.data.every(v => proxy.$util.isValue(v.key) && proxy.$util.isValue(v.value) && proxy.$util.isValue(v.label))) {
         ElMessage.error('请完善Request Headers参数信息！')
         state.params.tab = 2
         return
       }
       params.requestHeaders = state.params.requestHeaders.data.length > 0 ? JSON.stringify(state.params.requestHeaders.data) : null
       // requestBody
-      if (!state.params.requestBody.data.every(v => proxy.$util.isValue(v.key) && proxy.$util.isValue(v.value) && proxy.$util.isValue(v.type) && (v.type != 3 || v.type == 3 && v.valueTable.length > 0))) {
+      if (!state.params.requestBody.data.every(v => proxy.$util.isValue(v.key) && proxy.$util.isValue(v.value) && proxy.$util.isValue(v.label) && proxy.$util.isValue(v.type) && (v.type != 3 || v.type == 3 && v.valueTable.length > 0))) {
         ElMessage.error('请完善Request Body参数信息！')
         state.params.tab = 3
         return

src/views/manage/theme/relation-detail.vue

@@ -40,11 +40,11 @@
         <CusFormColumn
           :span="12"
           label="主显字段"
-          v-model:param="state.form.mainFieldId"
+          v-model:param="state.form.mainField"
           link="select"
           :options="state.textOptions"
           label-key="fieldNameCn"
-          value-key="id"
+          value-key="fieldNameEn"
         />
         <CusFormColumn
           :span="12"
@@ -99,87 +99,89 @@
           />
         </template>
         <el-col v-else :span="12"/>
-        <el-col :span="12">
-          <div class="__cus-title_1">数据条件</div>
-          <CusTable
-            :data="state.conditionTable.data"
-            :table-head="state.conditionTable.tableHead"
-            :no-page="true"
-          >
-            <template #indexParam-column-value="{scope}">
-              <CusFormColumn
-                class="__cus-table-form-column"
-                required
-                :span="24"
-                v-model:param="scope.row.indexParam"
-                link="select"
-                :options="state.textOptions"
-                label-key="fieldNameCn"
-                value-key="fieldNameEn"
-              />
-            </template>
-            <template #condition-column-value="{scope}">
-              <CusFormColumn
-                class="__cus-table-form-column"
-                required
-                :span="24"
-                v-model:param="scope.row.condition"
-                link="select"
-                :options="DictionaryStore.conditionTypeList"
-              />
-            </template>
-            <template #do-header-value="{scope}">
-              <CusFormColumn
-                class="__cus-table-form-column"
-                :span="24"
-                v-model:param="state.conditionTable.selectValue"
-                link="select"
-                :options="transfer.conditionOptions.filter(v => state.conditionTable.data.every(s => s.themeParam !== v)).map(v => ({dictLabel: v, dictValue:  v}))"
-                @change="handleChangeCondition"
-              />
-            </template>
-            <template #do-column-value="{scope}">
-              <CusButton type="table-del" @click="state.conditionTable.data.splice(scope.$index, 1)"/>
-            </template>
-          </CusTable>
-        </el-col>
-        <el-col :span="12" style="padding-left: 20px">
-          <div class="__cus-title_1">数据排序</div>
-          <CusTable
-            :data="state.sortTable.data"
-            :table-head="state.sortTable.tableHead"
-            :no-page="true"
-          >
-            <template #sortParam-column-value="{scope}">
-              <CusFormColumn
-                class="__cus-table-form-column"
-                required
-                :span="24"
-                v-model:param="scope.row.sortParam"
-                link="select"
-                :options="state.textOptions"
-                label-key="fieldNameCn"
-                value-key="fieldNameEn"
-              />
-            </template>
-            <template #sortType-column-value="{scope}">
-              <CusFormColumn
-                class="__cus-table-form-column"
-                required
-                :span="24"
-                v-model:param="scope.row.sortType"
-                link="select"
-                :options="DictionaryStore.sortTypeList"
-              />
-            </template>
-            <template #do-header-value="{scope}">
-              <CusButton title="新增" @click="state.sortTable.data.push({sortParam: '', sortType: ''})"/>
-            </template>
-            <template #do-column-value="{scope}">
-              <CusButton type="table-del" @click="state.sortTable.data.splice(scope.$index, 1)"/>
-            </template>
-          </CusTable>
-        </el-col>
+        <template v-if="isIndexCpt">
+          <el-col :span="12">
+            <div class="__cus-title_1">数据条件</div>
+            <CusTable
+              :data="state.conditionTable.data"
+              :table-head="state.conditionTable.tableHead"
+              :no-page="true"
+            >
+              <template #indexParam-column-value="{scope}">
+                <CusFormColumn
+                  class="__cus-table-form-column"
+                  required
+                  :span="24"
+                  v-model:param="scope.row.indexParam"
+                  link="select"
+                  :options="state.textOptions"
+                  label-key="fieldNameCn"
+                  value-key="fieldNameEn"
+                />
+              </template>
+              <template #condition-column-value="{scope}">
+                <CusFormColumn
+                  class="__cus-table-form-column"
+                  required
+                  :span="24"
+                  v-model:param="scope.row.condition"
+                  link="select"
+                  :options="DictionaryStore.conditionTypeList"
+                />
+              </template>
+              <template #do-header-value="{scope}">
+                <CusFormColumn
+                  class="__cus-table-form-column"
+                  :span="24"
+                  v-model:param="state.conditionTable.selectValue"
+                  link="select"
+                  :options="transfer.conditionOptions.filter(v => state.conditionTable.data.every(s => s.themeParam !== v)).map(v => ({dictLabel: v, dictValue:  v}))"
+                  @change="handleChangeCondition"
+                />
+              </template>
+              <template #do-column-value="{scope}">
+                <CusButton type="table-del" @click="state.conditionTable.data.splice(scope.$index, 1)"/>
+              </template>
+            </CusTable>
+          </el-col>
+          <el-col :span="12" style="padding-left: 20px">
+            <div class="__cus-title_1">数据排序</div>
+            <CusTable
+              :data="state.sortTable.data"
+              :table-head="state.sortTable.tableHead"
+              :no-page="true"
+            >
+              <template #sortParam-column-value="{scope}">
+                <CusFormColumn
+                  class="__cus-table-form-column"
+                  required
+                  :span="24"
+                  v-model:param="scope.row.sortParam"
+                  link="select"
+                  :options="state.textOptions"
+                  label-key="fieldNameCn"
+                  value-key="fieldNameEn"
+                />
+              </template>
+              <template #sortType-column-value="{scope}">
+                <CusFormColumn
+                  class="__cus-table-form-column"
+                  required
+                  :span="24"
+                  v-model:param="scope.row.sortType"
+                  link="select"
+                  :options="DictionaryStore.sortTypeList"
+                />
+              </template>
+              <template #do-header-value="{scope}">
+                <CusButton title="新增" @click="state.sortTable.data.push({sortParam: '', sortType: ''})"/>
+              </template>
+              <template #do-column-value="{scope}">
+                <CusButton type="table-del" @click="state.sortTable.data.splice(scope.$index, 1)"/>
+              </template>
+            </CusTable>
+          </el-col>
+        </template>
       </CusForm>
     </div>
   </CusDialog>
@@ -260,6 +262,7 @@ const onSubmit = () => {
       if (props.transfer.mode === 'add') {
         params.themeId = props.transfer.themeId
         params.indexId = props.transfer.indexId
+        params.type = isIndexCpt.value ? 'inner_index' : 'outside_service'
         sysThemeIndexAdd(params).then(res => {
           ElMessage.success('新增成功！')
           emit('update:show', false)
@@ -299,6 +302,7 @@ const initDetail = () => {
   })
 }
 const initText = (id) => {
+  state.textOptions = []
   if (isIndexCpt.value) {
     sysIndexFieldList(proxy.$util.formatGetParam({
       indexId: id
@@ -307,39 +311,37 @@ const initText = (id) => {
       state.loading = false
     })
   } else {
-    outsideServiceFindById(props.transfer.id).then(res => {
-      state.form = res.data
-      if (state.form.requestParams) {
-        try {
-          const p = JSON.parse(state.form.requestParams)
-          state.params.requestParams.data = p || []
-        } catch (e) {}
-      }
-      if (state.form.requestHeaders) {
-        try {
-          const p = JSON.parse(state.form.requestHeaders)
-          state.params.requestHeaders.data = p || []
-        } catch (e) {}
-      }
-      if (state.form.requestBody) {
-        try {
-          const p = JSON.parse(state.form.requestBody)
-          state.params.requestBody.type = p.type
-          state.params.requestBody.str = p.str
-          state.params.requestBody.data = p.data || []
-        } catch (e) {}
-      }
-      if (state.form.responseBody) {
+    outsideServiceFindById(id).then(res => {
+      const arr: any = []
+      const d = res.data
+      if (d.responseBody) {
         try {
-          const p = JSON.parse(state.form.responseBody)
-          state.params.responseBody.type = p.type
-          state.params.responseBody.json.pathForm = p.json.pathForm
-          state.params.responseBody.json.data = p.json.data || []
-          state.params.responseBody.text.data = p.text.data || []
-          state.params.responseBody.other.plug = p.other.plug
-          state.params.responseBody.other.data = p.other.data || []
+          const p = JSON.parse(d.responseBody)
+          if (p.type == 1) {
+            p.json.data.forEach(v => {
+              arr.push({
+                fieldNameCn: v.label,
+                fieldNameEn: v.key,
+              })
+            })
+          } else if (p.type == 2) {
+            p.text.data.forEach(v => {
+              arr.push({
+                fieldNameCn: v.label,
+                fieldNameEn: v.key,
+              })
+            })
+          } else if (p.type == 3) {
+            p.other.data.forEach(v => {
+              arr.push({
+                fieldNameCn: v.label,
+                fieldNameEn: v.key,
+              })
+            })
+          }
         } catch (e) {}
       }
+      state.textOptions = arr
       state.loading = false
     })
   }

src/views/manage/theme/relation.vue

@@ -17,6 +17,7 @@
             link="select"
             :options="DictionaryStore.serviceTypeList"
             @change="initIndex"
+            :clearable="false"
           />
           <el-col :span="22">
             <el-autocomplete
@@ -41,6 +42,9 @@
           :table-head="state.query.tableHead"
           :no-page="true"
         >
+          <template #type-column-value="{scope}">
+            {{DictionaryStore.serviceTypeMap.get(scope.row.type)}}
+          </template>
           <template #isMain-column-value="{scope}">
             {{DictionaryStore.isMainIndexMap.get(scope.row.isMain)}}
           </template>
@@ -138,6 +142,7 @@ const fetchSuggestions = (queryString: string, cb: any) => {
 }
 const handleSelect = (item) => {
   state.relationDetail.transfer = {
+    type: state.type,
     mode: 'add',
     indexId: item.id,
     indexTableName: item.indexTableName,
@@ -190,6 +195,7 @@ const onEdit = (row) => {
     }
   })
   state.relationDetail.transfer = {
+    type: row.type,
     mode: 'edit',
     id: row.id,
     indexTableName: row.indexTableName,