haiwei-ui 1.3.1 → 1.3.2

package/packages/components/list/index.vue

@@ -279,6 +279,8 @@ export default {
       }
       this.loading_ = true
       let fullModel = Object.assign({}, this.model)
+      // 新增：检查并设置默认排序（在执行查询前(2026-03-23新增)）
+      this.checkAndSetDefaultSort()
       // 设置分页
       fullModel.page = this.page
       this.action(fullModel)
@@ -337,11 +339,13 @@ export default {
     /** 刷新 */
     refresh(goFirst) {
       if (goFirst) this.page.index = 1
+      // 新增：检查并设置默认排序（在执行查询前(2026-03-23新增)）
+      this.checkAndSetDefaultSort()
       this.query()
     },
     /** 查询表单重置 */
     reset() {
-      this.$refs.querybar.reset()
+      this.$refs.querybar.reset()    
     },
     /** 获取序号 */
     getNo(index) {
@@ -441,6 +445,8 @@ export default {
     /** 查询栏重置事件 */
     onQueryBarReset() {
       this.$refs.table.clearSort()
+        // 重置后清空排序，让下次查询时重新应用默认排序  2026-03-23新增
+      this.page.sort = []   
       this.$emit('reset')
     },
     /** 删除行 */
@@ -482,26 +488,26 @@ export default {
     /** 递归选择所有树形节点 */
     selectAllTreeNodes(nodes, selection) {
       if (!nodes || !Array.isArray(nodes)) return
-      
+
       nodes.forEach(node => {
         // 获取行键值
         const rowKeyValue = typeof this.rowKey === 'function' ? this.rowKey(node) : node[this.rowKey]
-        
+
         // 检查是否已经选择
         const isSelected = selection.some(s => {
           const selectedKey = typeof this.rowKey === 'function' ? this.rowKey(s) : s[this.rowKey]
           return selectedKey === rowKeyValue
         })
-        
+
         if (!isSelected) {
           selection.push(node)
-          
+
           // 更新表格UI选择状态
           if (this.$refs.table && this.$refs.table.toggleRowSelection) {
             this.$refs.table.toggleRowSelection(node, true)
           }
         }
-        
+
         // 递归处理子节点
         if (this.treeProps && this.treeProps.children) {
           const children = node[this.treeProps.children]
@@ -515,26 +521,26 @@ export default {
     /** 递归取消选择所有树形节点 */
     deselectAllTreeNodes(nodes, selection) {
       if (!nodes || !Array.isArray(nodes)) return
-      
+
       nodes.forEach(node => {
         // 获取行键值
         const rowKeyValue = typeof this.rowKey === 'function' ? this.rowKey(node) : node[this.rowKey]
-        
+
         // 从选择中移除当前节点
         const selectedIndex = selection.findIndex(s => {
           const selectedKey = typeof this.rowKey === 'function' ? this.rowKey(s) : s[this.rowKey]
           return selectedKey === rowKeyValue
         })
-        
+
         if (selectedIndex > -1) {
           selection.splice(selectedIndex, 1)
-          
+
           // 更新表格UI选择状态
           if (this.$refs.table && this.$refs.table.toggleRowSelection) {
             this.$refs.table.toggleRowSelection(node, false)
           }
         }
-        
+
         // 递归处理子节点
         if (this.treeProps && this.treeProps.children) {
           const children = node[this.treeProps.children]
@@ -549,21 +555,50 @@ export default {
     isTreeSelectAllEnabled() {
       const treeSelectAllOptions = this.$_.assignIn({}, def.treeSelectAllOptions, this.treeSelectAll)
       const enabled = treeSelectAllOptions.enabled
-      
+
       // 检查是否启用树形全选：需要同时满足以下条件：
       // 1. treeSelectAll.enabled 为 true
       // 2. treeProps 存在
       // 3. treeProps.children 存在（可以是任何值，只要存在就行）
       const hasTreeProps = !!this.treeProps
       const hasChildrenProp = hasTreeProps && this.treeProps.children !== undefined && this.treeProps.children !== null
-      
+
       return enabled && hasTreeProps && hasChildrenProp
     },
 
     /** 获取选中的记录 */
     getSelection() {
       return this.selection
-    }
+    },
+    /** 检查并设置默认排序(2026-03-23添加默认排序功能) */
+    checkAndSetDefaultSort() {
+      // 只有在sort数组为空时才设置默认排序
+      if (!this.page.sort || this.page.sort.length === 0) {
+        // 查找有默认排序配置的列
+        const defaultSortCol = this.columns.find(col => col.defaultSort && col.sortable)
+        if (defaultSortCol) {
+          // 解析排序方向，支持多种格式：asc/ascending, desc/descending
+          const sortDirection = defaultSortCol.defaultSort.toLowerCase()
+          let sortType = 0 // 默认升序          
+          if (sortDirection === 'desc' || sortDirection === 'descending') {
+            sortType = 1 // 降序
+          } else if (sortDirection === 'asc' || sortDirection === 'ascending') {
+            sortType = 0 // 升序
+          } else {
+            // 如果是不认识的排序方向，默认使用升序
+            console.warn(`未知的排序方向: ${defaultSortCol.defaultSort}，使用默认升序`)
+            sortType = 0
+          }          
+          // 设置默认排序
+          this.page.sort = [
+            {
+              field: defaultSortCol.name,
+              type: sortType
+            }
+          ]
+        }
+      }
+    },
   },
   mounted() {
     this.$nextTick(() => {

package/packages/components/map-search/index.vue

@@ -1,10 +1,12 @@
 <template>
   <section class="nm-map-search-box" v-loading="loading">
-    <el-input v-model="keyword" class="nm-map-search-input" size="small" placeholder="请输入关键字" prefix-icon="el-icon-search" clearable></el-input>
+    <el-input v-model="keyword" class="nm-map-search-input" size="small" placeholder="请输入关键字"
+      prefix-icon="el-icon-search" clearable></el-input>
     <div class="nm-map-search-list">
       <el-scrollbar>
         <ul v-if="data.length > 0" class="nm-map-search-list-box">
-          <li v-for="(item, i) in data" :key="i" :class="['nm-map-search-list-item', active === i ? 'active' : '']" @click="onSelect(item, i)">
+          <li v-for="(item, i) in data" :key="i" :class="['nm-map-search-list-item', active === i ? 'active' : '']"
+            @click="onSelect(item, i)">
             <div class="title">
               <i class="el-icon-location-information" />
               {{ item.title }}
@@ -19,83 +21,83 @@
   </section>
 </template>
 <script>
-  export default {
-    name: 'MapSearch',
-    data() {
-      return {
-        /**关键字 */
-        keyword: '',
-        /**搜索实例 */
-        local: null,
-        /**定时器 */
-        timer: null,
-        /**数据 */
-        data: [],
-        /**显示加载动画 */
-        loading: false,
-        /**已选择的 */
-        active: ''
-      }
+export default {
+  name: 'MapSearch',
+  data() {
+    return {
+      /**关键字 */
+      keyword: '',
+      /**搜索实例 */
+      local: null,
+      /**定时器 */
+      timer: null,
+      /**数据 */
+      data: [],
+      /**显示加载动画 */
+      loading: false,
+      /**已选择的 */
+      active: ''
+    }
+  },
+  props: {
+    /**查询延时，默认800ms */
+    delay: {
+      type: Number,
+      default: 700
     },
-    props: {
-      /**查询延时，默认800ms */
-      delay: {
-        type: Number,
-        default: 700
-      },
-      /**保留小数位精度 */
-      precision: {
-        type: Number,
-        default: 4
-      },
-      /**查询时每页数量，默认15 */
-      searchPageCapacity: {
-        type: Number,
-        default: 15
-      }
+    /**保留小数位精度 */
+    precision: {
+      type: Number,
+      default: 4
     },
-    methods: {
-      init(map) {
-        this.local = new BMap.LocalSearch(map, { searchPageCapacity: this.searchPageCapacity, onSearchComplete: this.onSearchComplete })
-      },
-      search() {
-        //删除定时器
-        clearTimeout(this.timer)
-
-        this.timer = setTimeout(() => {
-          this.data = []
-          if (this.keyword) {
-            this.loading = true
-            this.local.search(this.keyword)
-          }
-        }, this.delay)
-      },
-      onSearchComplete(results) {
-        this.loading = false
-        if (this.local.getStatus() == BMAP_STATUS_SUCCESS) {
-          this.data = results.Sq.map(m => {
-            return { title: m.title, address: m.address, point: m.point }
-          })
-        } else {
-          this.$message.error('查询失败~')
-        }
+    /**查询时每页数量，默认15 */
+    searchPageCapacity: {
+      type: Number,
+      default: 15
+    }
+  },
+  methods: {
+    init(map) {
+      this.local = new BMap.LocalSearch(map, { searchPageCapacity: this.searchPageCapacity, onSearchComplete: this.onSearchComplete })
+    },
+    search() {
+      //删除定时器
+      clearTimeout(this.timer)
 
-        this.$emit('search', this.data)
-      },
-      onSelect(item, i) {
-        this.active = i
-        this.$emit('select', item.point, item)
-      },
-      reset() {
-        this.active = ''
-        this.keyword = ''
+      this.timer = setTimeout(() => {
         this.data = []
-      }
+        if (this.keyword) {
+          this.loading = true
+          this.local.search(this.keyword)
+        }
+      }, this.delay)
     },
-    watch: {
-      keyword() {
-        this.search()
+    onSearchComplete(results) {
+      this.loading = false
+      if (this.local.getStatus() == BMAP_STATUS_SUCCESS) {
+        this.data = results.Sq.map(m => {
+          return { title: m.title, address: m.address, point: m.point }
+        })
+      } else {
+        this.$message.error('查询失败~')
       }
+
+      this.$emit('search', this.data)
+    },
+    onSelect(item, i) {
+      this.active = i
+      this.$emit('select', item.point, item)
+    },
+    reset() {
+      this.active = ''
+      this.keyword = ''
+      this.data = []
+    }
+  },
+  watch: {
+    keyword() {
+      this.search()
     }
   }
+}
 </script>

package/packages/components/tabs/index.vue

@@ -9,40 +9,40 @@
   </section>
 </template>
 <script>
-  export default {
-    name: 'Tabs',
-    data() {
-      return {
-        fullscreen_: false
-      }
+export default {
+  name: 'Tabs',
+  data() {
+    return {
+      fullscreen_: false
+    }
+  },
+  props: {
+    fullscreen: {
+      type: Boolean,
+      default: true
+    }
+  },
+  methods: {
+    /** 开启全屏 */
+    openFullscreen() {
+      this.fullscreen_ = true
+      // 全屏事件
+      this.$emit('fullscreen-change', this.fullscreen_)
     },
-    props: {
-      fullscreen: {
-        type: Boolean,
-        default: true
-      }
+    /** 关闭全屏 */
+    closeFullscreen() {
+      this.fullscreen_ = false
+      // 全屏事件
+      this.$emit('fullscreen-change', this.fullscreen_)
     },
-    methods: {
-      /** 开启全屏 */
-      openFullscreen() {
-        this.fullscreen_ = true
-        // 全屏事件
-        this.$emit('fullscreen-change', this.fullscreen_)
-      },
-      /** 关闭全屏 */
-      closeFullscreen() {
-        this.fullscreen_ = false
-        // 全屏事件
-        this.$emit('fullscreen-change', this.fullscreen_)
-      },
-      /** 全屏事件 */
-      onFullscreen() {
-        if (this.fullscreen_) {
-          this.closeFullscreen()
-        } else {
-          this.openFullscreen()
-        }
+    /** 全屏事件 */
+    onFullscreen() {
+      if (this.fullscreen_) {
+        this.closeFullscreen()
+      } else {
+        this.openFullscreen()
       }
     }
   }
+}
 </script>

package/packages/components/toolbar/components/skin-toggle/form.vue

@@ -2,7 +2,8 @@
   <nm-drawer class="nm-skin-toggle" v-bind="deawer" :visible.sync="visible_" v-on="on">
     <el-divider>皮肤</el-divider>
     <section class="skin-list">
-      <div v-for="item in list" :key="item.code" :class="['skin-list-item', model.name === item.code ? 'active' : '']" @click="onSkinChange(item)">
+      <div v-for="item in list" :key="item.code" :class="['skin-list-item', model.name === item.code ? 'active' : '']"
+        @click="onSkinChange(item)">
         <div class="img">
           <img :src="item.preview" />
         </div>
@@ -18,7 +19,8 @@
     </section>
     <el-divider>主题</el-divider>
     <section class="theme-list">
-      <div :class="['theme-list-item', model.theme === item.name ? 'active' : '']" v-for="item in themes" :key="item.name" :style="{ backgroundColor: item.color }" @click="onThemeChange(item)"></div>
+      <div :class="['theme-list-item', model.theme === item.name ? 'active' : '']" v-for="item in themes"
+        :key="item.name" :style="{ backgroundColor: item.color }" @click="onThemeChange(item)"></div>
     </section>
     <el-divider>字号</el-divider>
     <section class="fontsize-list">
@@ -34,67 +36,67 @@
   </nm-drawer>
 </template>
 <script>
-  import drawer from '../../../../mixins/components/drawer'
-  import { mapState, mapMutations } from 'vuex'
-  export default {
-    mixins: [drawer],
-    data() {
-      return {
-        deawer: {
-          header: true,
-          footer: true,
-          title: '皮肤设置',
-          icon: 'skin',
-          width: '650px',
-          fullscreen: false,
-          modal: false
-        },
-        model: {
-          name: '',
-          theme: '',
-          fontSize: ''
-        },
-        on: {
-          success: this.onSuccess,
-          open: this.onOpen
-        }
-      }
-    },
-    computed: {
-      ...mapState('app/system', { saveSkin: s => s.actions.saveSkin }),
-      ...mapState('app/skins', ['current', 'list']),
-      currSkin() {
-        return this.list.find(m => m.code === this.model.name)
+import drawer from '../../../../mixins/components/drawer'
+import { mapState, mapMutations } from 'vuex'
+export default {
+  mixins: [drawer],
+  data() {
+    return {
+      deawer: {
+        header: true,
+        footer: true,
+        title: '皮肤设置',
+        icon: 'skin',
+        width: '650px',
+        fullscreen: false,
+        modal: false
       },
-      themes() {
-        return this.currSkin ? this.currSkin.themes : []
+      model: {
+        name: '',
+        theme: '',
+        fontSize: ''
+      },
+      on: {
+        success: this.onSuccess,
+        open: this.onOpen
       }
+    }
+  },
+  computed: {
+    ...mapState('app/system', { saveSkin: s => s.actions.saveSkin }),
+    ...mapState('app/skins', ['current', 'list']),
+    currSkin() {
+      return this.list.find(m => m.code === this.model.name)
     },
-    methods: {
-      ...mapMutations('app/skins', ['toggle', 'init']),
-      onSuccess() {
-        this.$emit('success')
-      },
-      onOpen() {
-        this.model = {
-          name: this.current.name,
-          theme: this.current.theme,
-          fontSize: this.current.fontSize || 'default'
-        }
-      },
-      onSkinChange(skin) {
-        this.model.name = skin.code
-        this.model.theme = skin.themes[0].name
-        this.model.fontSize = 'default'
-      },
-      onThemeChange(theme) {
-        this.model.theme = theme.name
-      },
-      onSave() {
-        this.saveSkin(this.model).then(() => {
-          this.init(this.model)
-        })
+    themes() {
+      return this.currSkin ? this.currSkin.themes : []
+    }
+  },
+  methods: {
+    ...mapMutations('app/skins', ['toggle', 'init']),
+    onSuccess() {
+      this.$emit('success')
+    },
+    onOpen() {
+      this.model = {
+        name: this.current.name,
+        theme: this.current.theme,
+        fontSize: this.current.fontSize || 'default'
       }
+    },
+    onSkinChange(skin) {
+      this.model.name = skin.code
+      this.model.theme = skin.themes[0].name
+      this.model.fontSize = 'default'
+    },
+    onThemeChange(theme) {
+      this.model.theme = theme.name
+    },
+    onSave() {
+      this.saveSkin(this.model).then(() => {
+        this.init(this.model)
+      })
     }
   }
+}
 </script>