vue2-client 1.15.130 → 1.15.131

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.130",
+  "version": "1.15.131",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/components/STable/index.js

@@ -19,8 +19,7 @@ export default {
       sortField: undefined,
       sortOrder: undefined,
       pageNum: 1,
-      pageSize: 10,
-      localHidePagination: false
+      pageSize: 10
     }
   },
   props: Object.assign({}, T.props, {
@@ -116,11 +115,6 @@ export default {
     clickedRowColor () {
       const themeColor = this.$store.state.setting.theme.color
       return this.hexToRgba(themeColor || '#1890ff', 0.1)
-    },
-
-    // 计算是否隐藏分页
-    shouldHidePagination () {
-      return this.hidePagination || this.localHidePagination
     }
   },
   watch: {
@@ -158,8 +152,6 @@ export default {
       handler (val) {
         if (val) {
           this.pageSize = val
-          // 使用计算属性或本地状态来控制分页显示，而不是直接修改prop
-          this.localHidePagination = true
           // 更新 localPagination
           if (this.localPagination) {
             Object.assign(this.localPagination, {
@@ -175,10 +167,8 @@ export default {
     const { pageNo } = this.$route.params
     const localPageNum = this.pageURI && (pageNo && parseInt(pageNo)) || this.pageNum
 
-    // 如果设置了 pageMaxSize，则使用该值作为分页大小并隐藏分页
     if (this.pageMaxSize) {
       this.pageSize = this.pageMaxSize
-      this.localHidePagination = true
     }
 
     this.localPagination = ['auto', true].includes(this.showPagination) && Object.assign({}, this.localPagination, {
@@ -558,7 +548,7 @@ export default {
       <div class="table-wrapper">
         {showAlert && this.showSelected && this.selectRowMode === 'default' ? this.renderAlert() : null}
         {table}
-        {!this.shouldHidePagination ? pagination : null}
+        {!this.hidePagination ? pagination : null}
       </div>
     )
   }

package/src/router/async/router.map.js

@@ -60,7 +60,7 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
@@ -79,7 +79,7 @@ path: 'example',
   // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
   // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
   // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
-  component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
 }
 // routerResource.example = () =>
 //    import('@vue2-client/pages/Example')

package/vue.config.js

@@ -11,11 +11,11 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'https://yc.aofengcloud.com:31467'
+const v3Server = 'http://aote-office.8866.org:31567'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
-const OSSServerDev = 'https://yc.aofengcloud.com:31467'
-const revenue = 'https://yc.aofengcloud.com:31467'
+const OSSServerDev = 'http://192.168.50.67:30351'
+const revenue = 'http://aote-office.8866.org:31567'
 // const revenue = 'http://127.0.0.1:31467'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'