t20-common-lib 0.15.5 → 0.15.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.15.5",
+  "version": "0.15.7",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/dynamic-form/src/components/Dialog.vue

@@ -36,7 +36,7 @@
 </template>
 <script>
 import dayjs from 'dayjs'
-import { getDataForPost, getDataForGet } from '../utils/request'
+import { getDataForPost, getDataForGet } from '../../../../src/api/common'
 export default {
   name: 'Dialog',
   props: {

package/packages/dynamic-form/src/components/LazySelect.vue

@@ -27,7 +27,7 @@
 <script>
 import dayjs from 'dayjs'
 /* 各属性，方法参考el-select */
-import { getDataForPost, getDataForGet } from '../utils/request'
+import { getDataForPost, getDataForGet } from '../../../../src/api/common'
 export default {
   name: "SelectLazy",
   props: {

package/packages/dynamic-form/src/components/ScrollLoadSelect.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { getDataForGet, getDataForPost } from '../utils/request'
+import { getDataForGet, getDataForPost } from '../../../../src/api/common'
 
 export default {
   name: 'ScrollLoadSelect',
@@ -63,10 +63,10 @@ export default {
       }
       return this.$attrs.requestFn || this.$attrs['request-fn'] || this.fetchByStaticOptions
     },
-    shouldAutoLoad() {
-      const autoLoad = this.items?.props?.autoLoad ?? this.$attrs.autoLoad
-      return autoLoad !== false
-    },
+    // shouldAutoLoad() {
+    //   const autoLoad = this.items?.props?.autoLoad ?? this.$attrs.autoLoad
+    //   return autoLoad !== false
+    // },
     passThroughProps() {
       return {
         ...this.$attrs,
@@ -81,18 +81,18 @@ export default {
     }
   },
   mounted() {
-    this.triggerInitialRequest()
+    // this.triggerInitialRequest()
   },
   methods: {
-    triggerInitialRequest() {
-      if (!this.shouldAutoLoad) return
-      this.$nextTick(() => {
-        const instance = this.$refs.scrollLoadSelect
-        if (instance && typeof instance.handleFilter === 'function') {
-          instance.handleFilter('')
-        }
-      })
-    },
+    // triggerInitialRequest() {
+    //   if (!this.shouldAutoLoad) return
+    //   this.$nextTick(() => {
+    //     const instance = this.$refs.scrollLoadSelect
+    //     if (instance && typeof instance.handleFilter === 'function') {
+    //       instance.handleFilter('')
+    //     }
+    //   })
+    // },
     resolvePath(data, path) {
       if (!path) return data
       return String(path)
@@ -111,41 +111,39 @@ export default {
         return item
       })
     },
-    setDeepValue(target, path, value) {
-      const keys = String(path || '').split('.').filter(Boolean)
-      if (keys.length === 0) return
-      let cur = target
-      for (let i = 0; i < keys.length - 1; i += 1) {
-        const key = keys[i]
-        if (!cur[key] || typeof cur[key] !== 'object' || Array.isArray(cur[key])) {
-          cur[key] = {}
-        }
-        cur = cur[key]
-      }
-      cur[keys[keys.length - 1]] = value
-    },
     buildPagingParams(params, apiConfig) {
       const pageConfig = apiConfig?.page || {}
+      const method = String(apiConfig?.requestMethod || '').toUpperCase()
       const currentKey = pageConfig.current || 'current'
       const sizeKey = pageConfig.size || 'size'
       const currentVal = params.current
       const sizeVal = params.size
 
-      // 场景1：page: { current, size }
-      if (pageConfig.reqKey) {
+      // GET: 直接按配置 key 传查询参数（支持 page.current/page.size）
+      if (method === 'GET') {
         return {
-          [pageConfig.reqKey]: {
-            [currentKey]: currentVal,
-            [sizeKey]: sizeVal
+          [currentKey]: currentVal,
+          [sizeKey]: sizeVal
+        }
+      }
+
+      // POST: 如果配置是 page.current/page.size，则转为 { page: { current, size } }
+      const currentParts = String(currentKey).split('.')
+      const sizeParts = String(sizeKey).split('.')
+      if (currentParts.length === 2 && sizeParts.length === 2 && currentParts[0] === sizeParts[0]) {
+        return {
+          [currentParts[0]]: {
+            [currentParts[1]]: currentVal,
+            [sizeParts[1]]: sizeVal
           }
         }
       }
 
-      // 场景2：page.current=xx&page.size=xx（支持点路径）
-      const pageParams = {}
-      this.setDeepValue(pageParams, currentKey, currentVal)
-      this.setDeepValue(pageParams, sizeKey, sizeVal)
-      return pageParams
+      // POST 兜底：平铺参数
+      return {
+        [currentKey]: currentVal,
+        [sizeKey]: sizeVal
+      }
     },
     async fetchByApiConfig(params = {}) {
       const apiConfig = this.items?.api || {}

package/packages/dynamic-form/src/components/Select.vue

@@ -31,7 +31,7 @@
 <script>
 import dayjs from 'dayjs'
 import clickoutside from 'element-ui/src/utils/clickoutside'
-import { getDataForPost, getDataForGet } from '../utils/request'
+import { getDataForPost, getDataForGet } from '../../../../src/api/common'
 export default {
   name: "Select",
   props: {

package/packages/dynamic-form/src/components/SelectTree.vue

@@ -14,7 +14,7 @@
 
 <script>
 import clickoutside from 'element-ui/src/utils/clickoutside'
-import { getDataForPost, getDataForGet } from '../utils/request'
+import { getDataForPost, getDataForGet } from '../../../../src/api/common'
 export default {
   name: 'SelectTree',
   props: {

package/src/api/common.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+function normalizeHeaders(headers = {}) {
+  if (!headers || typeof headers !== 'object') return {}
+  if (headers.headers && typeof headers.headers === 'object') {
+    return headers.headers
+  }
+  return headers
+}
+
 // 单位本位币
 export function getUnitCurrency(unitNo) {
   // return request({
@@ -30,4 +38,24 @@ export function getCommonConfig(params = {}) {
     cache:true,
     params
   })
+}
+
+export function getDataForGet(url, params = {}, headers = {}) {
+  return request({
+    url,
+    method: 'get',
+    loading: false,
+    params,
+    headers: normalizeHeaders(headers)
+  })
+}
+
+export function getDataForPost(url, data = {}, headers = {}) {
+  return request({
+    url,
+    method: 'post',
+    loading: false,
+    data,
+    headers: normalizeHeaders(headers)
+  })
 }

package/src/utils/request.js

@@ -81,4 +81,24 @@ service.interceptors.response.use(
   }
 )
 
+function normalizeConfig(headers = {}) {
+  if (!headers || typeof headers !== 'object') return {}
+  // 兼容调用方直接传 { headers: {...} } 或扁平对象两种方式
+  if (headers.headers && typeof headers.headers === 'object') {
+    return headers
+  }
+  return { headers }
+}
+
+export function getDataForGet(url, params = {}, headers = {}) {
+  return service.get(url, {
+    params,
+    ...normalizeConfig(headers)
+  })
+}
+
+export function getDataForPost(url, data = {}, headers = {}) {
+  return service.post(url, data, normalizeConfig(headers))
+}
+
 export default service

package/packages/dynamic-form/src/utils/request.js

@@ -1,19 +0,0 @@
-import Vue from 'vue'
-
-function resolveAxios() {
-  const axios = Vue.prototype && Vue.prototype.$axios
-  if (!axios || typeof axios !== 'object') {
-    throw new Error('[DynamicForm] $axios is required in Vue prototype')
-  }
-  return axios
-}
-
-export function getDataForGet(url, params = {}, headers = {}) {
-  const axios = resolveAxios()
-  return axios.get(url, params, headers)
-}
-
-export function getDataForPost(url, data = {}, headers = {}) {
-  const axios = resolveAxios()
-  return axios.post(url, data, headers)
-}