vue2-client 1.17.37 → 1.17.39

package/src/base-client/components/common/XDetailsView/index.js

@@ -1,3 +1,3 @@
-import XDetailsView from './XDetailsView'
-
-export default XDetailsView
+import XDetailsView from './XDetailsView'
+
+export default XDetailsView

package/src/base-client/components/common/XFormGroupDetails/index.js

@@ -1,3 +1,3 @@
-import XFormGroupDetails from './XFormGroupDetails'
-
-export default XFormGroupDetails
+import XFormGroupDetails from './XFormGroupDetails'
+
+export default XFormGroupDetails

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

@@ -953,6 +953,117 @@ export default {
   line-height: 32px;
   margin-bottom: 12px;
 }
+// 表格行样式类型
+.ant-table-tbody {
+  // 成功样式 - 绿色 (#52c41a)
+  .ant-table-row-success {
+    background-color: rgba(82, 196, 26, 0.2);
+
+    &:hover {
+      background-color: rgba(82, 196, 26, 0.3) !important;
+
+      td {
+        background-color: transparent;
+      }
+    }
+
+    // 选中状态
+    &.ant-table-row-selected {
+      background-color: rgba(82, 196, 26, 0.4);
+
+      td {
+        background-color: transparent;
+      }
+    }
+
+    td {
+      background-color: transparent;
+    }
+  }
+
+  // 警告样式 - 黄色 (#faad14)
+  .ant-table-row-warning {
+    background-color: rgba(250, 173, 20, 0.1) ;
+
+    &:hover {
+      background-color: rgba(250, 173, 20, 0.15) ;
+
+      td {
+        background-color: transparent ;
+      }
+    }
+
+    // 选中状态
+    &.ant-table-row-selected {
+      background-color: rgba(250, 173, 20, 0.2);
+
+      td {
+        background-color: transparent;
+      }
+    }
+
+    td {
+      background-color: transparent ;
+    }
+  }
+
+  // 错误样式 - 红色 (#f5222f)
+  .ant-table-row-error {
+    background-color: rgba(245, 34, 47, 0.1) ;
+
+    &:hover {
+      background-color: rgba(245, 34, 47, 0.15) ;
+
+      td {
+        background-color: transparent ;
+      }
+    }
+
+    // 选中状态
+    &.ant-table-row-selected {
+      background-color: rgba(245, 34, 47, 0.2) ;
+
+      td {
+        background-color: transparent ;
+      }
+    }
+
+    td {
+      background-color: transparent ;
+    }
+  }
+
+  // 魔法样式 - 紫色
+  .ant-table-row-magic {
+    background-color: rgba(114, 46, 209, 0.1) ;
+
+    &:hover {
+      background-color: rgba(114, 46, 209, 0.15) ;
+
+      td {
+        background-color: transparent ;
+      }
+    }
+
+    // 选中状态
+    &.ant-table-row-selected {
+      background-color: rgba(114, 46, 209, 0.2) ;
+
+      td {
+        background-color: transparent ;
+      }
+    }
+
+    td {
+      background-color: transparent ;
+    }
+  }
+
+  // 默认选中状态（没有特殊行样式时）
+  .ant-table-row-selected:not(.ant-table-row-success):not(.ant-table-row-warning):not(.ant-table-row-error):not(.ant-table-row-magic) {
+    background-color: rgba(24, 144, 255, 0.1) ;
+  }
+}
 </style>
 <style>
 
@@ -977,4 +1088,5 @@ export default {
   overflow: visible;
   background-color: transparent;
 }
+
 </style>

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

@@ -8,7 +8,7 @@
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
-      serviceName="af-system"
+      serviceName="af-revenue"
       ref="xFormTable">
     </x-form-table>
   </a-card>

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

@@ -72,7 +72,7 @@ export default {
   },
   data () {
     return {
-      activeKey: 0,
+      activeKey: -1,
       // 配置
       config: undefined,
       tabBarExtraContent: undefined,
@@ -85,10 +85,10 @@ export default {
     ...mapState('account', { currUser: 'user' })
   },
   mounted () {
-    this.activeKey = this.defaultActiveKey
+    // this.activeKey = this.defaultActiveKey
     // 标记默认激活的页签为已加载
-    this.markTabAsLoaded(this.defaultActiveKey)
-    this.tabPaneChange('initTabLoading', true)
+    // this.markTabAsLoaded(this.defaultActiveKey)
+    this.tabPaneChange(this.defaultActiveKey, true)
   },
   methods: {
     // 自定义函数中调用的方法  这个不能删
@@ -113,7 +113,7 @@ export default {
         this.markTabAsLoaded(newKey)
       }
 
-      if (this.config && this.config.changeFunc) {
+      if (this.config && this.config.changeFunc && this.config.data[newKey] !== undefined) {
         let oldRef
         let oldTabName
         let newRef
@@ -148,7 +148,6 @@ export default {
 
         // 关键修改：确保新组件实例存在
         if (!newRef || !newRef[0]) {
-          console.log('等待新页签组件初始化...')
           // 等待组件挂载完成
           await this.waitForComponentReady(newKey)
           newRef = this.$refs[newTabName]
@@ -158,7 +157,7 @@ export default {
           args.push(newRef[0])
         } else {
           args.push(null)
-          console.warn('新页签组件实例获取失败')
+          console.error('新页签组件实例获取失败')
         }
 
         args.push(this.extraData)
@@ -203,7 +202,7 @@ export default {
       }
     },
 
-// 新增：等待组件就绪的方法
+    // 新增：等待组件就绪的方法
     waitForComponentReady (index) {
       return new Promise((resolve) => {
         const checkComponent = () => {

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

@@ -329,12 +329,7 @@ export default {
       return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
     },
     realTableColumns () {
-      console.warn('====', this.tableContext.tableColumns)
       return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction).map((item) => {
-        // todo delete 后台现在也是200 不过要清楚配置缓存 这里是为了让不清缓存也能达到争取的效果
-        // if (item.slotType === 'date' || item.slotType === 'dateTime') {
-        //   item.width = 200
-        // }
         if (['ellipsis', 'badge', 'towDecimal', 'date', 'dateTime', 'fourDecimal', 'int'].includes(item.slotType)) {
           item.ellipsis = true
         }