web-component-gallery 2.2.36 → 2.2.38

package/lib/amap-comp/AmapSearch.jsx

@@ -27,37 +27,56 @@ const AmapSearch = {
   },
   methods: {
     /** 选择地址 */
-    async changeHandle() {
-      if (!this.addressValue) return this.$emit('searchReset', this.searchMarker), (this.searchMarker = null)
-      const { label, location } = this.selectOptions.find(({ id }) => id == this.addressValue)
+    async changeHandle(value) {
+      if (!value) {
+        this.$emit('searchReset', this.searchMarker)
+        this.searchMarker = null
+        return
+      }
+      
+      const { label, location } = this.selectOptions.find(({ id }) => id == value)
       const searchInfo = {
         longitude: location.lng,
         latitude: location.lat,
         address: label
       }
-      this.searchMarker = await this.amapStore.setMarker(this.drawIcon, { position: [location.lng, location.lat] })
+      
+      this.searchMarker = await this.amapStore.setMarker(this.drawIcon, { 
+        position: [location.lng, location.lat] 
+      })
       this.$emit('searchChoose', this.searchMarker, searchInfo)
     },
+    
     /** 根据搜索框搜索地址 */
-    searchHandle(keyword) {
-      this.amapStore.getMapSearch(keyword, addressOptions => {
-        this.selectOptions = addressOptions
-      })
+    async searchHandle(keyword) {
+      this.selectOptions = await this.amapStore.getMapSearch(keyword)
     }
   },
-  render(h) {
-    const { selectOptions, changeHandle, searchHandle, buttonProps } = this
+  render() {
+    const { changeHandle, searchHandle, buttonProps } = this
 
-    const props = {
+    const selectProps = {
       valueKey: 'id',
       labelKey: 'label',
-      options: selectOptions,
+      options: this.selectOptions,
       placeholder: '请输入目的地进行搜索'
-    } 
+    }
+    
+    const selectAttrs = {
+      filterOption: false
+    }
 
     return (
       <div class="AmapDraw__Search">
-        <ASelectCustom v-model={this.addressValue} {...{ props, on: { change: changeHandle, search: searchHandle } }} />
+        <ASelectCustom 
+          v-model={this.addressValue} 
+          props={selectProps}
+          attrs={selectAttrs}
+          on={{
+            change: changeHandle, 
+            search: searchHandle 
+          }}
+        />
         {buttonProps && <Button buttonProps={buttonProps} class="AmapDraw__Search__Button" />}
       </div>
     )
@@ -68,4 +87,4 @@ AmapSearch.install = function (Vue) {
   Vue.component('AmapSearch', AmapSearch)
 }
 
-export default AmapSearch
+export default AmapSearch

package/lib/amap-draw/style/index.less

@@ -40,7 +40,6 @@
   }
 
   #AmapDraw {
-    width: 100%;
-    min-height: 304px;
+    .square(100%);
   } 
 }

package/lib/form-comp/ASelectCustom.vue

@@ -9,12 +9,10 @@
     class="ASelectCustom"
   >
     <Select
-      show-search
       :style="{ width: width || '100%' }"
       :mode="mode" 
       :open="isSelectOpen"
       :placeholder="placeholder"
-      :filterOption="listPageHandler ? false : filterOption"
       :getPopupContainer="tirggerNode => tirggerNode.parentNode"
       @select="handleSelect"
       @search="handleSearch"
@@ -151,6 +149,7 @@ export default {
         allowClear: true,
         showSearch: true,
         defaultActiveFirstOption: !this.isInput,
+        filterOption: this.listPageHandler ? false : this.filterOption,
         ...this.$attrs
       }
     },

package/lib/table/index.vue

@@ -2,6 +2,7 @@
   <!-- 表格容器，根据tableStyle动态设置样式类 -->
   <div :class="[tableStyle, 'WebComponentTable']" ref="Table">
     <!-- 表格头部插槽 -->
+    {{ $slots.ATableHead }}
     <div v-if="$slots.ATableHead" class="WebComponentTable__Head" ref="TableHead">
       <slot name="ATableHead" />
     </div>
@@ -206,12 +207,12 @@ export default {
     }
   },
   mounted() {
+    this.pagination = { ...this.pagination, ...this.paginationParams }
+    // 监听父级高度
     this.initResizeObserver()
-    this.$nextTick(() => {
-      setTimeout(this.getTableBodyHeight, 100)
-    })
-    this.$bus.$onWindow(this, 'resize', this.getTableBodyHeight)
-  },
+    setTimeout(this.getScrollBodyH, 300)
+    this.$bus.$onWindow(this, 'resize', this.getScrollBodyH)
+  },  
   beforeDestroy() {
     if (this.resizeObserver) {
       this.resizeObserver.disconnect()
@@ -219,29 +220,39 @@ export default {
     }
   },
   methods: {
+    // 初始化尺寸观察器
     initResizeObserver() {
-      if (typeof ResizeObserver !== 'undefined' && this.$refs.Table) {
+      if (typeof ResizeObserver !== 'undefined') {
         this.resizeObserver = new ResizeObserver(() => {
-          this.getTableBodyHeight()
+          this.getScrollBodyH()
         })
         this.resizeObserver.observe(this.$refs.Table)
       }
     },
-    getTableBodyHeight() {
-      if (!this.$refs.Table || !this.$refs.TableHead || !this.$refs.TablePagination) return
-        
-      const tableTitleHeight = this.$refs.TableListTitle ? this.$refs.TableListTitle.offsetHeight : 0
-      const tableHeader = this.$refs.TableList.querySelector('.ant-table-thead')
-      const headerHeight = tableHeader ? tableHeader.offsetHeight : 0
-        
-      this.tableScrollBody = 
-        this.$refs.Table.clientHeight -
-        this.$refs.TableHead.offsetHeight -
-        this.$refs.TablePagination.offsetHeight -
-        16 - // 基础间距
-        tableTitleHeight -
-        headerHeight -
-        24 // 浮动空间缓冲
+    /** 根据内容高度计算滚动长度 */
+    getScrollBodyH() {
+      if (!this.$refs.Table) return
+
+      const { Table, TableHead, TableListTitle, TablePagination } = this.$refs
+      const tableHeader = Table.querySelector('.ant-table-thead')
+
+      // 获取各部分高度
+      const clientHeight = Table.clientHeight
+      const headerHeight = TableHead?.offsetHeight || 0
+      const tableHeaderHeight = tableHeader?.offsetHeight || 0
+      const tableTitleHeight = TableListTitle?.offsetHeight || 0
+      const paginationHeight = TablePagination?.offsetHeight || 0
+
+      // 计算滚动区域高度
+      const baseSpacing = 16
+      const bufferSpace = 24
+      this.tableScrollBody = clientHeight - 
+                            headerHeight - 
+                            tableHeaderHeight - 
+                            tableTitleHeight - 
+                            paginationHeight - 
+                            baseSpacing - 
+                            bufferSpace
     },
     handleCheckFile(record, props) {
       this.$postM({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-component-gallery",
-  "version": "2.2.36",
+  "version": "2.2.38",
   "description": "基础vue、antdvue、less实现的私有组件库",
   "main": "dist/index.umd.js",
   "files": [