@dcloudio/uni-app-x 0.7.23 → 0.7.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-x",
-  "version": "0.7.23",
+  "version": "0.7.24",
   "description": "uni-app x types",
   "typings": "index.d.ts",
   "author": "DCloud",

package/types/uni-cloud/unicloud-db/index.ts

@@ -185,7 +185,7 @@ export const mixinDatacom = defineMixin({
     // changed，发生变化的属性名，类型为Array，例如 ['collection', 'action']
     onMixinDatacomPropsChange(_ : boolean, changed : Array<string>) {
     },
-    mixinDatacomEasyGet(options ?: MixinDatacomEasyGetOptions | null) {
+    mixinDatacomEasyGet(options ?: MixinDatacomEasyGetOptions) {
       if (this.mixinDatacomLoading) {
         return
       }
@@ -201,19 +201,22 @@ export const mixinDatacom = defineMixin({
           this.mixinDatacomPage.count = count
         }
 
-        this.mixinDatacomHasMore = !((count !== null) ? (this.mixinDatacomPage.current * this.mixinDatacomPage.size >= count) : (data.length < this.pageSize))
+        this.mixinDatacomHasMore = !((count != null) ? (this.mixinDatacomPage.current * this.mixinDatacomPage.size >= count) : (data.length < this.pageSize))
         this.mixinDatacomResData = data
 
         options?.success?.(res)
       }).catch((err : any | null) => {
         this.mixinDatacomError = err as UniCloudError
         options?.fail?.(err)
-      }).finally(() => {
+      }).then(() => {
+        this.mixinDatacomLoading = false
+        options?.complete?.()
+      }, () => {
         this.mixinDatacomLoading = false
         options?.complete?.()
       })
     },
-    mixinDatacomGet(options ?: MixinDatacomGetOptions | null) : Promise<UniCloudDBGetResult> {
+    mixinDatacomGet(options ?: MixinDatacomGetOptions) : Promise<UniCloudDBGetResult> {
       let db = uniCloud.databaseForJQL()
 
       let collection = Array.isArray(this.collection) ? db.collection(...(this.collection as Array<any>)) : db.collection(this.collection)
@@ -276,7 +279,7 @@ export const mixinDatacom = defineMixin({
         query = collection.skip(size * (current - 1)).limit(size)
       }
 
-      const getOptions = {}
+      const getOptions = {} as UTSJSONObject
       const treeOptions = {
         limitLevel: this.limitlevel,
         startWith: this.startwith