@dcloudio/uni-components 3.0.0-4010420240430002 → 3.0.0-4020320240708001

package/lib-x/page-meta/page-meta.vue

@@ -0,0 +1,10 @@
+<template>
+  <view style="display: none;">
+    <slot />
+  </view>
+</template>
+<script>
+export default {
+  name: 'PageMeta'
+}
+</script>

package/lib-x/page-meta-head/page-meta-head.vue

@@ -0,0 +1,10 @@
+<template>
+  <teleport to="head">
+    <slot />
+  </teleport>
+</template>
+<script>
+export default {
+  name: 'PageMetaHead',
+}
+</script>

package/lib-x/unicloud-db/index.uts

@@ -208,7 +208,10 @@ export const mixinDatacom = defineMixin({
       }).catch((err : any | null) => {
         this.mixinDatacomError = err as UniCloudError
         options?.fail?.(err)
-      }).finally(() => {
+      }).then(() => {
+        this.mixinDatacomLoading = false
+        options?.complete?.()
+      }, () => {
         this.mixinDatacomLoading = false
         options?.complete?.()
       })

package/lib-x/unicloud-db/unicloud-db.vue

@@ -110,7 +110,8 @@
     }
   //#endif
   //#ifdef WEB || APP-IOS
-  export class UniCloudDBElement extends UniElementImpl {
+  const RealUniElementImpl = typeof UniElementImpl === 'undefined' ? class {} : UniElementImpl
+  export class UniCloudDBElement extends RealUniElementImpl {
     constructor(data : INodeData, pageNode : PageNode) {
       super(data, pageNode);
       const TagName = 'UNICLOUD-DB';
@@ -189,7 +190,7 @@
       } as UniCloudDBComponentUpdateOptions)
     }
 
-    onLoadData! : (_ : UniCloudDBComponentLoadDataOptions) => void
+    onLoadData! : (_ : UniCloudDBComponentLoadDataOptions) => Promise<void>
     onLoadMore! : () => void
     onAdd! : (value : UTSJSONObject, options : UniCloudDBComponentAddOptions) => void
     onUpdate!: (id : string, value : UTSJSONObject, options : UniCloudDBComponentUpdateOptions) => void
