Merge branch 'feat/textLogin' into 'master'

Feat/text login

See merge request !31

app/web/page/store/modules/editor/state.ts

@@ -91,7 +91,7 @@ export const defaultState = {
           {
             name: '购物车',
             icon: 'shopping-cart-o',
-            url: 'xyqb://shoppingCartTab',
+            url: 'xyqb://shoppingCart?needLogin=1',
             color: '#333',
             background: '#fff'
           }

config/config.local.ts

@@ -26,8 +26,8 @@ export default (appInfo: EggAppConfig) => {
     dialect: 'mysql',
     username: 'qa',
     password: 'qatest',
-    host: '172.17.5.30',
-    port: 30977,
+    host: '172.17.5.17',
+    port: 31548,
     database: 'low_code',
   };
 
@@ -36,8 +36,8 @@ export default (appInfo: EggAppConfig) => {
       keyPrefix: appInfo.name + ':',
     },
     client: {
-      port: 31565,          // Redis port
-      host: '172.17.5.13',   // Redis host
+      port: 32625,          // Redis port
+      host: '172.17.5.17',   // Redis host
       password: '',
       db: 0
     }

package-lock.json

@@ -1501,13 +1501,13 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.2.18",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.2.18.tgz",
-      "integrity": "sha512-GMcMbG8SBR6ZFOOeP7Zp9nPbs4j2cN1YrtZgE/yFxeoaCVKA4Sm+llRRVD3ZpYp5J4nmMztOvHlu+upy24yF4A==",
+      "version": "0.2.25",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.2.25.tgz",
+      "integrity": "sha512-61YOK7ybUD7cPn3WS91Pvin6r+yjCubNq21+D2E/mINb7yjzyhokkRkunU9aQ03U88KRpccXkR+MfhUP3pnvOA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.21.1",
-        "@qg/js-bridge": "^1.1.11",
+        "@qg/js-bridge": "^1.1.12",
         "axios": "^0.21.1",
         "intersection-observer": "^0.12.0",
         "js-cookie": "^2.2.1",
@@ -1518,12 +1518,9 @@
       }
     },
     "@qg/js-bridge": {
-      "version": "1.1.11",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.11.tgz",
-      "integrity": "sha512-WVvkSUg2zcc2nblzYGxM/bVo+VDcANy/dw7vcbxLoW1Jega9Jm2d5FGSb7uS6m4746waghUUqcAWNJZ0Q5yeqA==",
-      "requires": {
-        "rollup": "^2.41.3"
-      }
+      "version": "1.1.12",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.12.tgz",
+      "integrity": "sha512-KhSbaGMJvGZ7CNrl6nIhD56vAKwDCx6kjwm26UeCBb8KAAb2JjgRe3pIAw/XHjC5WZXjlwfwx6hwrgslQiFyxA=="
     },
     "@riophae/vue-treeselect": {
       "version": "0.4.0",
@@ -20134,14 +20131,6 @@
       "resolved": "http://npmprivate.quantgroups.com/rndm/-/rndm-1.2.0.tgz",
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
-    "rollup": {
-      "version": "2.56.2",
-      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.56.2.tgz",
-      "integrity": "sha512-s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ==",
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "run-async": {
       "version": "2.4.1",
       "resolved": "http://npmprivate.quantgroups.com/run-async/-/run-async-2.4.1.tgz",

package.json

@@ -27,7 +27,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.21.1",
-    "@qg/citrus-ui": "0.2.18",
+    "@qg/citrus-ui": "0.2.25",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",