vue2-client 1.4.29 → 1.4.31

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.4.31 -2022-10-13 @苗艳强**
+- 功能修改：
+- 查询配置生成页面新增api插槽项删除
+
+**1.4.30 -2022-10-11 @江超**
+- 功能修改：
+- 单页面模式调整样式
+
 **1.4.29 -2022-10-10 @苗艳强**
 - 功能修改：
 - 修改XFormTable的selectRow事件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.29",
+  "version": "1.4.31",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQuery.vue

@@ -119,6 +119,7 @@
                     {{ item.label }}
                   </a-select-option>
                 </a-select>
+                <a-icon slot="addonAfter" type="close" @click="removeApiSlotItem(index)"/>
               </a-input>
             </div>
           </a-form-model-item>
@@ -402,6 +403,10 @@ export default {
         this.form.apiSlotView.push({})
       }
     },
+    // 删除接口插槽
+    removeApiSlotItem (index) {
+      this.form.apiSlotView.splice(index, 1)
+    },
     // 初始化组件
     initView () {
       this.joinArray = []

package/src/layouts/SinglePageView.vue

@@ -1,13 +1,15 @@
 <template>
   <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
     <template v-if="login">
-      <iframe
-        ref="singlepage"
-        :src="url"
-        :name="this.fullPath"
-        class="single-page-iframe"
-        @load="load">
-      </iframe>
+      <div style="padding-top: 1px; background-color: #fff;">
+        <iframe
+          ref="singlepage"
+          :src="url"
+          :name="this.fullPath"
+          class="single-page-iframe"
+          @load="load">
+        </iframe>
+      </div>
     </template>
   </page-toggle-transition>
 </template>
@@ -43,7 +45,7 @@ export default {
   },
   created () {
     if (this.singlePageUrl.indexOf('sso:') !== -1) {
-      CASLogin(this.singlePageUrl.substring(4)).then(res => {
+      CASLogin(this.singlePageUrl.substring(4), true).then(res => {
         this.url = res.redirectUrl + '?ticket=' + res.st
       }).catch(msg => {
         this.$message.error(msg)

package/src/services/api/cas.js

@@ -35,10 +35,10 @@ export function CASLoginByAuth (serviceKey) {
   })
 }
 
-export function CASLogin (serviceKey, ticket) {
+export function CASLogin (serviceKey, inner) {
   // 从第三方跳转登录
   const tgc = getTGTCookie()
-  if (tgc && !ticket) {
+  if (tgc) {
     return new Promise((resolve, reject) => {
       post(casApi.createSTByTGC, {
         serviceKey: serviceKey,
@@ -54,7 +54,11 @@ export function CASLogin (serviceKey, ticket) {
           })
           logout().then(() => {
             setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
+              if (inner) {
+                window.location.href = '/login'
+              } else {
+                window.location.href = '/login?serviceKey=' + serviceKey
+              }
             }, 1500)
           })
         } else {

package/vue.config.js

@@ -10,8 +10,8 @@ const isProd = process.env.NODE_ENV === 'production'
 
 const server = 'http://121.36.106.17:8400'
 // const local = 'http://localhost:8445/webmeter'
-const local = 'http://123.60.214.109:8406'
-// const local = 'http://localhost:8080'
+// const local = 'http://123.60.214.109:8406'
+const local = 'http://localhost:8080/webmeter'
 
 module.exports = {
   devServer: {