From 56b43aa08fceec2eba4d6b1974302e23c0f36813 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 18 Aug 2018 22:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9A=8F=E6=9C=BA=20key=20?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 2348f6645bc354fc5f5e2c1291c5d2cebf047348 [formerly 2348f6645bc354fc5f5e2c1291c5d2cebf047348 [formerly 2348f6645bc354fc5f5e2c1291c5d2cebf047348 [formerly 2348f6645bc354fc5f5e2c1291c5d2cebf047348 [formerly 6ae432905579811cde8979f29eee143da2706ca9 [formerly b335fc640794be976eaf84839c300e516cc56a0d]]]]]
Former-commit-id: 7f8133308daa457b267e5a160df57530c69b92d7
Former-commit-id: 542ece96fc0188c1b72ead599382a9401d5a8035
Former-commit-id: 6c9fb38e18e09335d8369c19d657df742f1cac2c [formerly 1e2ccbec826a2f09cf17b40c3177b7b2b1ededbf]
Former-commit-id: 672b25396325dc96564258784081f3d9fc2b3645
Former-commit-id: 6dea504c5f475fee69c9a7bde160173168bcc81f
Former-commit-id: 63c30f7c3133c8ff0fce3b82c915c064412e0c46
Former-commit-id: f761a3e86ec11791a9199b5e095542aea4f310b6
Former-commit-id: 9ea8078a4da3547446a5b00d0939b3dd67d38215
---
 src/pages/demo/playground/db/page-public/index.vue |  6 +++---
 src/pages/demo/playground/db/page-user/index.vue   |  6 +++---
 src/pages/demo/playground/db/public/index.vue      |  6 +++---
 src/pages/demo/playground/db/user/index.vue        |  6 +++---
 src/store/modules/d2admin/modules/db.js            | 10 +++++-----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pages/demo/playground/db/page-public/index.vue b/src/pages/demo/playground/db/page-public/index.vue
index b357ef27..5acbedef 100644
--- a/src/pages/demo/playground/db/page-public/index.vue
+++ b/src/pages/demo/playground/db/page-public/index.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import day from 'dayjs'
+import { uniqueId } from 'lodash'
 import { mapActions } from 'vuex'
 export default {
   data () {
@@ -113,12 +113,12 @@ export default {
      * 添加一个随机数据
      */
     async handleSetRandom () {
-      const id = day().valueOf()
+      const id = uniqueId()
       const db = await this.databasePage({
         vm: this
       })
       db
-        .set(id, Math.round(id * Math.random()))
+        .set(`uniqueKey${id}`, `value${id}`)
         .write()
       this.load()
     }
diff --git a/src/pages/demo/playground/db/page-user/index.vue b/src/pages/demo/playground/db/page-user/index.vue
index 1632cc91..0352feb2 100644
--- a/src/pages/demo/playground/db/page-user/index.vue
+++ b/src/pages/demo/playground/db/page-user/index.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import day from 'dayjs'
+import { uniqueId } from 'lodash'
 import { mapActions } from 'vuex'
 export default {
   data () {
@@ -117,13 +117,13 @@ export default {
      * 添加一个随机数据
      */
     async handleSetRandom () {
-      const id = day().valueOf()
+      const id = uniqueId()
       const db = await this.databasePage({
         vm: this,
         user: true
       })
       db
-        .set(id, Math.round(id * Math.random()))
+        .set(`uniqueKey${id}`, `value${id}`)
         .write()
       this.load()
     }
diff --git a/src/pages/demo/playground/db/public/index.vue b/src/pages/demo/playground/db/public/index.vue
index 295a12ce..5f32ec9c 100644
--- a/src/pages/demo/playground/db/public/index.vue
+++ b/src/pages/demo/playground/db/public/index.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import day from 'dayjs'
+import { uniqueId } from 'lodash'
 import { mapActions } from 'vuex'
 export default {
   data () {
@@ -105,10 +105,10 @@ export default {
      * 添加一个随机数据
      */
     async handleSetRandom () {
-      const id = day().valueOf()
+      const id = uniqueId()
       const db = await this.database()
       db
-        .set(id, Math.round(id * Math.random()))
+        .set(`uniqueKey${id}`, `value${id}`)
         .write()
       this.load()
     }
diff --git a/src/pages/demo/playground/db/user/index.vue b/src/pages/demo/playground/db/user/index.vue
index 0504fc0b..95b4fdbe 100644
--- a/src/pages/demo/playground/db/user/index.vue
+++ b/src/pages/demo/playground/db/user/index.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import day from 'dayjs'
+import { uniqueId } from 'lodash'
 import { mapActions } from 'vuex'
 export default {
   data () {
@@ -105,10 +105,10 @@ export default {
      * 添加一个随机数据
      */
     async handleSetRandom () {
-      const id = day().valueOf()
+      const id = uniqueId()
       const db = await this.database({ user: true })
       db
-        .set(id, Math.round(id * Math.random()))
+        .set(`uniqueKey${id}`, `value${id}`)
         .write()
       this.load()
     }
diff --git a/src/store/modules/d2admin/modules/db.js b/src/store/modules/d2admin/modules/db.js
index 39a885ea..8160ac25 100644
--- a/src/store/modules/d2admin/modules/db.js
+++ b/src/store/modules/d2admin/modules/db.js
@@ -120,7 +120,7 @@ export default {
       return new Promise(resolve => {
         resolve(db.get(pathInit({
           dbName: 'database',
-          path: vm.$route[basis],
+          path: `$page.${vm.$route[basis]}`,
           user,
           defaultValue: {}
         })))
@@ -141,7 +141,7 @@ export default {
       return new Promise(resolve => {
         resolve(db.get(pathInit({
           dbName: 'database',
-          path: vm.$route[basis],
+          path: `$page.${vm.$route[basis]}`,
           user,
           validator: () => false,
           defaultValue: {}
@@ -163,7 +163,7 @@ export default {
       return new Promise(resolve => {
         resolve(db.get(pathInit({
           dbName: 'database',
-          path: `${vm.$route[basis]}.$data`,
+          path: `$page.${vm.$route[basis]}.$data`,
           user,
           validator: () => false,
           defaultValue: vm.$data
@@ -185,7 +185,7 @@ export default {
       return new Promise(resolve => {
         resolve(db.get(pathInit({
           dbName: 'database',
-          path: `${vm.$route[basis]}.$data`,
+          path: `$page.${vm.$route[basis]}.$data`,
           user,
           defaultValue: vm.$data
         })).value())
@@ -206,7 +206,7 @@ export default {
       return new Promise(resolve => {
         resolve(db.get(pathInit({
           dbName: 'database',
-          path: `${vm.$route[basis]}.$data`,
+          path: `$page.${vm.$route[basis]}.$data`,
           user,
           validator: () => false,
           defaultValue: {}