diff --git a/package-lock.json b/package-lock.json
index 4615ef61..5745d9db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -469,6 +469,20 @@
       "resolved": "https://registry.npm.taobao.org/@emotion/unitless/download/@emotion/unitless-0.7.5.tgz",
       "integrity": "sha1-dyESkcGQCnALinjPr9oxYNdpSe0="
     },
+    "@icedesign/base": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npm.taobao.org/@icedesign/base/download/@icedesign/base-0.2.8.tgz",
+      "integrity": "sha512-cqDkY9MIwApqNafLz2CHdANwPsCkUoG0m+xljj2NOpDJFdqFiufjTfquvIeFPlA5Egcv4Phv31l76bo79wYxqA==",
+      "requires": {
+        "async-validator": "^1.6.7",
+        "classnames": "^2.2.3",
+        "cropperjs": "^0.7.1",
+        "enquire.js": "^2.1.6",
+        "object-assign": "^4.1.0",
+        "prop-types": "^15.5.10",
+        "react-transition-group": "^1.2.1"
+      }
+    },
     "@monaco-editor/react": {
       "version": "2.6.1",
       "resolved": "https://registry.npm.taobao.org/@monaco-editor/react/download/@monaco-editor/react-2.6.1.tgz",
@@ -1365,6 +1379,11 @@
       "resolved": "http://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.0.tgz",
       "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg="
     },
+    "async-validator": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.12.2.tgz",
+      "integrity": "sha1-vq5nHnF00pOLe0tp0vt+cit/1yw="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
@@ -2870,6 +2889,11 @@
         "lazy-cache": "^1.0.3"
       }
     },
+    "chain-function": {
+      "version": "1.0.1",
+      "resolved": "http://registry.npm.taobao.org/chain-function/download/chain-function-1.0.1.tgz",
+      "integrity": "sha1-xjBF5bS2Y/uG8cbhhq2vHeQCocw="
+    },
     "chalk": {
       "version": "1.1.3",
       "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
@@ -4494,6 +4518,11 @@
         }
       }
     },
+    "cropperjs": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npm.taobao.org/cropperjs/download/cropperjs-0.7.2.tgz",
+      "integrity": "sha512-4un9nk/TuWEIXPYYez2eU9f5yl5vnnOb3xgbCqnM0YbFW9DMuvBtyk5SRnpjn2DKHtCRMKJptWLYdIocjmeJhQ=="
+    },
     "cross-spawn": {
       "version": "5.1.0",
       "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz",
@@ -4555,153 +4584,10 @@
       "resolved": "http://registry.npm.taobao.org/css-color-keywords/download/css-color-keywords-1.0.0.tgz",
       "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
     },
