baileijun
/
ag-element-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突

This commit is contained in:
qiaopengfei 2024-07-01 14:30:28 +08:00
parent c489660d1d f4e4b3fb5d
commit 9dbb3debe1
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -7,7 +7,7 @@ npm install
### Compiles and hot-reloads for development ### Compiles and hot-reloads for development
``` ```
npm run serve npm run dev
``` ```
### Compiles and minifies for production ### Compiles and minifies for production

4
package.json
View File

@ -1,12 +1,12 @@
{ {
"name": "myErpElement", "name": "myErpElement",
"version": "0.1.3", "version": "0.1.6",
"private": false, "private": false,
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"lib": "vue-cli-service build --target lib packages/index.js" "lib": "vue-cli-service build --target lib --dest lib packages/index.js"
}, },
"main": "./lib/myErpElement.umd.min.js", "main": "./lib/myErpElement.umd.min.js",
"dependencies": { "dependencies": {

3
packages/index.js
View File

@ -22,6 +22,9 @@ if (typeof window !== 'undefined' && window.Vue) {
export default { export default {
// 导出的对象必须具有 install，才能被 Vue.use() 方法安装 // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
install, install,
}
export {
install,
// 以下是具体的组件列表 // 以下是具体的组件列表
pedestal, pedestal,
} }