Merge branches 'leng_dev' and 'master' of https://gitee.ltd/pigx/pigx-ui into luckly_dev

package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@xkeshi/vue-qrcode": "^1.0.0",
-    "avue-form-design": "^1.1.1",
+    "avue-plugin-formdesign": "^1.0.0",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "classlist-polyfill": "^1.2.0",

src/main.js

@@ -15,7 +15,7 @@ import * as filters from './filters' // 全局filter
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import './styles/common.scss'
-import avueFormDesign from 'avue-form-design'
+import avueFormDesign from 'avue-plugin-formdesign'
 import basicContainer from './components/basic-container/main'
 // 插件 json 展示
 import vueJsonTreeView from 'vue-json-tree-view'