t20-common-lib 0.15.4 → 0.15.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.15.4",
+  "version": "0.15.6",
   "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

@@ -1,5 +1,7 @@
 <template>
   <T20-Scroll-Load-Select
+    ref="scrollLoadSelect"
+    class="input-w" 
     v-model="_value"
     v-bind="passThroughProps"
     v-on="innerListeners"
@@ -8,7 +10,7 @@
 </template>
 
 <script>
-import { getDataForGet, getDataForPost } from '../utils/request'
+import { getDataForGet, getDataForPost } from '../../../../src/api/common'
 
 export default {
   name: 'ScrollLoadSelect',
@@ -61,6 +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
+    // },
     passThroughProps() {
       return {
         ...this.$attrs,
@@ -74,7 +80,19 @@ export default {
       }
     }
   },
+  mounted() {
+    // this.triggerInitialRequest()
+  },
   methods: {
+    // 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)
@@ -93,14 +111,55 @@ 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 currentKey = pageConfig.current || 'current'
+      const sizeKey = pageConfig.size || 'size'
+      const currentVal = params.current
+      const sizeVal = params.size
+
+      // 场景1：page: { current, size }
+      if (pageConfig.reqKey) {
+        return {
+          [pageConfig.reqKey]: {
+            [currentKey]: currentVal,
+            [sizeKey]: sizeVal
+          }
+        }
+      }
+
+      // 场景2：page.current=xx&page.size=xx（支持点路径）
+      const pageParams = {}
+      this.setDeepValue(pageParams, currentKey, currentVal)
+      this.setDeepValue(pageParams, sizeKey, sizeVal)
+      return pageParams
+    },
     async fetchByApiConfig(params = {}) {
       const apiConfig = this.items?.api || {}
       const method = String(apiConfig.requestMethod || '').toUpperCase()
       const reqKeys = apiConfig.reqKeys || {}
       const headerConfig = apiConfig.headerConfig || {}
+      const searchValue = params[this.runtimeSearchKeyName]
+      const pagingParams = this.buildPagingParams(params, apiConfig)
       const requestData = {
         ...reqKeys,
-        ...params
+        ...pagingParams
+      }
+      if (searchValue !== undefined) {
+        requestData[this.runtimeSearchKeyName] = searchValue
       }
       let res = null
       if (method === 'GET') {

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)
-}