-<<<<<<< HEAD
-    "css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/css-select/download/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-      "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
-      }
-    },
-    "css-to-react-native": {
-      "version": "2.3.0",
-      "resolved": "http://registry.npm.taobao.org/css-to-react-native/download/css-to-react-native-2.3.0.tgz",
-      "integrity": "sha1-v4DSTsSgjkMDBu9CnAWG5u1Uhfc=",
-      "requires": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^3.3.0"
-      }
-    },
-    "css-vendor": {
-      "version": "0.3.8",
-      "resolved": "http://registry.npm.taobao.org/css-vendor/download/css-vendor-0.3.8.tgz",
-      "integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=",
-      "requires": {
-        "is-in-browser": "^1.0.2"
-      }
-    },
-    "css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npm.taobao.org/css-what/download/css-what-2.1.3.tgz?cache=0&sync_timestamp=1573341698559&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-what%2Fdownload%2Fcss-what-2.1.3.tgz",
-      "integrity": "sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI="
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz",
-      "integrity": "sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=",
-      "dev": true
-    },
-    "cssom": {
-      "version": "0.3.6",
-      "resolved": "http://registry.npm.taobao.org/cssom/download/cssom-0.3.6.tgz",
-      "integrity": "sha1-+FIGzuBO+oQfPFmCp0uparINZa0="
-    },
-    "cssstyle": {
-      "version": "0.2.37",
-      "resolved": "http://registry.npm.taobao.org/cssstyle/download/cssstyle-0.2.37.tgz",
-      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
-      "requires": {
-        "cssom": "0.3.x"
-      }
-    },
-    "csstype": {
-      "version": "2.6.3",
-      "resolved": "http://registry.npm.taobao.org/csstype/download/csstype-2.6.3.tgz",
-      "integrity": "sha1-twHlloJFv5sI1UrIPQC2JOYiqfo="
-    },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
-    "cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
-    "d3-color": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npm.taobao.org/d3-color/download/d3-color-1.4.0.tgz",
-      "integrity": "sha1-icRamV7Xc7EzFPBkYN8m1gug7K8="
-    },
-    "d3-dispatch": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npm.taobao.org/d3-dispatch/download/d3-dispatch-1.0.6.tgz",
-      "integrity": "sha1-ANN7zuTdjNl3Kd2JOgrCnKq6XVg="
-    },
-    "d3-ease": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npm.taobao.org/d3-ease/download/d3-ease-1.0.6.tgz",
-      "integrity": "sha1-69ttoi36wKIiIvLU2gb2bEFqDsA="
-    },
-    "d3-interpolate": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npm.taobao.org/d3-interpolate/download/d3-interpolate-1.1.6.tgz",
-      "integrity": "sha1-LPOVriOBgE3wiqG/dmt/l7X2j7Y=",
-      "requires": {
-        "d3-color": "1"
-      }
-    },
-    "d3-selection": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npm.taobao.org/d3-selection/download/d3-selection-1.4.1.tgz",
-      "integrity": "sha1-mO7bvghfvaW6+i+ePzovTX1iKpg="
-    },
-    "d3-timer": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npm.taobao.org/d3-timer/download/d3-timer-1.0.10.tgz",
-      "integrity": "sha1-3+dripF0iDGxO22ceT/71QjdneU="
-    },
-    "d3-transition": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npm.taobao.org/d3-transition/download/d3-transition-1.3.2.tgz",
-      "integrity": "sha1-qY7yFRvo2GAFQ0NMHKgBQK4js5g=",
-      "requires": {
-        "d3-color": "1",
-        "d3-dispatch": "1",
-        "d3-ease": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "^1.1.0",
-        "d3-timer": "1"
-      }
-    },
-    "damerau-levenshtein": {
-      "version": "1.0.4",
-      "resolved": "http://registry.npm.taobao.org/damerau-levenshtein/download/damerau-levenshtein-1.0.4.tgz",
-      "integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ="
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/data-urls/download/data-urls-2.0.0.tgz",
-      "integrity": "sha1-FWSFpyljqXD11YIar2Qr7yvy25s=",
-      "requires": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
-=======
     "css-loader": {
       "version": "3.5.2",
       "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.5.2.tgz",
       "integrity": "sha1-ZIOuVvSKf5Afvgfd4vyWsB6vqzw=",
-<<<<<<< HEAD
-=======
       "requires": {
         "camelcase": "^5.3.1",
         "cssesc": "^3.0.0",
@@ -4716,7 +4602,6 @@
         "postcss-value-parser": "^4.0.3",
         "schema-utils": "^2.6.5",
         "semver": "^6.3.0"
->>>>>>> 22e9ed32d0b11c3a43e6a9929e1072e6c78f3fa4
       },
       "dependencies": {
         "ajv": {
@@ -4862,7 +4747,6 @@
       "version": "0.2.37",
       "resolved": "http://registry.npm.taobao.org/cssstyle/download/cssstyle-0.2.37.tgz",
       "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
->>>>>>> f191fbe55a03f133615d827fc04311e6de41b163
       "requires": {
         "camelcase": "^5.3.1",
         "cssesc": "^3.0.0",
@@ -9441,18 +9325,12 @@
     },
     "indexes-of": {
       "version": "1.0.1",
-<<<<<<< HEAD
-      "resolved": "https://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-=======
 <<<<<<< HEAD
       "resolved": "http://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz",
 =======
       "resolved": "https://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz",
 >>>>>>> f191fbe55a03f133615d827fc04311e6de41b163
       "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
->>>>>>> 22e9ed32d0b11c3a43e6a9929e1072e6c78f3fa4
     },
     "infer-owner": {
       "version": "1.0.4",
@@ -12940,17 +12818,6 @@
         "uniq": "^1.0.1"
       }
     },
-    "postcss-selector-parser": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-6.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.2.tgz",
-      "integrity": "sha1-k0z3mdAWyDQRhZ4J3Oyt4BKG7Fw=",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
     "postcss-value-parser": {
       "version": "3.3.1",
       "resolved": "http://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz",
@@ -13103,68 +12970,6 @@
       "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
       "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
     },
-    "purgecss": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npm.taobao.org/purgecss/download/purgecss-2.1.2.tgz",
-      "integrity": "sha1-lvZm0ExWcFIIqqGlRLXyLhOCiVU=",
-      "dev": true,
-      "requires": {
-        "commander": "^5.0.0",
-        "glob": "^7.0.0",
-        "postcss": "7.0.27",
-        "postcss-selector-parser": "^6.0.2"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1585815676992&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
-          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
-              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "commander": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-5.0.0.tgz?cache=0&sync_timestamp=1584148318639&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-5.0.0.tgz",
-          "integrity": "sha1-2/GQm0nlBE+P2vCtyAnwwHIr39A=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "7.0.27",
-          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
-          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
-          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "qr.js": {
       "version": "0.0.0",
       "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
@@ -14651,6 +14456,18 @@
         "prop-types": "^15.5.4"
       }
     },
+    "react-transition-group": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npm.taobao.org/react-transition-group/download/react-transition-group-1.2.1.tgz",
+      "integrity": "sha1-4R9yslf5IbITIpp3TfRmEjRsfKY=",
+      "requires": {
+        "chain-function": "^1.0.0",
+        "dom-helpers": "^3.2.0",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.5.6",
+        "warning": "^3.0.0"
+      }
+    },
     "react-url-query": {
       "version": "1.5.0",
       "resolved": "https://registry.npm.taobao.org/react-url-query/download/react-url-query-1.5.0.tgz",
@@ -18176,18 +17993,12 @@
     },
     "uniq": {
       "version": "1.0.1",
-<<<<<<< HEAD
-      "resolved": "https://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-=======
 <<<<<<< HEAD
       "resolved": "http://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz",
 =======
       "resolved": "https://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz",
 >>>>>>> f191fbe55a03f133615d827fc04311e6de41b163
       "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
->>>>>>> 22e9ed32d0b11c3a43e6a9929e1072e6c78f3fa4
     },
     "unique-filename": {
       "version": "1.1.1",