vue2-client 1.15.129 → 1.15.131

package/package.json

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

package/src/base-client/components/common/HIS/HButtons/HButtons.vue

@@ -1,107 +1,21 @@
 <script setup lang="ts">
 import XButtons from '@vue2-client/base-client/components/common/XButtons/XButtons.vue'
-import { ref, onMounted, onUpdated, getCurrentInstance, watch, nextTick } from 'vue'
+import { ref } from 'vue'
 
 defineProps({
+  // HButtons特有的属性
   buttonStyle: {
     type: String,
     default: 'button24'
   }
 })
 
-const xButtonsRef = ref(null)
-const instance = getCurrentInstance()
-
-// 防抖控制
-let syncTimeout = null
-function debounceSync (callback, delay = 100) {
-  if (syncTimeout) clearTimeout(syncTimeout)
-  syncTimeout = setTimeout(callback, delay)
-}
-
-// 方法缓存，避免重复挂载
-const syncedMethods = new WeakMap()
-
-function syncChildRefs () {
-  if (!instance || !instance.proxy || !xButtonsRef.value) return
-  const proxy = instance.proxy
-  const target = proxy.$refs
-  const childRefs = xButtonsRef.value.$refs
-  if (!childRefs) return
-
-  Object.entries(childRefs).forEach(([key, value]) => {
-    const v = Array.isArray(value) ? value[0] : value
-    if (target[key] !== v) target[key] = v
-  })
-  if (target.xButtonsRef !== xButtonsRef.value) target.xButtonsRef = xButtonsRef.value
-}
-
-function getAllFunctionNames (obj) {
-  if (!obj) return []
-  const names = new Set()
-  let current = obj
-  while (current && current !== Object.prototype) {
-    Object.getOwnPropertyNames(current).forEach(name => {
-      if (typeof obj[name] === 'function' && name !== 'constructor') names.add(name)
-    })
-    current = Object.getPrototypeOf(current)
-  }
-  return Array.from(names)
-}
-
-function syncChildMethods () {
-  if (!instance || !instance.proxy || !xButtonsRef.value) return
-  const proxy = instance.proxy
-  const inner = xButtonsRef.value
-  const cached = syncedMethods.get(inner) || new Set()
-
-  getAllFunctionNames(inner).forEach(name => {
-    if (cached.has(name) || proxy[name]) return
-    proxy[name] = function () {
-      if (xButtonsRef.value && typeof xButtonsRef.value[name] === 'function') {
-        return xButtonsRef.value[name].apply(xButtonsRef.value, arguments)
-      }
-    }
-    cached.add(name)
-  })
-  syncedMethods.set(inner, cached)
-}
-
-function syncAll () {
-  syncChildRefs()
-  syncChildMethods()
-}
-
-// 子组件生命周期事件回调，确保及时同步
-function onInnerMounted () { nextTick(function () { debounceSync(syncAll) }) }
-function onInnerUpdated () { nextTick(function () { debounceSync(syncChildRefs) }) }
-
-// 生命周期与监听
-onMounted(() => nextTick(() => debounceSync(syncAll)))
-onUpdated(() => nextTick(() => debounceSync(syncAll)))
-
-watch(() => xButtonsRef.value && xButtonsRef.value.$refs, () => nextTick(() => debounceSync(syncChildRefs)), { deep: true, flush: 'post' })
-watch(() => xButtonsRef.value, () => nextTick(() => debounceSync(syncChildMethods)), { flush: 'post' })
-
-// 常用方法显式代理（API更清晰）
-function createMethodProxy (methodName) {
-  return function () {
-    const inst = xButtonsRef.value
-    if (inst && typeof inst[methodName] === 'function') return inst[methodName].apply(inst, arguments)
-  }
-}
-
-const COMMON_METHODS = [
-  'clickByKey', 'setButtons', 'disableButton', 'enableButton'
-]
+// 内部 XButtons 实例引用
+const xButtonsRef = ref()
 
+// 暴露方法：获取内部 XButtons 实例
 defineExpose({
-  getXButtonsInstance: () => xButtonsRef.value,
-  // 显式常用方法
-  ...COMMON_METHODS.reduce((acc, m) => {
-    acc[m] = createMethodProxy(m)
-    return acc
-  }, {})
+  getXButtonsInstance: function () { return xButtonsRef.value }
 })
 </script>
 