@@ -287,11 +288,23 @@
       manual: {
         type: Boolean,
         default: false
+      },
+      ssrKey: {
+        type: String,
+        default: ""
       }
     },
     data() {
       return {
+        //#ifdef WEB
+        // TODO 修复类型错误
+        // @ts-ignore
+        dataList: ssrRef([] as Array<UTSJSONObject>) as Array<UTSJSONObject>,
+        //#endif
+        //#ifndef WEB
         dataList: [] as Array<UTSJSONObject>,
+        //#endif
+        // dataList: [] as Array<UTSJSONObject>,
         loading: false,
         hasMore: false,
         isEnded: false,
@@ -308,13 +321,22 @@
       if (!registerFlag) {
         registerFlag = true
         // @ts-ignore
-        customElements.define(
+        typeof customElements !== 'undefined' && customElements.define(
           'uni-cloud-db-element',
           UniCloudDBElement,
         )
       }
     },
     //#endif
+    //#ifdef WEB
+    async serverPrefetch() : Promise<any> {
+      // @ts-ignore
+      if (!this.manual && this.loadtime === 'auto') {
+        // @ts-ignore
+        return this.loadData({})
+      }
+    },
+    //#endif
     created() {
       this.pagination.current = this.pageCurrent
       this.pagination.size = this.pageSize
@@ -358,7 +380,7 @@
         }
       )
 
-      if (!this.manual && this.loadtime == LOAD_MODE_AUTO) {
+      if (!this.manual && this.loadtime == LOAD_MODE_AUTO && this.dataList.length == 0) {
         if (typeof this.collection == 'string') {
           const collectionString = this.collection as string
           if (collectionString.length == 0) {
@@ -393,7 +415,7 @@
       //#endif
     },
     methods: {
-      loadData(options : UniCloudDBComponentLoadDataOptions) {
+      async loadData(options : UniCloudDBComponentLoadDataOptions) : Promise<void> {
         let clear = (options.clear != null && options.clear == true)
         if (clear == true) {
           if (this.pageData == PAGE_MODE_REPLACE) {
@@ -402,7 +424,7 @@
           this.reset()
         }
 
-        this.get(options)
+        await this.get(options)
       },
       loadMore() {
         if (this.isEnded || this.loading) {
@@ -426,7 +448,7 @@
       reset() {
         this.pagination.current = 1
       },
-      get(options? : UniCloudDBComponentLoadDataOptions) {
+      async get(options? : UniCloudDBComponentLoadDataOptions) : Promise<void> {
         let loadAfterClear = false
         if (options != null && options.clear != null && options.clear == true) {
           loadAfterClear = true
@@ -438,7 +460,7 @@
         this.error = null
 
         this.loading = true
-        this.getExec().then((res : UniCloudDBGetResult) => {
+        await this.getExec().then((res : UniCloudDBGetResult) => {
           const data = res.data
           const count = res.count
 
@@ -461,7 +483,10 @@
         }).catch((err : any | null) => {
           this._requestFail(err, null)
           options?.fail?.(err)
-        }).finally(() => {
+        }).then(() => {
+          this.loading = false
+          options?.complete?.()
+        }, () => {
           this.loading = false
           options?.complete?.()
         })
@@ -474,7 +499,9 @@
           this._isShowToast(options.showToast ?? false, options.toastTitle ?? 'add success')
         }).catch((err) => {
           this._requestFail(err, options.fail)
-        }).finally(() => {
+        }).then(() => {
+          this._requestComplete(options.complete, options.needLoading)
+        }, () => {
           this._requestComplete(options.complete, options.needLoading)
         })
       },
@@ -519,7 +546,9 @@
           this._isShowToast(options.showToast ?? false, options.toastTitle ?? 'update success')
         }).catch((err : any | null) => {
           this._requestFail(err, options.fail)
-        }).finally(() => {
+        }).then(() => {
+          this._requestComplete(options.complete, options.needLoading)
+        }, () => {
           this._requestComplete(options.complete, options.needLoading)
         })
       },
@@ -538,7 +567,9 @@
           }
         }).catch((err : any | null) => {
           this._requestFail(err, options.fail)
-        }).finally(() => {
+        }).then(() => {
+          this._requestComplete(options.complete, options.needLoading)
+        }, () => {
           this._requestComplete(options.complete, options.needLoading)
         })
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-components",
-  "version": "3.0.0-4010420240430002",
+  "version": "3.0.0-4020320240708001",
   "description": "@dcloudio/uni-components",
   "main": "index.js",
   "files": [
@@ -20,12 +20,12 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
-    "@dcloudio/uni-cloud": "3.0.0-4010420240430002",
-    "@dcloudio/uni-h5": "3.0.0-4010420240430002",
-    "@dcloudio/uni-i18n": "3.0.0-4010420240430002"
+    "@dcloudio/uni-cloud": "3.0.0-4020320240708001",
+    "@dcloudio/uni-h5": "3.0.0-4020320240708001",
+    "@dcloudio/uni-i18n": "3.0.0-4020320240708001"
   },
   "devDependencies": {
-    "@dcloudio/uni-shared": "3.0.0-4010420240430002",
+    "@dcloudio/uni-shared": "3.0.0-4020320240708001",
     "@types/quill": "1.3.10"
   }
 }

package/style/picker-view-column.css

@@ -61,7 +61,7 @@ uni-picker-view-column[hidden] {
 }
 
 .uni-picker-view-content > * {
-  height: 34px;
+  height: var(--picker-view-column-indicator-height);
   overflow: hidden;
 }
 

package/style-x/switch.css

@@ -36,29 +36,24 @@ uni-switch[disabled] .uni-switch-input {
   transition: background-color 0.1s, border 0.1s;
 }
 
-.uni-switch-input:after {
-  content: ' ';
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 28px;
-  height: 28px;
-  border-radius: 15px;
-  background-color: #ffffff;
-  box-shadow: 0 2px 3px rgba(0, 0, 0, 0.06);
-  transition: transform 0.3s;
-}
-
 .uni-switch-input.uni-switch-input-checked {
   border-color: #007aff;
   background-color: #007aff;
 }
 
-.uni-switch-input.uni-switch-input-checked:before {
-  transform: scale(0);
+uni-switch .uni-switch-thumb {
+  width: 28px;
+  height: 28px;
+  background-color: #fff;
+  border-radius: 15px;
+  box-shadow: 0 2px 3px rgba(0, 0, 0, 0.06);
+  transition-duration: 0.3s;
+  transition-property: transform;
+  transform: translateX(0px);
+  overflow: visible;
 }
 
-.uni-switch-input.uni-switch-input-checked:after {
+uni-switch .uni-switch-thumb-checked {
   transform: translateX(20px);
 }