Skip to content

Commit

Permalink
Merge pull request #1123 from didi/feature/dev-web
Browse files Browse the repository at this point in the history 
Feature/dev web
  • Loading branch information
@AdamCaoQAQ
AdamCaoQAQ authored Apr 21, 2023
2 parents fa19e19 + 61f3092 commit 5becdc9
Show file tree
Hide file tree
Showing 17 changed files with 534 additions and 107 deletions.
20 changes: 16 additions & 4 deletions Web/lerna-debug.log
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
55 error Error: Command failed with exit code 128: git push --follow-tags --no-verify --atomic origin master
55 error fatal: unable to access 'https://github.com/didi/DoraemonKit.git/': LibreSSL SSL_connect: SSL_ERROR_SYSCALL in connection to github.com:443
55 error at makeError (/Users/didi/Desktop/DoKit/DoraemonKit/Web/node_modules/execa/lib/error.js:59:11)
55 error at handlePromise (/Users/didi/Desktop/DoKit/DoraemonKit/Web/node_modules/execa/index.js:114:26)
0 silly argv { _: [ 'bootstrap' ], lernaVersion: '4.0.0', '$0': 'lerna' }
1 notice cli v4.0.0
2 verbose rootPath /Users/didi/Desktop/DoKit/DoraemonKit/Web
3 error JSONError: Unexpected token "<" (0x3C) in JSON at position 745 while parsing near "... \"dependencies\": {\n<<<<<<< HEAD\n<<<<<<<..." in packages/web/package.json
3 error
3 error   31 | },
3 error   32 | "dependencies": {
3 error > 33 | <<<<<<< HEAD
3 error   | ^
3 error   34 | <<<<<<< HEAD
3 error   35 | =======
3 error   36 | >>>>>>> 4219bdfe (feat: 修改部分一机多控逻辑)
3 error
3 error at parseJson (/Users/didi/Desktop/DoKit/DoraemonKit/Web/node_modules/parse-json/index.js:29:21)
3 error at parse (/Users/didi/Desktop/DoKit/DoraemonKit/Web/node_modules/load-json-file/index.js:15:9)
3 error at module.exports (/Users/didi/Desktop/DoKit/DoraemonKit/Web/node_modules/load-json-file/index.js:18:47)
11 changes: 7 additions & 4 deletions Web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"jest": "^26.6.3",
"lerna": "^4.0.0",
"less": "^4.1.1",
"livereload": "^0.9.3",
"npm-run-all": "^4.1.5",
"open": "^8.0.6",
"postcss": "^8.2.12",
Expand All @@ -39,11 +40,13 @@
"serve-handler": "^6.1.3"
},
"dependencies": {
"vant": "^3.1.0-beta.0",
"vue": "^3.2.21",
"@dokit/web": "file:packages/web",
"@dokit/web-core": "file:packages/core",
"@dokit/web-independent": "file:packages/web-independent",
"@dokit/web-utils": "file:packages/utils",
"@dokit/web": "file:packages/web",
"@dokit/web-independent": "file:packages/web-independent"
"qrcodejs2": "0.0.2",
"qrcodejs2-fix": "0.0.1",
"vant": "^3.1.0-beta.0",
"vue": "^3.2.21"
}
}
196 changes: 114 additions & 82 deletions Web/packages/core/src/common/js/EventPlayback.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Web/packages/core/src/components/home.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {
},
data(){
return {
version: '0.0.3-alpha.1'
version: '0.0.3-alpha.3'
}
},
mounted(){
Expand Down
1 change: 1 addition & 0 deletions Web/packages/core/src/components/router-container.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default {
},
computed:{
component(){
return this.$route.component
},
title(){
Expand Down
10 changes: 10 additions & 0 deletions Web/packages/web-independent/src/index.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import {Dokit} from '@dokit/web-core-independent'
import {Features} from '../../web/src/feature'
/**
* 0.0.3 alpha 3
* TODO 全局注册 Dokit
*/
window.Dokit = new Dokit({
features: Features,
});

31 changes: 31 additions & 0 deletions Web/packages/web/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

213 changes: 213 additions & 0 deletions Web/packages/web/playground/index.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Dokit For Web</title>
<style>
.asd4 .asd {
color: rgba(241, 9, 9, 0.3);
background: url(https://pt-starimg.didistatic.com/static/starimg/img/UioDkptMhY1635838350336.png);
box-shadow: 10px 10px 5px rgb(122, 222, 222, 0.7);
}

body {
top: 10px;
}

.asd1 {
position: relative;
}

.weatherInfo {
font-size: 13px;
overflow: hidden;
}
</style>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://unpkg.com/vue@next"></script>
<script src="dokit.js"></script>
<script>
Dokit.startMultiControl('ws://172.23.165.79:8000/proxy/multicontrol/OYZGTSEL', window.location.href.split("?asd=")[1])
// axios({
// url: 'https://thor.weidian.com/skittles/share.getConfig/1.0?wdtoken=4000fcea&_=1649759524263',
// }).then((res) => {
// console.log('axios:',res)
// // changeNode.style.color = "blue"
// weatherInfoNode.innerText = `接口数据:${JSON.stringify(res)}`
// }).catch((err) => {
// console.log(err)
// });
Dokit.setProductId('749a0600b5e48dd77cf8ee680be7b1b7')
</script>
</head>

<body>
<input calss="inputDemo" />
<div>DoKit For Web</div>
<div class="asd1">
<div class="asd2">
<div class="asd3">
<div class="asd4">
<span class="asd" id="qwe" style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</span>
</div>
</div>
</div>
</div>
<div style="height:300px;overflow: scroll;">
<a href="https://hummer.didi.cn/home#/">Hummer</a>
<img src="https://pt-starimg.didistatic.com/static/starimg/img/UioDkptMhY1635838350336.png" />
<h2 class="asd" id="qwe" style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
<input>
<h2 style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
<h2 style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
<h2 style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
<h2 style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
<h2 style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
</div>
<h2 class="weatherInfo">接口数据：</h2>
<h2 style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
<h2 style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
<h2 style="padding: 10px 20px 30px 40px;
margin: 10px 20px 30px 40px;
border: 10px solid;
border-width:10px 20px 30px 50px;">Playground</h2>
<div class="asdasd">zepto测试</div>
</body>
<script src="https://cdnjs.gtimg.com/cdnjs/libs/zepto/1.1.4/zepto.js"></script>
<script>
let eventNode = document.getElementsByClassName('asd1')[0]
let changeNode = document.getElementById('qwe')
let weatherInfoNode = document.getElementsByClassName('weatherInfo')[0]
// axios({
// url: 'https://thor.weidian.com/skittles/share.getConfig/1.0?wdtoken=4000fcea&_=1649759524263',
// }).then((res) => {
// console.log('axios:',res)
// // changeNode.style.color = "blue"
// weatherInfoNode.innerText = `接口数据:${JSON.stringify(res)}`
// }).catch((err) => {
// console.log(err)
// });
eventNode.onclick = (e) => {
fetch('https://www.tianqiapi.com/free/week?appid=68852321&appsecret=BgGLDVc7', {})
.then((response) => {
let weatherInfo = response.json();
return weatherInfo;
})
.then((info) => {
console.log('weatherInfo', info)
changeNode.style.color = "blue"
weatherInfoNode.innerText = `接口数据:${JSON.stringify(info)}`
// axios({
// url: 'https://daijia.kuaidadi.com/gateway?api=lj.assign.d.regions&apiVersion=1.0.0&appKey=b4f945fe780140d8a0d19d1f2d021db7&appVersion=6.8.9&mobileType=vivo+NEX+S&osType=2&osVersion=10&sign=f2d04df3510670528a067ae52ded2c49&timestamp=1648180651319&token=Mk_G1OHDSNax7QIHN8j_BmFarMeZA_ORR7yKj831WPYkyDvKw0AMAOG7TC2MtCtrbbV__98hD-fRbCAhlfHdg_E0A99KV5I66KAI3UgTeiGLqo5Cr6QK3Y-NJH__CCcShDNZJvPmc4tWprm6C9cdQ1jIlc_r-74sZGhR24QbaeGtVm9RhTuJmelRIDx2QXiSuv0CAAD__w%3D%3D&ttid=-1&userId=182784&userRole=2',
// }).then((res) => {
// console.log(res)
// }).catch((err) => {
// console.log(err)
// });
});
// for (let index = 0; index < 10; index++) {
// axios({
// url: 'https://daijia.kuaidadi.com/gateway?api=lj.assign.d.regions&apiVersion=1.0.0&appKey=b4f945fe780140d8a0d19d1f2d021db7&appVersion=6.8.9&mobileType=vivo+NEX+S&osType=2&osVersion=10&sign=f2d04df3510670528a067ae52ded2c49&timestamp=1648180651319&token=Mk_G1OHDSNax7QIHN8j_BmFarMeZA_ORR7yKj831WPYkyDvKw0AMAOG7TC2MtCtrbbV__98hD-fRbCAhlfHdg_E0A99KV5I66KAI3UgTeiGLqo5Cr6QK3Y-NJH__CCcShDNZJvPmc4tWprm6C9cdQ1jIlc_r-74sZGhR24QbaeGtVm9RhTuJmelRIDx2QXiSuv0CAAD__w%3D%3D&ttid=-1&userId=182784&userRole=2',
// }).then((res) => {
// console.log(res)
// // alert(res)
// }).catch((err) => {
// console.log(err)
// });
// }

// function reqListener() {
// console.log('asasdasdasdasdasdasdasdqsdasasdasdasdasdasdasdasdqsdasasdasdasdasdasdasdasdqsd', this
// .responseText);
// }
// var oReq = new XMLHttpRequest();
// oReq.addEventListener("load", reqListener);
// oReq.open("post", "https://www.tianqiapi.com/free/week?appid=68852321&appsecret=BgGLDVc7");
// oReq.setRequestHeader('Content-Type', 'text/html; charset=utf-8')
// oReq.setRequestHeader('Access-Control-Allow-Origin', 'http://localhost:3000/playground')
// oReq.setRequestHeader('Access-Control-Allow-Credentials', 'true')
// oReq.send(JSON.stringify({
// a: 1
// }));

// axios({
// url: 'https://www.tianqiapi.com/free/week?appid=68852321&appsecret=BgGLDVc7',
// method: "POST",
// data: {
// firstName: "Fred",
// lastName: "Flintstone"
// }
// }).then((res) => {
// console.log(res)
// }).catch((err) => {
// console.log(err)
// });
}
eventNode.addEventListener('touchstart', (e) => {
console.log(e)
console.log('----------touchstart--------')
}, false)
eventNode.addEventListener('touchmove', () => {
console.log('----------touchmove--------')
}, false)
eventNode.addEventListener('touchend', () => {
console.log('----------touchend--------')
}, false)
$('.asdasd').on('click', function (event) {
console.log('zepto', event);
});
setTimeout(() => {
document.body.appendChild(document.createElement('textarea'))
}, 5000)
// setTimeout(() => {
// var a = {
// b: 1,
// c: 3,
// }
// console.log(a);

// function reqListener() {
// console.log('asasdasdasdasdasdasdasdqsdasasdasdasdasdasdasdasdqsdasasdasdasdasdasdasdasdqsd', this
// .responseText);
// }
// var oReq = new XMLHttpRequest();
// oReq.addEventListener("load", reqListener);
// oReq.open("post", "https://www.tianqiapi.com/free/week?appid=68852321&appsecret=BgGLDVc7");
// oReq.setRequestHeader('Content-Type', 'text/html; charset=utf-8')
// oReq.send(JSON.stringify({
// a: 1
// }));
// }, 5000);
</script>

</html>
1 change: 1 addition & 0 deletions Web/packages/web/rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import postcssPlugin from 'rollup-plugin-postcss'
import resolve from 'rollup-plugin-node-resolve'
import commonjs from 'rollup-plugin-commonjs'
import replace from 'rollup-plugin-replace'

import {
terser
} from 'rollup-plugin-terser'
Expand Down
Loading

0 comments on commit 5becdc9

Please # to comment.