Merge branch 'dev' into build

# Conflicts:
#	package.json
#	vue.config.js

package.json

@@ -15,6 +15,8 @@
   ],
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
+    "@jiaminghi/c-render": "^0.4.3",
+    "@jiaminghi/charts": "^0.2.18",
     "@jiaminghi/data-view": "^2.10.0",
     "bin-code-editor": "^0.9.0",
     "dayjs": "^1.8.35",
@@ -48,13 +50,14 @@
     "eslint-plugin-vue": "^5.0.0",
     "image-webpack-loader": "^6.0.0",
     "inquirer": "^6.5.2",
-    "node-sass": "npm:sass@^1.43.4",
     "readline": "^1.3.0",
-    "sass-loader": "^7.1.0",
+    "sass": "~1.32.12",
+    "sass-loader": "^7.3.1",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "v-viewer": "^1.6.4",
     "vue": "^2.6.14",
     "vue-router": "^3.3.4",
+    "vue-style-loader": "^4.1.3",
     "vue-template-compiler": "^2.6.14",
     "vuex": "^3.5.1",
     "vuex-persistedstate": "^2.7.1"