@dcloudio/uni-cli-shared 2.0.2-4020420240722002 → 2.0.2-4020420240722004

package/components/unicloud-db.vue

@@ -1,674 +1,668 @@
 <template>
   <view>
-    <slot
-      :options="options"
-      :data="dataList"
-      :pagination="paginationInternal"
-      :loading="loading"
-      :hasMore="hasMore"
-      :error="errorMessage"
-    />
+    <slot :options="options" :data="dataList" :pagination="paginationInternal" :loading="loading" :hasMore="hasMore"
+      :error="errorMessage" />
   </view>
 </template>
 
 <script>
-import {
-  initVueI18n
-} from '@dcloudio/uni-i18n'
-import messages from './i18n/index'
-
-const {
-  t
-} = initVueI18n(messages)
-
-const events = {
-  load: 'load',
-  error: 'error'
-}
-const pageMode = {
-  add: 'add',
-  replace: 'replace'
-}
-const loadMode = {
-  auto: 'auto',
-  onready: 'onready',
-  manual: 'manual'
-}
-
-const attrs = [
-  'pageCurrent',
-  'pageSize',
-  'spaceInfo',
-  'collection',
-  'action',
-  'field',
-  'getcount',
-  'orderby',
-  'where',
-  'groupby',
-  'groupField',
-  'distinct'
-]
-
-export default {
-  name: 'UniClouddb',
-  props: {
-    options: {
-      type: [Object, Array],
-      default () {
-        return {}
+  import {
+    initVueI18n
+  } from '@dcloudio/uni-i18n'
+  import messages from './i18n/index'
+
+  const {
+    t
+  } = initVueI18n(messages)
+
+  const events = {
+    load: 'load',
+    error: 'error'
+  }
+  const pageMode = {
+    add: 'add',
+    replace: 'replace'
+  }
+  const loadMode = {
+    auto: 'auto',
+    onready: 'onready',
+    manual: 'manual'
+  }
+
+  const attrs = [
+    'pageCurrent',
+    'pageSize',
+    'spaceInfo',
+    'collection',
+    'action',
+    'field',
+    'getcount',
+    'orderby',
+    'where',
+    'groupby',
+    'groupField',
+    'distinct'
+  ]
+
+  export default {
+    name: 'UniClouddb',
+    props: {
+      options: {
+        type: [Object, Array],
+        default () {
+          return {}
+        }
+      },
+      spaceInfo: {
+        type: Object,
+        default () {
+          return {}
+        }
+      },
+      collection: {
+        type: [String, Array],
+        default: ''
+      },
+      action: {
+        type: String,
+        default: ''
+      },
+      field: {
+        type: String,
+        default: ''
+      },
+      orderby: {
+        type: String,
+        default: ''
+      },
+      where: {
+        type: [String, Object],
+        default: ''
+      },
+      pageData: {
+        type: String,
+        default: 'add'
+      },
+      pageCurrent: {
+        type: Number,
+        default: 1
+      },
+      pageSize: {
+        type: Number,
+        default: 20
+      },
+      getcount: {
+        type: [Boolean, String],
+        default: false
+      },
+      getone: {
+        type: [Boolean, String],
+        default: false
+      },
+      gettree: {
+        type: [Boolean, String, Object],
+        default: false
+      },
+      gettreepath: {
+        type: [Boolean, String],
+        default: false
+      },
+      startwith: {
+        type: String,
+        default: ''
+      },
+      limitlevel: {
+        type: Number,
+        default: 10
+      },
+      groupby: {
+        type: String,
+        default: ''
+      },
+      groupField: {
+        type: String,
+        default: ''
+      },
+      distinct: {
+        type: [Boolean, String],
+        default: false
+      },
+      pageIndistinct: {
+        type: [Boolean, String],
+        default: false
+      },
+      foreignKey: {
+        type: String,
+        default: ''
+      },
+      loadtime: {
+        type: String,
+        default: 'auto'
+      },
+      manual: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        loading: false,
+        hasMore: false,
+        dataList: this.getone ? undefined : [],
+        paginationInternal: {},
+        errorMessage: ''
+      }
+    },
+    computed: {
+      collectionArgs() {
+        return Array.isArray(this.collection) ? this.collection : [this.collection]
+      },
+      isLookup() {
+        return (Array.isArray(this.collection) && this.collection.length > 1) || (typeof this.collection === 'string' &&
+          this.collection.indexOf(',') > -1)
       }
     },
-    spaceInfo: {
-      type: Object,
-      default () {
-        return {}
+    created() {
+      this._isEnded = false
+      this.paginationInternal = {
+        current: this.pageCurrent,
+        size: this.pageSize,
+        count: 0
       }
-    },
-    collection: {
-      type: [String, Array],
-      default: ''
-    },
-    action: {
-      type: String,
-      default: ''
-    },
-    field: {
-      type: String,
-      default: ''
-    },
-    orderby: {
-      type: String,
-      default: ''
-    },
-    where: {
-      type: [String, Object],
-      default: ''
-    },
-    pageData: {
-      type: String,
-      default: 'add'
-    },
-    pageCurrent: {
-      type: Number,
-      default: 1
-    },
-    pageSize: {
-      type: Number,
-      default: 20
-    },
-    getcount: {
-      type: [Boolean, String],
-      default: false
-    },
-    getone: {
-      type: [Boolean, String],
-      default: false
-    },
-    gettree: {
-      type: [Boolean, String, Object],
-      default: false
-    },
-    gettreepath: {
-      type: [Boolean, String],
-      default: false
-    },
-    startwith: {
-      type: String,
-      default: ''
-    },
-    limitlevel: {
-      type: Number,
-      default: 10
-    },
-    groupby: {
-      type: String,
-      default: ''
-    },
-    groupField: {
-      type: String,
-      default: ''
-    },
-    distinct: {
-      type: [Boolean, String],
-      default: false
-    },
-    pageIndistinct: {
-      type: [Boolean, String],
-      default: false
-    },
-    foreignKey: {
-      type: String,
-      default: ''
-    },
-    loadtime: {
-      type: String,
-      default: 'auto'
-    },
-    manual: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      loading: false,
-      hasMore: false,
-      dataList: this.getone ? undefined : [],
-      paginationInternal: {},
-      errorMessage: ''
-    }
-  },
-  computed: {
-    collectionArgs () {
-      return Array.isArray(this.collection) ? this.collection : [this.collection]
-    },
-    isLookup () {
-      return (Array.isArray(this.collection) && this.collection.length > 1) || (typeof this.collection === 'string' &&
-          this.collection.indexOf(',') > -1)
-    }
-  },
-  created () {
-    this._isEnded = false
-    this.paginationInternal = {
-      current: this.pageCurrent,
-      size: this.pageSize,
-      count: 0
-    }
 
-    this.$watch(() => {
-      var al = []
-      attrs.forEach(key => {
-        al.push(this[key])
-      })
-      return al
-    }, (newValue, oldValue) => {
-      this.paginationInternal.size = this.pageSize
-      if (newValue[0] !== oldValue[0]) {
-        this.paginationInternal.current = this.pageCurrent
-      }
-      if (this.loadtime === loadMode.manual) {
-        return
-      }
+      this.$watch(() => {
+        var al = []
+        attrs.forEach(key => {
+          al.push(this[key])
+        })
+        return al
+      }, (newValue, oldValue) => {
+        this.paginationInternal.size = this.pageSize
+        if (newValue[0] !== oldValue[0]) {
+          this.paginationInternal.current = this.pageCurrent
+        }
+        if (this.loadtime === loadMode.manual) {
+          return
+        }
 
-      let needReset = false
-      for (let i = 2; i < newValue.length; i++) {
-        if (newValue[i] !== oldValue[i]) {
-          needReset = true
-          break
+        let needReset = false
+        for (let i = 2; i < newValue.length; i++) {
+          if (newValue[i] !== oldValue[i]) {
+            needReset = true
+            break
+          }
+        }
+        if (needReset) {
+          this.clear()
+          this.reset()
         }
-      }
-      if (needReset) {
-        this.clear()
-        this.reset()
-      }
 
-      this._execLoadData()
-    })
+        this._execLoadData()
+      })
 
-    // #ifdef H5
-    if (process.env.NODE_ENV === 'development') {
-      this._debugDataList = []
-      if (!window.unidev) {
-        window.unidev = {
-          clientDB: {
-            data: []
+      // #ifdef H5
+      if (process.env.NODE_ENV === 'development') {
+        this._debugDataList = []
+        if (!window.unidev) {
+          window.unidev = {
+            clientDB: {
+              data: []
+            }
           }
         }
+        window.unidev.clientDB.data.push(this._debugDataList)
       }
-      window.unidev.clientDB.data.push(this._debugDataList)
-    }
-    // #endif
+      // #endif
 
-    // #ifdef MP-TOUTIAO
-    let changeName
-    const events = this.$scope.dataset.eventOpts || []
-    for (var i = 0; i < events.length; i++) {
-      const event = events[i]
-      if (event[0].includes('^load')) {
-        changeName = event[1][0][0]
-      }
-    }
-    if (changeName) {
-      let parent = this.$parent
-      let maxDepth = 16
-      this._changeDataFunction = null
-      while (parent && maxDepth > 0) {
-        const fun = parent[changeName]
-        if (fun && typeof fun === 'function') {
-          this._changeDataFunction = fun
-          maxDepth = 0
-          break
-        }
-        parent = parent.$parent
-        maxDepth--
-      }
-    }
-    // #endif
-
-    if (!this.manual && this.loadtime === loadMode.auto) {
-      this.loadData()
-    }
-  },
-  // #ifdef H5
-  beforeDestroy () {
-    if (process.env.NODE_ENV === 'development' && window.unidev) {
-      var cd = this._debugDataList
-      var dl = window.unidev.clientDB.data
-      for (var i = dl.length - 1; i >= 0; i--) {
-        if (dl[i] === cd) {
-          dl.splice(i, 1)
-          break
+      // #ifdef MP-TOUTIAO
+      let changeName
+      const events = this.$scope.dataset.eventOpts || []
+      for (var i = 0; i < events.length; i++) {
+        const event = events[i]
+        if (event[0].includes('^load')) {
+          changeName = event[1][0][0]
         }
       }
-    }
-  },
-  // #endif
-  methods: {
-    loadData (args1, args2) {
-      let callback = null
-      let clear = false
-      if (typeof args1 === 'object') {
-        if (args1.clear) {
-          if (this.pageData === pageMode.replace) {
-            this.clear()
-          } else {
-            clear = args1.clear
+      if (changeName) {
+        let parent = this.$parent
+        let maxDepth = 16
+        this._changeDataFunction = null
+        while (parent && maxDepth > 0) {
+          const fun = parent[changeName]
+          if (fun && typeof fun === 'function') {
+            this._changeDataFunction = fun
+            maxDepth = 0
+            break
           }
-          this.reset()
+          parent = parent.$parent
+          maxDepth--
         }
-        if (args1.current !== undefined) {
-          this.paginationInternal.current = args1.current
-        }
-        if (typeof args2 === 'function') {
-          callback = args2
-        }
-      } else if (typeof args1 === 'function') {
-        callback = args1
       }
+      // #endif
 
-      this._execLoadData(callback, clear)
-    },
-    loadMore () {
-      if (this._isEnded || this.loading) {
-        return
+      if (!this.manual && this.loadtime === loadMode.auto) {
+        this.loadData()
       }
-
-      if (this.pageData === pageMode.add) {
-        this.paginationInternal.current++
-      }
-
-      this._execLoadData()
-    },
-    refresh () {
-      this.clear()
-      this._execLoadData()
     },
-    clear () {
-      this._isEnded = false
-      this.dataList = []
-    },
-    reset () {
-      this.paginationInternal.current = 1
-    },
-    add (value, {
-      action,
-      showToast = true,
-      toastTitle,
-      success,
-      fail,
-      complete,
-      needConfirm = true,
-      needLoading = true,
-      loadingTitle = ''
-    } = {}) {
-      if (needLoading) {
-        uni.showLoading({
-          title: loadingTitle
-        })
-      }
-      /* eslint-disable no-undef */
-      let db = uniCloud.database(this.spaceInfo)
-      if (action) {
-        db = db.action(action)
+    // #ifdef H5
+    beforeDestroy() {
+      if (process.env.NODE_ENV === 'development' && window.unidev) {
+        var cd = this._debugDataList
+        var dl = window.unidev.clientDB.data
+        for (var i = dl.length - 1; i >= 0; i--) {
+          if (dl[i] === cd) {
+            dl.splice(i, 1)
+            break
+          }
+        }
       }
+    },
+    // #endif
+    methods: {
+      loadData(args1, args2) {
+        let callback = null
+        let clear = false
+        if (typeof args1 === 'object') {
+          if (args1.clear) {
+            if (this.pageData === pageMode.replace) {
+              this.clear()
+            } else {
+              clear = args1.clear
+            }
+            this.reset()
+          }
+          if (args1.current !== undefined) {
+            this.paginationInternal.current = args1.current
+          }
+          if (typeof args2 === 'function') {
+            callback = args2
+          }
+        } else if (typeof args1 === 'function') {
+          callback = args1
+        }
 
-      db.collection(this.getMainCollection()).add(value).then((res) => {
-        success && success(res)
-        if (showToast) {
-          uni.showToast({
-            title: toastTitle || t('uniCloud.component.add.success')
-          })
+        this._execLoadData(callback, clear)
+      },
+      loadMore() {
+        if (this._isEnded || this.loading) {
+          return
         }
-      }).catch((err) => {
-        fail && fail(err)
-        if (needConfirm) {
-          uni.showModal({
-            content: err.message,
-            showCancel: false
-          })
+
+        if (this.pageData === pageMode.add) {
+          this.paginationInternal.current++
         }
-      }).finally(() => {
+
+        this._execLoadData()
+      },
+      refresh() {
+        this.clear()
+        this._execLoadData()
+      },
+      clear() {
+        this._isEnded = false
+        this.dataList = []
+      },
+      reset() {
+        this.paginationInternal.current = 1
+      },
+      add(value, {
+        action,
+        showToast = true,
+        toastTitle,
+        success,
+        fail,
+        complete,
+        needConfirm = true,
+        needLoading = true,
+        loadingTitle = ''
+      } = {}) {
         if (needLoading) {
-          uni.hideLoading()
+          uni.showLoading({
+            title: loadingTitle
+          })
         }
-        complete && complete()
-      })
-    },
-    remove (id, {
-      action,
-      success,
-      fail,
-      complete,
-      confirmTitle,
-      confirmContent,
-      needConfirm = true,
-      needLoading = true,
-      loadingTitle = ''
-    } = {}) {
-      if (!id || !id.length) {
-        return
-      }
-      if (!needConfirm) {
-        this._execRemove(id, action, success, fail, complete, needConfirm, needLoading, loadingTitle)
-        return
-      }
-      uni.showModal({
-        title: confirmTitle || t('uniCloud.component.remove.showModal.title'),
-        content: confirmContent || t('uniCloud.component.remove.showModal.content'),
-        showCancel: true,
-        success: (res) => {
-          if (!res.confirm) {
-            return
+        /* eslint-disable no-undef */
+        let db = uniCloud.database(this.spaceInfo)
+        if (action) {
+          db = db.action(action)
+        }
+
+        db.collection(this.getMainCollection()).add(value).then((res) => {
+          success && success(res)
+          if (showToast) {
+            uni.showToast({
+              title: toastTitle || t('uniCloud.component.add.success')
+            })
+          }
+        }).catch((err) => {
+          fail && fail(err)
+          if (needConfirm) {
+            uni.showModal({
+              content: err.message,
+              showCancel: false
+            })
+          }
+        }).finally(() => {
+          if (needLoading) {
+            uni.hideLoading()
           }
+          complete && complete()
+        })
+      },
+      remove(id, {
+        action,
+        success,
+        fail,
+        complete,
+        confirmTitle,
+        confirmContent,
+        needConfirm = true,
+        needLoading = true,
+        loadingTitle = ''
+      } = {}) {
+        if (!id || !id.length) {
+          return
+        }
+        if (!needConfirm) {
           this._execRemove(id, action, success, fail, complete, needConfirm, needLoading, loadingTitle)
+          return
         }
-      })
-    },
-    update (id, value, options = {}) {
-      const fixOptions = Object.assign({
-        action: null,
-        showToast: true,
-        toastTitle: null,
-        success: null,
-        fail: null,
-        complete: null,
-        confirmTitle: null,
-        confirmContent: null,
-        needConfirm: true,
-        needLoading: true,
-        loadingTitle: ''
-      }, options)
-      if (!options.needConfirm) {
         uni.showModal({
-          title: options.confirmTitle || t('uniCloud.component.update.showModal.title'),
-          content: options.confirmContent || t('uniCloud.component.update.showModal.content'),
+          title: confirmTitle || t('uniCloud.component.remove.showModal.title'),
+          content: confirmContent || t('uniCloud.component.remove.showModal.content'),
           showCancel: true,
           success: (res) => {
-            if (res.confirm) {
-              this._doUpdate(id, value, fixOptions)
+            if (!res.confirm) {
+              return
             }
+            this._execRemove(id, action, success, fail, complete, needConfirm, needLoading, loadingTitle)
           }
         })
-      } else {
-        this._doUpdate(id, value, fixOptions)
-      }
-    },
-    _doUpdate (id, value, options) {
-      const {
-        action,
-        success,
-        fail,
-        complete,
-        showToast,
-        toastTitle,
-        needConfirm,
-        needLoading,
-        loadingTitle
-      } = options
-
-      if (needLoading) {
-        uni.showLoading({
-          title: loadingTitle
-        })
-      }
-      /* eslint-disable no-undef */
-      let db = uniCloud.database(this.spaceInfo)
-      if (action) {
-        db = db.action(action)
-      }
-
-      db.collection(this.getMainCollection()).doc(id).update(value).then((res) => {
-        success && success(res)
-        if (showToast) {
-          uni.showToast({
-            title: toastTitle || t('uniCloud.component.update.success')
-          })
-        }
-      }).catch((err) => {
-        fail && fail(err)
-        if (needConfirm) {
+      },
+      update(id, value, options = {}) {
+        const fixOptions = Object.assign({
+          action: null,
+          showToast: true,
+          toastTitle: null,
+          success: null,
+          fail: null,
+          complete: null,
+          confirmTitle: null,
+          confirmContent: null,
+          needConfirm: true,
+          needLoading: true,
+          loadingTitle: ''
+        }, options);
+        if (!options.needConfirm) {
           uni.showModal({
-            content: err.message,
-            showCancel: false
+            title: options.confirmTitle || t('uniCloud.component.update.showModal.title'),
+            content: options.confirmContent || t('uniCloud.component.update.showModal.content'),
+            showCancel: true,
+            success: (res) => {
+              if (res.confirm) {
+                this._doUpdate(id, value, fixOptions)
+              }
+            }
           })
+        } else {
+          this._doUpdate(id, value, fixOptions)
         }
-      }).finally(() => {
+      },
+      _doUpdate(id, value, options) {
+        const {
+          action,
+          success,
+          fail,
+          complete,
+          showToast,
+          toastTitle,
+          needConfirm,
+          needLoading,
+          loadingTitle
+        } = options
+
         if (needLoading) {
-          uni.hideLoading()
+          uni.showLoading({
+            title: loadingTitle
+          })
+        }
+        /* eslint-disable no-undef */
+        let db = uniCloud.database(this.spaceInfo)
+        if (action) {
+          db = db.action(action)
         }
-        complete && complete()
-      })
-    },
-    getMainCollection () {
-      if (typeof this.collection === 'string') {
-        return this.collection.split(',')[0]
-      }
-      const mainQuery = JSON.parse(JSON.stringify(this.collection[0]))
-      return mainQuery.$db[0].$param[0]
-    },
-    getTemp (isTemp = true) {
-      /* eslint-disable no-undef */
-      let db = uniCloud.database(this.spaceInfo)
-
-      if (this.action) {
-        db = db.action(this.action)
-      }
-
-      db = db.collection(...this.collectionArgs)
 
-      if (this.foreignKey) {
-        db = db.foreignKey(this.foreignKey)
-      }
-      if (!(!this.where || !Object.keys(this.where).length)) {
-        db = db.where(this.where)
-      }
-      if (this.field) {
-        db = db.field(this.field)
-      }
-      if (this.groupby) {
-        db = db.groupBy(this.groupby)
-      }
-      if (this.groupField) {
-        db = db.groupField(this.groupField)
-      }
-      if (this.distinct === true) {
-        db = db.distinct()
-      }
-      if (this.orderby) {
-        db = db.orderBy(this.orderby)
-      }
+        db.collection(this.getMainCollection()).doc(id).update(value).then((res) => {
+          success && success(res)
+          if (showToast) {
+            uni.showToast({
+              title: toastTitle || t('uniCloud.component.update.success')
+            })
+          }
+        }).catch((err) => {
+          fail && fail(err)
+          if (needConfirm) {
+            uni.showModal({
+              content: err.message,
+              showCancel: false
+            })
+          }
+        }).finally(() => {
+          if (needLoading) {
+            uni.hideLoading()
+          }
+          complete && complete()
+        })
+      },
+      getMainCollection() {
+        if (typeof this.collection === 'string') {
+          return this.collection.split(',')[0]
+        }
+        const mainQuery = JSON.parse(JSON.stringify(this.collection[0]))
+        return mainQuery.$db[0].$param[0]
+      },
+      getTemp(isTemp = true) {
+        /* eslint-disable no-undef */
+        let db = uniCloud.database(this.spaceInfo)
+
+        if (this.action) {
+          db = db.action(this.action)
+        }
 
-      const {
-        current,
-        size
-      } = this.paginationInternal
-      const getOptions = {}
-      if (this.getcount) {
-        getOptions.getCount = this.getcount
-      }
-      const treeOptions = {
-        limitLevel: this.limitlevel,
-        startWith: this.startwith
-      }
-      if (this.gettree) {
-        getOptions.getTree = treeOptions
-      }
-      if (this.gettreepath) {
-        getOptions.getTreePath = treeOptions
-      }
-      db = db.skip(size * (current - 1)).limit(size)
+        db = db.collection(...this.collectionArgs)
 
-      if (isTemp) {
-        db = db.getTemp(getOptions)
-        db.udb = this
-      } else {
-        db = db.get(getOptions)
-      }
+        if (this.foreignKey) {
+          db = db.foreignKey(this.foreignKey)
+        }
+        if (!(!this.where || !Object.keys(this.where).length)) {
+          db = db.where(this.where)
+        }
+        if (this.field) {
+          db = db.field(this.field)
+        }
+        if (this.groupby) {
+          db = db.groupBy(this.groupby)
+        }
+        if (this.groupField) {
+          db = db.groupField(this.groupField)
+        }
+        if (this.distinct === true) {
+          db = db.distinct()
+        }
+        if (this.orderby) {
+          db = db.orderBy(this.orderby)
+        }
 
-      return db
-    },
-    setResult (result) {
-      if (result.code === 0) {
-        this._execLoadDataSuccess(result)
-      } else {
-        this._execLoadDataFail(new Error(result.message))
-      }
-    },
-    _execLoadData (callback, clear) {
-      if (this.loading) {
-        return
-      }
-      this.loading = true
-      this.errorMessage = ''
+        const {
+          current,
+          size
+        } = this.paginationInternal
+        const getOptions = {}
+        if (this.getcount) {
+          getOptions.getCount = this.getcount
+        }
+        const treeOptions = {
+          limitLevel: this.limitlevel,
+          startWith: this.startwith
+        }
+        if (this.gettree) {
+          getOptions.getTree = treeOptions
+        }
+        if (this.gettreepath) {
+          getOptions.getTreePath = treeOptions
+        }
+        db = db.skip(size * (current - 1)).limit(size)
 
-      this._getExec().then((res) => {
-        this.loading = false
-        this._execLoadDataSuccess(res.result, callback, clear)
+        if (isTemp) {
+          db = db.getTemp(getOptions)
+          db.udb = this
+        } else {
+          db = db.get(getOptions)
+        }
 
-        // #ifdef H5
-        if (process.env.NODE_ENV === 'development') {
-          this._debugDataList.length = 0
-          const formatData = JSON.parse(JSON.stringify(this.dataList))
-          if (Array.isArray(this.dataList)) {
-            this._debugDataList.push(...formatData)
-          } else {
-            this._debugDataList.push(formatData)
-          }
+        return db
+      },
+      setResult(result) {
+        if (result.code === 0) {
+          this._execLoadDataSuccess(result)
+        } else {
+          this._execLoadDataFail(new Error(result.message))
         }
-        // #endif
-      }).catch((err) => {
-        this.loading = false
-        this._execLoadDataFail(err, callback)
-      })
-    },
-    _execLoadDataSuccess (result, callback, clear) {
-      const {
-        data,
-        count
-      } = result
-      this._isEnded = count !== undefined ? (this.paginationInternal.current * this.paginationInternal.size >=
+      },
+      _execLoadData(callback, clear) {
+        if (this.loading) {
+          return
+        }
+        this.loading = true
+        this.errorMessage = ''
+
+        this._getExec().then((res) => {
+          this.loading = false
+          this._execLoadDataSuccess(res.result, callback, clear)
+
+          // #ifdef H5
+          if (process.env.NODE_ENV === 'development') {
+            this._debugDataList.length = 0
+            const formatData = JSON.parse(JSON.stringify(this.dataList))
+            if (Array.isArray(this.dataList)) {
+              this._debugDataList.push(...formatData)
+            } else {
+              this._debugDataList.push(formatData)
+            }
+          }
+          // #endif
+        }).catch((err) => {
+          this.loading = false
+          this._execLoadDataFail(err, callback)
+        })
+      },
+      _execLoadDataSuccess(result, callback, clear) {
+        const {
+          data,
+          count
+        } = result
+        this._isEnded = count !== undefined ? (this.paginationInternal.current * this.paginationInternal.size >=
           count) : (data.length < this.pageSize)
-      this.hasMore = !this._isEnded
+        this.hasMore = !this._isEnded
 
-      const data2 = this.getone ? (data.length ? data[0] : undefined) : data
+        const data2 = this.getone ? (data.length ? data[0] : undefined) : data
 
-      if (this.getcount) {
-        this.paginationInternal.count = count
-      }
+        if (this.getcount) {
+          this.paginationInternal.count = count
+        }
 
-      callback && callback(data2, this._isEnded, this.paginationInternal)
-      this._dispatchEvent(events.load, data2)
+        callback && callback(data2, this._isEnded, this.paginationInternal)
+        this._dispatchEvent(events.load, data2)
 
-      if (this.getone || this.pageData === pageMode.replace) {
-        this.dataList = data2
-      } else {
-        if (clear) {
+        if (this.getone || this.pageData === pageMode.replace) {
           this.dataList = data2
         } else {
-          this.dataList.push(...data2)
+          if (clear) {
+            this.dataList = data2
+          } else {
+            this.dataList.push(...data2)
+          }
+        }
+      },
+      _execLoadDataFail(err, callback) {
+        this.errorMessage = err
+        callback && callback()
+        this.$emit(events.error, err)
+        if (process.env.NODE_ENV === 'development') {
+          console.error(err)
+        }
+      },
+      _getExec() {
+        return this.getTemp(false)
+      },
+      _execRemove(id, action, success, fail, complete, needConfirm, needLoading, loadingTitle) {
+        if (!this.collection || !id) {
+          return
         }
-      }
-    },
-    _execLoadDataFail (err, callback) {
-      this.errorMessage = err
-      callback && callback()
-      this.$emit(events.error, err)
-      if (process.env.NODE_ENV === 'development') {
-        console.error(err)
-      }
-    },
-    _getExec () {
-      return this.getTemp(false)
-    },
-    _execRemove (id, action, success, fail, complete, needConfirm, needLoading, loadingTitle) {
-      if (!this.collection || !id) {
-        return
-      }
-
-      const ids = Array.isArray(id) ? id : [id]
-      if (!ids.length) {
-        return
-      }
 
-      if (needLoading) {
-        uni.showLoading({
-          mask: true,
-          title: loadingTitle
-        })
-      }
+        const ids = Array.isArray(id) ? id : [id]
+        if (!ids.length) {
+          return
+        }
 
-      /* eslint-disable no-undef */
-      const db = uniCloud.database(this.spaceInfo)
-      const dbCmd = db.command
+        if (needLoading) {
+          uni.showLoading({
+            mask: true,
+            title: loadingTitle
+          })
+        }
 
-      let exec = db
-      if (action) {
-        exec = exec.action(action)
-      }
+        /* eslint-disable no-undef */
+        const db = uniCloud.database(this.spaceInfo)
+        const dbCmd = db.command
 
-      exec.collection(this.getMainCollection()).where({
-        _id: dbCmd.in(ids)
-      }).remove().then((res) => {
-        success && success(res.result)
-        if (this.pageData === pageMode.replace) {
-          this.refresh()
-        } else {
-          this.removeData(ids)
-        }
-      }).catch((err) => {
-        fail && fail(err)
-        if (needConfirm) {
-          uni.showModal({
-            content: err.message,
-            showCancel: false
-          })
+        let exec = db
+        if (action) {
+          exec = exec.action(action)
         }
-      }).finally(() => {
-        if (needLoading) {
-          uni.hideLoading()
+
+        exec.collection(this.getMainCollection()).where({
+          _id: dbCmd.in(ids)
+        }).remove().then((res) => {
+          success && success(res.result)
+          if (this.pageData === pageMode.replace) {
+            this.refresh()
+          } else {
+            this.removeData(ids)
+          }
+        }).catch((err) => {
+          fail && fail(err)
+          if (needConfirm) {
+            uni.showModal({
+              content: err.message,
+              showCancel: false
+            })
+          }
+        }).finally(() => {
+          if (needLoading) {
+            uni.hideLoading()
+          }
+          complete && complete()
+        })
+      },
+      removeData(ids) {
+        const il = ids.slice(0)
+        const dl = this.dataList
+        for (let i = dl.length - 1; i >= 0; i--) {
+          const index = il.indexOf(dl[i]._id)
+          if (index >= 0) {
+            dl.splice(i, 1)
+            il.splice(index, 1)
+          }
         }
-        complete && complete()
-      })
-    },
-    removeData (ids) {
-      const il = ids.slice(0)
-      const dl = this.dataList
-      for (let i = dl.length - 1; i >= 0; i--) {
-        const index = il.indexOf(dl[i]._id)
-        if (index >= 0) {
-          dl.splice(i, 1)
-          il.splice(index, 1)
+      },
+      _dispatchEvent(type, data) {
+        if (this._changeDataFunction) {
+          this._changeDataFunction(data, this._isEnded, this.paginationInternal)
+        } else {
+          this.$emit(type, data, this._isEnded, this.paginationInternal)
         }
       }
-    },
-    _dispatchEvent (type, data) {
-      if (this._changeDataFunction) {
-        this._changeDataFunction(data, this._isEnded, this.paginationInternal)
-      } else {
-        this.$emit(type, data, this._isEnded, this.paginationInternal)
-      }
     }
   }
-}
 </script>

package/lib/platform.js

@@ -1,5 +1,8 @@
 const fs = require('fs')
 const path = require('path')
+const {
+  getManifestJson
+} = require('./manifest')
 
 const {
   isInHBuilderX,
@@ -17,10 +20,12 @@ function getShadowCss () {
   if (process.env.UNI_PLATFORM === 'h5') {
     tagName = 'body'
   }
-  const cdn = getShadowCdn()
-  return `${tagName}::after{position:fixed;content:'';left:-1000px;top:-1000px;-webkit-animation:shadow-preload .1s;-webkit-animation-delay:3s;animation:shadow-preload .1s;animation-delay:3s}@-webkit-keyframes shadow-preload{0%{background-image:url(${cdn}/img/shadow-grey.png)}100%{background-image:url(${cdn}/img/shadow-grey.png)}}@keyframes shadow-preload{0%{background-image:url(${cdn}/img/shadow-grey.png)}100%{background-image:url(${cdn}/img/shadow-grey.png)}}`
+  const url = createShadowImageUrl(getShadowCdn(), 'grey')
+  return `${tagName}::after{position:fixed;content:'';left:-1000px;top:-1000px;-webkit-animation:shadow-preload .1s;-webkit-animation-delay:3s;animation:shadow-preload .1s;animation-delay:3s}@-webkit-keyframes shadow-preload{0%{background-image:url(${url})}100%{background-image:url(${url})}}@keyframes shadow-preload{0%{background-image:url(${url})}100%{background-image:url(${url})}}`
 }
 const cdns = {
+  h5: '',
+  web: '',
   'mp-weixin': 1,
   'mp-alipay': 2,
   'mp-baidu': 3,
@@ -37,8 +42,31 @@ const cdns = {
 }
 
 function getShadowCdn () {
-  const index = cdns[process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM] || ''
-  return `https://cdn${index}.dcloud.net.cn`
+  return cdns[process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM] || ''
+}
+
+let appid
+
+function createIdent () {
+  if (process.env.UNI_INPUT_DIR) {
+    if (typeof appid === 'undefined') {
+      appid = getManifestJson().appid || ''
+    }
+    const id = appid.replace('__UNI__', '')
+    if (id) {
+      return Buffer.from(Buffer.from(id).toString('base64')).toString('hex')
+    }
+  }
+  return ''
+}
+
+function createShadowImageUrl (cdn, type = 'grey') {
+  let identStr = ''
+  if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'web') {
+    const ident = createIdent()
+    identStr = ident ? `${ident}/` : ''
+  }
+  return `https://cdn${cdn || ''}.dcloud.net.cn/${identStr}img/shadow-${type}.png`
 }
 
 // 解决 vue-cli-service lint 时 UNI_PLATFORM 不存在
@@ -145,6 +173,7 @@ module.exports = {
       discardDuplicates: false // 条件编译会导致重复
     }
   },
+  createShadowImageUrl,
   getShadowCss,
   getShadowTemplate (colorType = 'grey') {
     let tagName = 'cover-image'
@@ -152,7 +181,7 @@ module.exports = {
       .UNI_PLATFORM === 'mp-xhs') {
       tagName = 'image'
     }
-    return `<${tagName} src="${getShadowCdn()}/img/shadow-${colorType}.png" style="z-index:998;position:fixed;left:0;top:0;width:100%;height:3px;"/>`
+    return `<${tagName} src="${createShadowImageUrl(getShadowCdn(), colorType)}" style="z-index:998;position:fixed;left:0;top:0;width:100%;height:3px;"/>`
   },
   getPlatformScss () {
     return SCSS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-4020420240722002",
+  "version": "2.0.2-4020420240722004",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -26,5 +26,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "cbb0057bc5a5b43e783409da539add44dd703d16"
+  "gitHead": "2d3e029c00dc153d1f9b01b3cf4e697470e01087"
 }