theluyuan/layui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs(fullscreen): 修复文档样式冲突

Browse Source
This commit is contained in:
就眠儀式 2022-03-17 14:18:56 +08:00
parent 7b83700967
commit 8d766be166
4 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
example/docs/zh-CN/components/fullscreen.md
View File

@ -44,7 +44,7 @@ export default {
<template> <template>
<lay-fullscreen :target="elRef" v-slot="{ enter, exit, toggle, isFullscreen }" @fullscreenchange=fullscreen2> <lay-fullscreen :target="elRef" v-slot="{ enter, exit, toggle, isFullscreen }" @fullscreenchange=fullscreen2>
<div ref="elRef" class="wrapper"> <div ref="elRef" class="wrapper-fullscreen">
<lay-button type="normal" @click="enter()">进入全屏</lay-button> <lay-button type="normal" @click="enter()">进入全屏</lay-button>
<lay-button type="normal" @click="exit()">退出</lay-button> <lay-button type="normal" @click="exit()">退出</lay-button>
<lay-button type="warm" @click="toggle()"> 切换: {{isFullscreen ? "退出" : "进入全屏"}} </lay-button> <lay-button type="warm" @click="toggle()"> 切换: {{isFullscreen ? "退出" : "进入全屏"}} </lay-button>
@ -69,7 +69,7 @@ export default {
} }
</script> </script>
<style> <style>
.wrapper{ .wrapper-fullscreen{
padding:10px; padding:10px;
border:1px solid #dddddd; border:1px solid #dddddd;
background-color:#F6F6F6; background-color:#F6F6F6;
@ -117,7 +117,7 @@ export default {
} }
</script> </script>
<style> <style>
.wrapper{ .wrapper-fullscreen{
padding:10px; padding:10px;
border:1px solid #dddddd; border:1px solid #dddddd;
background-color:#F6F6F6; background-color:#F6F6F6;
@ -141,7 +141,7 @@ export default {
position="absolute" position="absolute"
v-slot="{ enter, exit, toggle, isFullscreen }" v-slot="{ enter, exit, toggle, isFullscreen }"
@fullscreenchange=fullscreen4> @fullscreenchange=fullscreen4>
<div ref="fullscreenTargetRef2" class="wrapper"> <div ref="fullscreenTargetRef2" class="wrapper-fullscreen">
<lay-button type="normal" @click="enter()">进入全屏</lay-button> <lay-button type="normal" @click="enter()">进入全屏</lay-button>
<lay-button type="normal" @click="exit()">退出</lay-button> <lay-button type="normal" @click="exit()">退出</lay-button>
<lay-button type="warm" @click="toggle()"> 切换: {{isFullscreen ? "退出" : "进入全屏"}} </lay-button> <lay-button type="warm" @click="toggle()"> 切换: {{isFullscreen ? "退出" : "进入全屏"}} </lay-button>
@ -175,7 +175,7 @@ export default {
background-color: red; background-color: red;
border:1px solid #dddddd; border:1px solid #dddddd;
}; };
.wrapper{ .wrapper-fullscreen{
padding:10px; padding:10px;
border:1px solid #dddddd; border:1px solid #dddddd;
background-color:#F6F6F6; background-color:#F6F6F6;

3
example/docs/zh-CN/guide/changelog.md
View File

@ -14,10 +14,11 @@
<ul> <ul>
<a name="0-4-0"> </a> <a name="0-4-0"> </a>
<li> <li>
<h3>0.4.0 <span class="layui-badge-rim">2022-03-08</span></h3> <h3>0.4.0 <span class="layui-badge-rim">2022-03-17</span></h3>
<ul> <ul>
<li>[新增] scroll 虚拟滚动组件。</li> <li>[新增] scroll 虚拟滚动组件。</li>
<li>[新增] water-marker 水印组件。</li> <li>[新增] water-marker 水印组件。</li>
<li>[新增] table 表格组件 excel 导出工具栏。</li>
<li>[新增] page 分页组件 v-model 属性, 支持默认页设置。</li> <li>[新增] page 分页组件 v-model 属性, 支持默认页设置。</li>
<li>[新增] date-picker 日期选择组件, 支持年月, 日期, 时间。</li> <li>[新增] date-picker 日期选择组件, 支持年月, 日期, 时间。</li>
<li>[修复] slider 滑块组件, 默认 step 值异常。</li> <li>[修复] slider 滑块组件, 默认 step 值异常。</li>

10
src/component/colorPicker/index.vue
View File

@ -47,20 +47,12 @@ onMounted(() => {
}); });
watch([red, green, blue], (newValue) => { watch([red, green, blue], (newValue) => {
emit( emit("update:modelValue",rgba2hex(red.value, green.value, blue.value, alpha.value));
"update:modelValue",
rgba2hex(red.value, green.value, blue.value, alpha.value)
);
let { h, s, v } = rgb2hsv(red.value, green.value, blue.value); let { h, s, v } = rgb2hsv(red.value, green.value, blue.value);
hue.value = h; hue.value = h;
saturation.value = s; saturation.value = s;
value.value = v; value.value = v;
// 移动背景板圆圈
pointStyle.value = `top: ${100 - v * 100}%;left: ${s * 100}%;`; pointStyle.value = `top: ${100 - v * 100}%;left: ${s * 100}%;`;
// 移动色调滑块
hueSliderStyle.value = `left: ${(hue.value / 360) * 100}%;`; hueSliderStyle.value = `left: ${(hue.value / 360) * 100}%;`;
}); });

24
src/component/table/index.vue
View File

@ -106,19 +106,19 @@ const print = function () {
const exportData = () => { const exportData = () => {
const wb = XLSX.utils.book_new(); const wb = XLSX.utils.book_new();
let arr: any[] = []; let arr: any[] = [];
props.dataSource.forEach(item => { props.dataSource.forEach((item) => {
let obj = {} let obj = {};
tableColumns.value.forEach(tableColumn => { tableColumns.value.forEach((tableColumn) => {
// @ts-ignore // @ts-ignore
Object.keys(item).forEach((name) => { Object.keys(item).forEach((name) => {
if(tableColumn.key === name) { if (tableColumn.key === name) {
// @ts-ignore // @ts-ignore
obj[tableColumn.title] = item[name] obj[tableColumn.title] = item[name];
} }
}) });
}) });
arr.push(obj); arr.push(obj);
}) });
const ws = XLSX.utils.json_to_sheet(arr); const ws = XLSX.utils.json_to_sheet(arr);
XLSX.utils.book_append_sheet(wb, ws, "sheet"); XLSX.utils.book_append_sheet(wb, ws, "sheet");
XLSX.writeFile(wb, "export.xls", { XLSX.writeFile(wb, "export.xls", {