vue2-client 1.4.28 → 1.4.30

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.4.30 -2022-10-11 @江超**
+- 功能修改：
+- 单页面模式调整样式
+
+**1.4.29 -2022-10-10 @苗艳强**
+- 功能修改：
+- 修改XFormTable的selectRow事件
+
 **1.4.28 -2022-10-08 @江超**
 - 功能修改：
 - 顶部导航模式增加内容宽度
@@ -9,7 +17,6 @@
 - 功能修改：
 - 修改v4登录获取信息方式
 
-
 **1.4.26 -2022-09-29 @苗艳强**
 - 功能修改：
 - 售后工单页面接收到客户信息传参后还可修改

package/package.json

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

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

@@ -60,7 +60,7 @@
               </a-menu>
               <a-button>导出 <a-icon type="down" /> </a-button>
             </a-dropdown>
-            <slot :selectedRowKeys="selectedRowKeys" name="button"></slot>
+            <slot :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows" name="button"></slot>
           </a-space>
           <slot name="expand"></slot>
         </template>
@@ -119,6 +119,8 @@ export default {
       buttonState: {},
       // 表格选择列Key集合
       selectedRowKeys: [],
+      // 表格选择Row集合
+      selectedRows: [],
       // 表单项集合
       formItems: [],
       // 表单
@@ -445,11 +447,12 @@ export default {
       this.isFormShow = !this.isFormShow
     },
     // 控制业务操作按钮组的显示
-    selectRow (rowKeys) {
+    selectRow (rowKeys, rows) {
       this.selectedRowKeys = rowKeys
+      this.selectedRows = rows
       this.isModify = this.selectedRowKeys.length === 1
       this.isDelete = this.selectedRowKeys.length > 0
-      this.$emit('selectRow', this.selectedRowKeys)
+      this.$emit('selectRow', this.selectedRowKeys, this.selectedRows)
     },
     // 创建临时表sql生成
     createTempTable (defineJson) {

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

@@ -234,7 +234,7 @@ export default {
     onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
-      this.$emit('selectRow', selectedRowKeys)
+      this.$emit('selectRow', selectedRowKeys, selectedRows)
     },
     clearRowKeys () {
       this.$refs.table.clearSelected()

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 {