Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 72b97dd2 by songchangcheng
Options

解决冲突

1 parent ee0458b6
Inline Side-by-side
Showing with 1 additions and 57 deletions
package-lock.json
...@@ -12,14 +12,7 @@ ...@@ -12,14 +12,7 @@
"bufferutil": "^4.0.8", "bufferutil": "^4.0.8",
"core-js": "^3.8.3", "core-js": "^3.8.3",
"element-ui": "^2.15.14", "element-ui": "^2.15.14",
<<<<<<< HEAD
"encoding": "^0.1.13",
"request": "^2.88.2",
"typescript": "^5.3.2",
"utf-8-validate": "^6.0.3",
=======
"jquery": "^3.7.1", "jquery": "^3.7.1",
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-cli": "^2.9.6", "vue-cli": "^2.9.6",
"vue-router": "^3.5.1", "vue-router": "^3.5.1",
...@@ -13651,30 +13644,6 @@ ...@@ -13651,30 +13644,6 @@
} }
} }
}, },
<<<<<<< HEAD
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.11.1",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
"dev": true,
"requires": {
"@vue/component-compiler-utils": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0"
},
"dependencies": {
"hash-sum": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
"dev": true
}
}
},
=======
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
"@vue/web-component-wrapper": { "@vue/web-component-wrapper": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
...@@ -13841,11 +13810,7 @@ ...@@ -13841,11 +13810,7 @@
"version": "1.9.0", "version": "1.9.0",
"resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", "resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
<<<<<<< HEAD
"requires": {}
=======
"dev": true "dev": true
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
}, },
"acorn-walk": { "acorn-walk": {
"version": "8.3.0", "version": "8.3.0",
...@@ -13880,20 +13845,10 @@ ...@@ -13880,20 +13845,10 @@
} }
}, },
"ajv-keywords": { "ajv-keywords": {
<<<<<<< HEAD
"version": "5.1.0",
"resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.3"
}
=======
"version": "3.5.2", "version": "3.5.2",
"resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
"dev": true "dev": true
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
}, },
"ansi-escapes": { "ansi-escapes": {
"version": "3.2.0", "version": "3.2.0",
...@@ -20295,15 +20250,12 @@ ...@@ -20295,15 +20250,12 @@
"ajv-formats": "^2.1.1", "ajv-formats": "^2.1.1",
"ajv-keywords": "^5.1.0" "ajv-keywords": "^5.1.0"
} }
<<<<<<< HEAD
=======
}, },
"ws": { "ws": {
"version": "8.14.2", "version": "8.14.2",
"resolved": "https://registry.npmmirror.com/ws/-/ws-8.14.2.tgz", "resolved": "https://registry.npmmirror.com/ws/-/ws-8.14.2.tgz",
"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
"dev": true "dev": true
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
} }
} }
}, },
...@@ -20433,18 +20385,10 @@ ...@@ -20433,18 +20385,10 @@
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
}, },
"ws": { "ws": {
<<<<<<< HEAD
"version": "8.14.2",
"resolved": "https://registry.npmmirror.com/ws/-/ws-8.14.2.tgz",
"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
"dev": true,
"requires": {}
=======
"version": "7.5.9", "version": "7.5.9",
"resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz", "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz",
"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
"dev": true "dev": true
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
}, },
"xtend": { "xtend": {
"version": "4.0.2", "version": "4.0.2",
......
public/index.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<script src="./api.js"></script> <!-- <script src="./api.js"></script> -->
<!-- <script type="text/javascript" src="http://192.168.0.187:9999/web-apps/apps/api/documents/api.js"></script> --> <!-- <script type="text/javascript" src="http://192.168.0.187:9999/web-apps/apps/api/documents/api.js"></script> -->
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!