Merge branch 'feat/v1.6' into 'master'

feat: 积木1.6新增组件

See merge request !80

package-lock.json

@@ -12,7 +12,7 @@
         "@better-scroll/core": "^2.0.5",
         "@qg/apollo-nodejs": "^2.1.2",
         "@qg/cherry-ui": "2.23.10",
-        "@qg/citrus-ui": "0.3.42",
+        "@qg/citrus-ui": "0.3.43",
         "@qg/js-bridge": "^1.1.12",
         "babel-plugin-transform-vue-jsx": "^4.0.1",
         "cos-nodejs-sdk-v5": "^2.9.12",
@@ -3273,9 +3273,9 @@
       }
     },
     "node_modules/@qg/citrus-ui": {
-      "version": "0.3.42",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.42.tgz",
-      "integrity": "sha512-2v+Guh17ts8sBGixJ7UdDUTrgNMe+9i27r7cFJ1aQFxAl1u9XpRjpjHaBXX9iIQusITcNGGGaQAkmtm68OulcQ==",
+      "version": "0.3.43",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.43.tgz",
+      "integrity": "sha512-VlvbBVALr8XRrGy5/fVQwDtPqh3pE3O0TOMX6EYBC2o1HBr99JZglrVfvzmTmB2Q3cHWWw2hcLNbMdyGiOGMLA==",
       "license": "MIT",
       "dependencies": {
         "@better-scroll/core": "^2.1.1",
@@ -24338,6 +24338,7 @@
     },
     "node_modules/npm/node_modules/lodash._baseindexof": {
       "version": "3.1.0",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -24352,16 +24353,19 @@
     },
     "node_modules/npm/node_modules/lodash._bindcallback": {
       "version": "3.0.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._cacheindexof": {
       "version": "3.0.2",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._createcache": {
       "version": "3.1.2",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -24375,6 +24379,7 @@
     },
     "node_modules/npm/node_modules/lodash._getnative": {
       "version": "3.9.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -24390,6 +24395,7 @@
     },
     "node_modules/npm/node_modules/lodash.restparam": {
       "version": "3.6.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -39478,9 +39484,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.42",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.42.tgz",
-      "integrity": "sha512-2v+Guh17ts8sBGixJ7UdDUTrgNMe+9i27r7cFJ1aQFxAl1u9XpRjpjHaBXX9iIQusITcNGGGaQAkmtm68OulcQ==",
+      "version": "0.3.43",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.43.tgz",
+      "integrity": "sha512-VlvbBVALr8XRrGy5/fVQwDtPqh3pE3O0TOMX6EYBC2o1HBr99JZglrVfvzmTmB2Q3cHWWw2hcLNbMdyGiOGMLA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",
@@ -55238,7 +55244,8 @@
         },
         "lodash._baseindexof": {
           "version": "3.1.0",
-          "bundled": true
+          "bundled": true,
+          "extraneous": true
         },
         "lodash._baseuniq": {
           "version": "4.6.0",
@@ -55250,15 +55257,18 @@
         },
         "lodash._bindcallback": {
           "version": "3.0.1",
-          "bundled": true
+          "bundled": true,
+          "extraneous": true
         },
         "lodash._cacheindexof": {
           "version": "3.0.2",
-          "bundled": true
+          "bundled": true,
+          "extraneous": true
         },
         "lodash._createcache": {
           "version": "3.1.2",
           "bundled": true,
+          "extraneous": true,
           "requires": {
             "lodash._getnative": "^3.0.0"
           }
@@ -55269,7 +55279,8 @@
         },
         "lodash._getnative": {
           "version": "3.9.1",
-          "bundled": true
+          "bundled": true,
+          "extraneous": true
         },
         "lodash._root": {
           "version": "3.0.1",
@@ -55281,7 +55292,8 @@
         },
         "lodash.restparam": {
           "version": "3.6.1",
-          "bundled": true
+          "bundled": true,
+          "extraneous": true
         },
         "lodash.union": {
           "version": "4.6.0",

package.json

@@ -26,7 +26,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.42",
+    "@qg/citrus-ui": "0.3.43",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",