This commit is contained in:
X1627315083
2023-11-30 17:02:15 +08:00
parent 6bbc20d7c1
commit dcfd96516b
6 changed files with 31 additions and 22 deletions

View File

@@ -159,7 +159,7 @@ export default defineComponent({
this.colorList[this.selectIndex] = newVal.rgba
let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
this.setColorboardList(colorList)
this.clearSelectColor()
// this.clearSelectColor()
}
},
computed:{
@@ -235,13 +235,13 @@ export default defineComponent({
message.info(this.t('ColorboardUpload.jsContent1'))
}
},false)
this.clearSelectColor()
if ("EyeDropper" in window) {
console.log(true);
}
else {
console.log(false);
}
// this.clearSelectColor()
// if ("EyeDropper" in window) {
// console.log(true);
// }
// else {
// console.log(false);
// }
},
methods:{
clearSelectColor(){

View File

@@ -337,7 +337,7 @@ export default defineComponent({
data.type_ = this.type_;
data.resData = JSON.parse(JSON.stringify(data))
this.store.commit("addGenerateMaterialFils", data);
console.log(this.fileList);
// console.log(this.fileList);
let moodboard = this.store.state.UploadFilesModule.moodboard
if(moodboard.length >= 2 && this.driver__.driver){
driverObj__.moveNext()

View File

@@ -12,7 +12,7 @@
<div class="setLabel_centent">
<ul class="optionsItem">
<li class="optionsItem_title" @click.stop="" v-for="optionsItem,optionsIndex in options" :key="optionsItem.id">
<div class="setLabel_text" :class="{active:optionsItem.checAll}">
<div class="setLabel_text" :class="{active:optionsItem.checkAll}">
<a-checkbox v-model:checked="optionsItem.checkAll" @change="onCheckAllChange(optionsItem)"></a-checkbox>
<span v-show="!optionsItem.openType" :title="optionsItem.classificationName">{{ optionsItem.classificationName }}</span>
<input v-show="optionsItem.openType" type="text" v-model="itemName">
@@ -21,8 +21,7 @@
</div>
<ul class="childrenItem active" v-mousewheel>
<li class="childrenItem_title setLabel_text" :class="{active:childrenItem.checAll}" v-for="childrenItem,childrenIndex in optionsItem.childList" :key="childrenItem.id">
<!-- {{optionsItem }} -->
<li class="childrenItem_title setLabel_text" v-for="childrenItem,childrenIndex in optionsItem.childList" :class="{active:childrenItem.checkAll}" :key="childrenItem.id">
<a-checkbox v-model:checked="childrenItem.checkAll" @change="onCheckAllchildrenItem(optionsItem)"></a-checkbox>
<span v-show="!childrenItem.openType" :title="childrenItem.classificationName">{{ childrenItem.classificationName }}</span>
<input v-show="childrenItem.openType" type="text" v-model="itemName">
@@ -364,7 +363,7 @@ export default defineComponent({
align-items: center;
padding: .5rem 1rem;
width: 16rem;
margin: 2rem 2rem;
margin: 2rem 1rem;
border-radius: 1rem;
justify-content: space-between;
flex-shrink: 0;
@@ -411,7 +410,7 @@ export default defineComponent({
}
.active{
.fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 1 !important;
opacity: 1;
}
}
.childrenItem{
@@ -440,6 +439,11 @@ export default defineComponent({
opacity: 1;
}
}
.active{
.fi-rr-edit,.fi-br-check,.ant-checkbox-wrapper{
opacity: 1;
}
}
&.active::-webkit-scrollbar-button:single-button{
display: none;
}

View File

@@ -16,11 +16,11 @@ const getCookie = (name) => {
function WriteCookie(name) {
var now = new Date();
now.setMonth( now.getMonth() - 1 );
cookievalue = escape(document.myform.customer.value) + ";"
// cookievalue = escape(document.myform.customer.value) + ";"
document.cookie = name + '=' + cookievalue;
document.cookie = name + '=' + '';
document.cookie = "expires=" + now.toUTCString() + ";"
document.write("Setting Cookies : " + "name=" + cookievalue );
// document.write("Setting Cookies : " + "name=" + cookievalue );
}
export {

View File

@@ -58,6 +58,9 @@ const driverObj__ = driver({
disableActiveInteraction:false,//是否禁用显示元素的交互
overlayOpacity:.4,
overlay: true,
// nextBtnText: '—›',
// prevBtnText: '‹—',
doneBtnText: '✕',
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
// console.log(popover,options);
if(element){
@@ -156,7 +159,7 @@ const openGuide = () =>{
let data
// console.log(isBeginner);
if(isBeginner){
// driverObj__.drive();
driverObj__.drive();
data = {
index:driverIndex__,
driver:true,
@@ -168,9 +171,12 @@ const openGuide = () =>{
driver:false,
}
}
// driverObj__.destroy();
driverObj__.drive();
data = {
index:driverIndex__,
driver:false,
driver:true,
}
store = useStore()
// driverObj__.moveTo(18);

View File

@@ -1189,7 +1189,6 @@ export default defineComponent({
}
},
dropdownVisibleChange(){
console.log(this.$refs.cascader);
let element:any = this.$refs.cascader
// element.contentRef._value.textContent = 123123
// element.contentRef._value.outerText = 123123
@@ -1690,8 +1689,8 @@ export default defineComponent({
}
.board_content_img{
width: 100%;
height: 100%;
// width: 100%;
// height: 100%;
}
&:hover .img_item_hover{