mooho-base-admin-plus 2.5.19 → 2.5.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.5.19",
+  "version": "2.5.21",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/view-form.vue

@@ -355,7 +355,7 @@
                   @update:model-value="$event => setData(data, column.code, $event)"
                   @on-change="selected => onSelectDataChange(column, selected)"
                 >
-                  <Radio v-for="item in getDataSource(data, column)" :key="item.id" :label="item.id" :disabled="readonly || column.isReadonly">
+                  <Radio v-for="item in getDataSource(data, column)" :key="item.id" :label="item.id.toString" :disabled="readonly || column.isReadonly">
                     <span>{{ item.name }}</span>
                   </Radio>
                 </RadioGroup>
@@ -1178,7 +1178,16 @@
 
           // 默认第一项
           if (data) {
-            if (this.parseData(data, column.code) == null && column.isDefaultFirst && res.data.length > 0) {
+            if (
+              column.isDefaultFirst &&
+              res.data.length > 0 &&
+              (this.parseData(data, column.code) == null ||
+                !res.data.some(item => {
+                  return this.parseData(data, column.code) == this.parseData(item, column.sourceDataCode);
+                }))
+            ) {
+              console.log('xxx', this.parseData(data, column.code), res.data);
+
               this.setData(data, column.code, this.parseData(res.data[0], column.sourceDataCode));
               /**
                * 数据变化事件

package/src/components/view/view-table.vue

@@ -1245,7 +1245,9 @@
           this.total = data.length;
 
           // 如果超出页码，设为最后一页
-          if (this.current > Math.ceil(this.total / this.size)) {
+          if (this.total == 0) {
+            this.current = 1;
+          } else if (this.current > Math.ceil(this.total / this.size)) {
             this.current = Math.ceil(this.total / this.size);
           }