@@ -116,8 +30,6 @@ defineExpose({
       ref="xButtonsRef"
       v-bind="$attrs"
       v-on="$listeners"
-      @hook:mounted="onInnerMounted"
-      @hook:updated="onInnerUpdated"
     >
       <template v-for="(_, name) in $slots" #[name]="slotData">
         <slot :name="name" v-bind="slotData" />
@@ -127,5 +39,69 @@ defineExpose({
 </template>
 
 <style scoped lang="less">
-.h-buttons-wrapper { }
+.h-buttons-wrapper {
+  // 基础样式
+  :deep(.ant-btn-group) {
+    .ant-btn {
+      border-radius: 6px;
+      background-color: #FFFFFF;
+      border: 1px solid #9499A0;
+      color: #313131;
+      font-weight: normal;
+      letter-spacing: 0em;
+      width: 110px;
+      font-size: 16px;
+      font-family: "Source Han Sans";
+      line-height: normal;
+      margin-right: 25px;
+      height: 32px;
+    }
+  }
+
+  // button24样式
+  &.h-buttons-button24 {
+    :deep(.ant-btn-group) {
+      .ant-btn {
+        border: 1px solid #CDCDCD;
+        color: #5D5C5C;
+        font-weight: normal;
+        letter-spacing: 0em;
+        font-size: 16px;
+        line-height: normal;
+        margin-right: 25px;
+        border-radius: 6px;
+        background-color: #FFFFFF;
+        // 这个不合理
+        // top: -100px;
+        width: fit-content;
+        min-width: 110px;
+        font-family: "Source Han Sans";
+        height: 32px;
+      }
+    }
+  }
+
+  // button23样式
+  &.h-buttons-button23 {
+    :deep(.ant-btn-group) {
+      .ant-btn {
+        border: none;
+        padding: 0 !important;
+        color: #FFFFFF;
+        font-weight: normal;
+        letter-spacing: 0em;
+        font-size: 16px;
+        line-height: normal;
+        border-radius: 50%;
+        background-color: #1890FF;
+        margin-left: 10px;
+        top: -88px;
+        width: 30px;
+        font-family: "Source Han Sans";
+        height: 30px;
+      }
+    }
+  }
+
+}
 </style>

package/src/base-client/components/common/HIS/HFormTable/HFormTable.vue

@@ -1,117 +1,22 @@
 <script setup lang="ts">
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { ref, onMounted, onUpdated, getCurrentInstance, watch, nextTick } from 'vue'
+import { ref } from 'vue'
 
 defineProps({
+  // HFormTable特有的属性
   tableStyle: {
     type: String,
     default: 'formtable-col1'
   }
 })
 
-const xFormTableRef = ref(null)
-const instance = getCurrentInstance()
-
-// 防抖控制
-let syncTimeout = null
-function debounceSync (callback, delay = 100) {
-  if (syncTimeout) clearTimeout(syncTimeout)
-  syncTimeout = setTimeout(callback, delay)
-}
-
-// 方法缓存，避免重复挂载
-const syncedMethods = new WeakMap()
-
-function syncChildRefs () {
-  if (!instance || !instance.proxy || !xFormTableRef.value) return
-  const proxy = instance.proxy
-  const target = proxy.$refs
-  const childRefs = xFormTableRef.value.$refs
-  if (!childRefs) return
-
-  Object.entries(childRefs).forEach(([key, value]) => {
-    const v = Array.isArray(value) ? value[0] : value
-    if (target[key] !== v) target[key] = v
-  })
-  if (target.xFormTableRef !== xFormTableRef.value) target.xFormTableRef = xFormTableRef.value
-}
-
-function getAllFunctionNames (obj) {
-  if (!obj) return []
-  const names = new Set()
-  let current = obj
-  while (current && current !== Object.prototype) {
-    Object.getOwnPropertyNames(current).forEach(name => {
-      if (typeof obj[name] === 'function' && name !== 'constructor') names.add(name)
-    })
-    current = Object.getPrototypeOf(current)
-  }
-  return Array.from(names)
-}
-
-function syncChildMethods () {
-  if (!instance || !instance.proxy || !xFormTableRef.value) return
-  const proxy = instance.proxy
-  const inner = xFormTableRef.value
-  const cached = syncedMethods.get(inner) || new Set()
-
-  getAllFunctionNames(inner).forEach(name => {
-    if (cached.has(name) || proxy[name]) return
-    proxy[name] = function () {
-      if (xFormTableRef.value && typeof xFormTableRef.value[name] === 'function') {
-        return xFormTableRef.value[name].apply(xFormTableRef.value, arguments)
-      }
-    }
-    cached.add(name)
-  })
-  syncedMethods.set(inner, cached)
-}
-
-function syncAll () {
-  syncChildRefs()
-  syncChildMethods()
-}
-
-// 子组件生命周期事件回调，确保及时同步
-function onInnerMounted () { nextTick(function () { debounceSync(syncAll) }) }
-function onInnerUpdated () { nextTick(function () { debounceSync(syncChildRefs) }) }
-
-// 生命周期与监听
-onMounted(() => nextTick(() => debounceSync(syncAll)))
-onUpdated(() => nextTick(() => debounceSync(syncAll)))
-
-watch(() => xFormTableRef.value && xFormTableRef.value.$refs, () => nextTick(() => debounceSync(syncChildRefs)), { deep: true, flush: 'post' })
-watch(() => xFormTableRef.value, () => nextTick(() => debounceSync(syncChildMethods)), { flush: 'post' })
-
-// 常用方法显式代理（API更清晰）
-function createMethodProxy (methodName) {
-  return function () {
-    const inst = xFormTableRef.value
-    if (inst && typeof inst[methodName] === 'function') return inst[methodName].apply(inst, arguments)
-  }
-}
-
-const COMMON_METHODS = [
-  'reload', 'init', 'doSearch', 'resetForm', 'refreshTable',
-  'clearRowKeys', 'update', 'setTableData'
-]
+// 创建对XFormTable组件的引用
+const xFormTableRef = ref()
 
+// 暴露方法给父组件使用
 defineExpose({
-  getXFormTableInstance: () => xFormTableRef.value,
-  // 显式常用方法
-  ...COMMON_METHODS.reduce((acc, m) => {
-    acc[m] = createMethodProxy(m)
-    return acc
-  }, {}),
-  // 便捷：获取内部表格/表单ref
-  getTableRef: () => {
-    const refs = xFormTableRef.value && xFormTableRef.value.$refs
-    return (refs && (refs.table || refs.xTable)) || undefined
-  },
-  getFormRef: () => {
-    const refs = xFormTableRef.value && xFormTableRef.value.$refs
-    return (refs && (refs.form || refs.xForm)) || undefined
-  }
+  // 为了兼容性，保留getXFormTableInstance方法
+  getXFormTableInstance: () => xFormTableRef.value
 })
 </script>
 
@@ -126,8 +31,6 @@ defineExpose({
       ref="xFormTableRef"
       v-bind="$attrs"
       v-on="$listeners"
-      @hook:mounted="onInnerMounted"
-      @hook:updated="onInnerUpdated"
     >
       <template v-for="(_, name) in $slots" #[name]="slotData">
         <slot :name="name" v-bind="slotData" />

package/src/base-client/components/common/HIS/HTab/HTab.vue

@@ -1,134 +1,22 @@
 <script setup lang="ts">
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
-import { ref, onMounted, onUpdated, getCurrentInstance, watch, nextTick } from 'vue'
+import { ref } from 'vue'
 
 defineProps({
+  // HTab特有的属性
   hasTopMargin: {
     type: Boolean,
     default: true
   }
 })
 
-const emit = defineEmits(['ready'])
-
-const xTabRef = ref(null)
-const instance = getCurrentInstance()
-
-// 就绪承诺
-let _resolveReady = null
-let _readyPromise = null
-function resetReady () {
-  _readyPromise = new Promise(function (resolve) { _resolveReady = resolve })
-}
-resetReady()
-function markReady () {
-  if (_resolveReady) { _resolveReady(); _resolveReady = null }
-  emit('ready')
-}
-
-// 防抖控制
-let syncTimeout = null
-function debounceSync (callback, delay = 100) {
-  if (syncTimeout) clearTimeout(syncTimeout)
-  syncTimeout = setTimeout(callback, delay)
-}
-
-// 方法缓存
-const syncedMethods = new WeakMap()
-
-function getAllFunctionNames (obj) {
-  if (!obj) return []
-  const names = new Set()
-  let current = obj
-  while (current && current !== Object.prototype) {
-    Object.getOwnPropertyNames(current).forEach(name => {
-      if (typeof obj[name] === 'function' && name !== 'constructor') names.add(name)
-    })
-    current = Object.getPrototypeOf(current)
-  }
-  return Array.from(names)
-}
-
-function syncChildMethods () {
-  if (!instance || !instance.proxy || !xTabRef.value) return
-  const proxy = instance.proxy
-  const inner = xTabRef.value
-  const cached = syncedMethods.get(inner) || new Set()
-  getAllFunctionNames(inner).forEach(name => {
-    if (cached.has(name) || proxy[name]) return
-    proxy[name] = function () {
-      if (xTabRef.value && typeof xTabRef.value[name] === 'function') {
-        return xTabRef.value[name].apply(xTabRef.value, arguments)
-      }
-    }
-    cached.add(name)
-  })
-  syncedMethods.set(inner, cached)
-}
-
-// 访问时动态合并 $refs：原始 + 子组件（拍平数组）+ xTabRef
-function installRefsGetter () {
-  if (!instance || !instance.proxy) return
-  const proxy = instance.proxy
-  const baseRefs = proxy.$refs
-  if (!baseRefs) return
-  try {
-    Object.defineProperty(proxy, '$refs', {
-      configurable: true,
-      get () {
-        const merged = {}
-        // 基础 refs
-        if (baseRefs) {
-          Object.keys(baseRefs).forEach(function (k) { merged[k] = baseRefs[k] })
-        }
-        // 子组件 refs
-        const child = xTabRef.value && xTabRef.value.$refs
-        if (child) {
-          Object.keys(child).forEach(function (k) {
-            const v = Array.isArray(child[k]) ? child[k][0] : child[k]
-            merged[k] = v
-          })
-        }
-        // xTabRef 本身
-        merged.xTabRef = xTabRef.value
-        return merged
-      }
-    })
-  } catch (e) {
-    // 忽略 defineProperty 失败，保持原逻辑
-  }
-}
-
-function syncAll () {
-  syncChildMethods()
-  markReady()
-}
-
-// 生命周期与监听
-onMounted(() => nextTick(() => {
-  installRefsGetter()
-  debounceSync(function () { syncAll() })
-}))
-onUpdated(() => nextTick(() => debounceSync(function () { syncAll() })))
-watch(() => xTabRef.value, () => nextTick(() => { resetReady(); debounceSync(function () { syncAll() }) }), { flush: 'post' })
-
-// 常用方法显式代理
-function createMethodProxy (methodName) {
-  return function () {
-    const inst = xTabRef.value
-    if (inst && typeof inst[methodName] === 'function') return inst[methodName].apply(inst, arguments)
-  }
-}
-
-const COMMON_METHODS = ['tabPaneChange', 'initConfig', 'getConfig']
+// 创建对XTab组件的引用
+const xTabRef = ref()
 
+// 暴露方法给父组件使用
 defineExpose({
+  // 为了兼容性，保留getXTabInstance方法
   getXTabInstance: () => xTabRef.value,
-  whenReady: () => _readyPromise,
-  ...COMMON_METHODS.reduce((acc, m) => { acc[m] = createMethodProxy(m); return acc }, {}),
-  getActiveKey: () => xTabRef.value && xTabRef.value.activeKey,
-  getConfigData: () => xTabRef.value && xTabRef.value.config,
-  getShowTabBar: () => xTabRef.value && xTabRef.value.showTabBar,
 })
 </script>
 
@@ -148,9 +36,16 @@ defineExpose({
 
 <style scoped lang="less">
 .h-tab-wrapper {
-  :deep(.ant-tabs-tab-next) { display: none; }
+  // 基础样式
+  :deep(.ant-tabs-tab-next) {
+    display: none;
+  }
+
   :deep(.ant-tabs-nav) {
-    .ant-tabs-tab-next-icon { display: none; }
+    .ant-tabs-tab-next-icon {
+      display: none;
+    }
+
     .ant-tabs-tab {
       background-color: transparent;
       border-radius: 6px 6px 0 0;
@@ -164,6 +59,7 @@ defineExpose({
       height: 32px;
       text-align: center;
     }
+
     .ant-tabs-tab-active {
       background-color: #0057FE;
       color: #ffffff;
@@ -173,14 +69,43 @@ defineExpose({
       text-align: center;
     }
   }
-  :deep(.ant-tabs-bar) { border-bottom: 2px solid #0057FE; }
-  :deep(.ant-tabs-tab-arrow-show) { display: none; }
-  :deep(.ant-tabs-ink-bar) { background-color: transparent; bottom: -1px; display: none; height: 0; }
-  :deep(.ant-tabs-tab-prev-icon-target) { display: none; }
+
+  :deep(.ant-tabs-bar) {
+    border-bottom: 2px solid #0057FE;
+  }
+
+  :deep(.ant-tabs-tab-arrow-show) {
+    display: none;
+  }
+
+  :deep(.ant-tabs-ink-bar) {
+    background-color: transparent;
+    bottom: -1px;
+    display: none;
+    height: 0;
+  }
+
+  :deep(.ant-tabs-tab-prev-icon-target) {
+    display: none;
+  }
+
+  // 带顶部边距的样式
   &.h-tab-has-top-margin {
-    :deep(.ant-tabs-nav) { margin-top: 6px; }
-    :deep(.ant-tabs-bar) { margin: 0 6px; }
-    :deep(.ant-card-body) { padding: 6px 0; .ant-card-body { padding: 6px; } }
+    :deep(.ant-tabs-nav) {
+      margin-top: 6px;
+    }
+
+    :deep(.ant-tabs-bar) {
+      margin: 0 6px;
+    }
+
+    :deep(.ant-card-body) {
+      padding: 6px 0;
+
+      .ant-card-body {
+        padding: 6px;
+      }
+    }
   }
 }
 </style>

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'