From 90d4c3984d8b25526ae0f88a96b7a6823395f977 Mon Sep 17 00:00:00 2001
From: hdx <hdx@dcloud.io>
Date: Tue, 7 Nov 2023 19:02:05 +0800
Subject: [PATCH] =?UTF-8?q?unicloud-db-contacts:=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20value=20=E5=B7=B2=E6=94=AF=E6=8C=81=20any?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=80=A7=E5=88=AB=E7=B1=BB=E5=9E=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=20number,=20=E5=92=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/unicloud-db-contacts/add.uvue    | 7 +++----
 pages/component/unicloud-db-contacts/detail.uvue | 6 +++---
 pages/component/unicloud-db-contacts/edit.uvue   | 8 ++++----
 pages/component/unicloud-db-contacts/list.uvue   | 8 ++++++--
 pages/component/unicloud-db-contacts/types.uts   | 8 ++++----
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/pages/component/unicloud-db-contacts/add.uvue b/pages/component/unicloud-db-contacts/add.uvue
index 00d337ac..700ce261 100644
--- a/pages/component/unicloud-db-contacts/add.uvue
+++ b/pages/component/unicloud-db-contacts/add.uvue
@@ -1,8 +1,6 @@
 <template>
   <view class="page">
-    <unicloud-db ref="udb" v-slot:default="{error}" :collection="collection" loadtime="manual">
-      <view v-if="error!=null" class="error">{{error.errMsg}}</view>
-    </unicloud-db>
+    <unicloud-db ref="udb" :collection="collection" loadtime="manual"></unicloud-db>
     <form @submit="onFormSubmit">
       <view class="form-item">
         <text class="form-item-label">姓名</text>
@@ -51,7 +49,8 @@
     methods: {
       onFormSubmit: function (e : FormSubmitEvent) {
         const formData = e.detail.value
-        formData['gender'] = parseInt(formData['gender'] as string)
+        const genderString = formData['gender'] as string
+        formData['gender'] = (genderString.length > 0) ? parseInt(genderString) : -1
         this.$uniCloudElement!.add(formData, {
           showToast: false,
           needLoading: true,
diff --git a/pages/component/unicloud-db-contacts/detail.uvue b/pages/component/unicloud-db-contacts/detail.uvue
index 68ab58c1..1b2b744e 100644
--- a/pages/component/unicloud-db-contacts/detail.uvue
+++ b/pages/component/unicloud-db-contacts/detail.uvue
@@ -23,7 +23,7 @@
         </view>
         <view class="form-item">
           <text class="form-item-label">性别</text>
-          <text class="form-item-input">{{displayGender(data[0]['gender'])}}</text>
+          <text class="form-item-input">{{displayGender(data[0].getNumber('gender'))}}</text>
         </view>
         <button class="btn-update" type="default" @click="gotoUpdatePage(data[0].getString('_id'))">编辑</button>
       </view>
@@ -60,8 +60,8 @@
       this.$uniCloudElement!.loadData()
     },
     methods: {
-      displayGender(value : any | null) : string {
-        const str = (value ?? 0).toString()
+      displayGender(value : number | null) : string {
+        const str = value ?? -1
         return (GenderList as GenderType[]).find((item : GenderType) : boolean => {
           return item.value == str
         })!.text;
diff --git a/pages/component/unicloud-db-contacts/edit.uvue b/pages/component/unicloud-db-contacts/edit.uvue
index a34b0e2a..ca390010 100644
--- a/pages/component/unicloud-db-contacts/edit.uvue
+++ b/pages/component/unicloud-db-contacts/edit.uvue
@@ -62,7 +62,7 @@
         where: '',
         username: "",
         mobile: "",
-        gender: '',
+        gender: -1,
         comment: "",
         email: "",
         genderList: GenderList as GenderType[],
@@ -80,12 +80,12 @@
     },
     methods: {
       radioChange(e : RadioGroupChangeEvent) {
-        this.gender = e.detail.value
+        this.gender = parseInt(e.detail.value)
       },
       update() {
         const value = {
           username: this.username,
-          gender: parseInt(this.gender),
+          gender: this.gender,
           mobile: this.mobile,
           comment: this.comment,
           email: this.email,
@@ -144,7 +144,7 @@
         const data1 = data[0];
         this.username = data1.getString('username') ?? "";
         this.mobile = data1.getString('mobile') ?? "";
-        this.gender = data1.getNumber('gender')?.toString() ?? '0';
+        this.gender = data1.getNumber('gender') ?? -1;
         this.comment = data1.getString('comment') ?? "";
         this.email = data1.getString('email') ?? "";
       }
diff --git a/pages/component/unicloud-db-contacts/list.uvue b/pages/component/unicloud-db-contacts/list.uvue
index 6501694d..1d0c9745 100644
--- a/pages/component/unicloud-db-contacts/list.uvue
+++ b/pages/component/unicloud-db-contacts/list.uvue
@@ -1,7 +1,7 @@
 <template>
   <view class="page">
-    <unicloud-db ref="udb" v-slot:default="{data, pagination, loading, hasMore, error}" :collection="collection"
-      :page-size="10" :getcount="true" loadtime="manual">
+    <unicloud-db ref="udb" class="udb" v-slot:default="{data, pagination, loading, hasMore, error}"
+      :collection="collection" :page-size="15" :getcount="true" loadtime="manual">
       <view v-if="error!=null" class="error">{{error.errMsg}}</view>
       <list-view ref="listView" class="list-view" :scroll-y="true" @scrolltolower="loadMore()">
         <list-item class="list-item" v-for="(item, _) in data" @click="gotoDetailPage(item['_id'] as string)">
@@ -95,6 +95,10 @@
     padding: 20px;
   }
 
+  .udb {
+    flex: 1;
+  }
+
   .list-view {
     flex: 1;
     flex-direction: column;
diff --git a/pages/component/unicloud-db-contacts/types.uts b/pages/component/unicloud-db-contacts/types.uts
index 68fcbe95..4d204bfe 100644
--- a/pages/component/unicloud-db-contacts/types.uts
+++ b/pages/component/unicloud-db-contacts/types.uts
@@ -2,21 +2,21 @@ export const COLLECTION_NAME = 'opendb-contacts'
 
 export type GenderType = {
   text : string,
-  value : string,
+  value : number,
 }
 
 export const GenderList = [
   {
     text: "未知",
-    value: "0"
+    value: 0
   },
   {
     text: "男",
-    value: "1"
+    value: 1
   },
   {
     text: "女",
-    value: "2"
+    value: 2
   },
 ] as GenderType[]
 
-- 
GitLab