Commit 846eb957 authored by 罗超's avatar 罗超

修改文字首次点击无法设置属性的问题

parent 17df3b8e
...@@ -23,3 +23,4 @@ pnpm-debug.log* ...@@ -23,3 +23,4 @@ pnpm-debug.log*
package-lock.json package-lock.json
yarn.lock yarn.lock
components.d.ts components.d.ts
auto-imports.d.ts
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// noinspection JSUnusedGlobalSymbols
// Generated by unplugin-auto-import
export {}
declare global {
const ElLoading: typeof import('element-plus/es')['ElLoading']
const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
}
...@@ -64,7 +64,6 @@ onMounted(() => { ...@@ -64,7 +64,6 @@ onMounted(() => {
const rules = ['/editor/','/team_editor/','/manager_template/','/create_template/'] const rules = ['/editor/','/team_editor/','/manager_template/','/create_template/']
window.onbeforeunload = function(event) { window.onbeforeunload = function(event) {
const currentUrl = window.location.pathname; const currentUrl = window.location.pathname;
console.log(currentUrl)
const shouldShowWarning = rules.some(rule => currentUrl.includes(rule)); const shouldShowWarning = rules.some(rule => currentUrl.includes(rule));
if (shouldShowWarning) { if (shouldShowWarning) {
event.preventDefault(); event.preventDefault();
......
...@@ -125,7 +125,6 @@ ...@@ -125,7 +125,6 @@
item.check = !item.check item.check = !item.check
let str = item.DetailsId; let str = item.DetailsId;
let i = props.Parent.SelectedDatas.indexOf(str) // 判断选中列表中是否包含这个点击的div let i = props.Parent.SelectedDatas.indexOf(str) // 判断选中列表中是否包含这个点击的div
console.log(val,item,i);
if (i < 0) { if (i < 0) {
// multipleSelection.value.push(item); // 如果不包含就加进去 // multipleSelection.value.push(item); // 如果不包含就加进去
} else { } else {
......
...@@ -177,7 +177,6 @@ const createScriptMap = (r:any)=>{ ...@@ -177,7 +177,6 @@ const createScriptMap = (r:any)=>{
} }
return city return city
}) })
console.log(cities)
setMarks(cities) setMarks(cities)
setLines(points) setLines(points)
}, 1000); }, 1000);
......
...@@ -235,7 +235,6 @@ export default (MapDOM: Ref<HTMLElement | undefined>, loadingStatus: Ref<boolean ...@@ -235,7 +235,6 @@ export default (MapDOM: Ref<HTMLElement | undefined>, loadingStatus: Ref<boolean
label.fill = am4core.color(fillColor.value.realColor) label.fill = am4core.color(fillColor.value.realColor)
label.currentText = x.name label.currentText = x.name
label.text = x.name label.text = x.name
console.log(x.name)
// labelChildren.children.getIndex(0).hide() // labelChildren.children.getIndex(0).hide()
// label.marginBotton=0 // label.marginBotton=0
label.y = 6 label.y = 6
...@@ -806,7 +805,6 @@ export default (MapDOM: Ref<HTMLElement | undefined>, loadingStatus: Ref<boolean ...@@ -806,7 +805,6 @@ export default (MapDOM: Ref<HTMLElement | undefined>, loadingStatus: Ref<boolean
x.fill = am4core.color(color); x.fill = am4core.color(color);
}) })
} }
console.log(countrySeries.mapPolygons)
countrySeries.mapPolygons.template.stroke = am4core.color(n.borderColor); countrySeries.mapPolygons.template.stroke = am4core.color(n.borderColor);
countrySeries.mapPolygons.template.strokeWidth = n.border countrySeries.mapPolygons.template.strokeWidth = n.border
if(!countrySeries.include) countrySeries.geodataSource.load(); if(!countrySeries.include) countrySeries.geodataSource.load();
......
...@@ -24,7 +24,7 @@ const userLoginHandler = async ()=>{ ...@@ -24,7 +24,7 @@ const userLoginHandler = async ()=>{
if(param.uid && param.uid!=''){ if(param.uid && param.uid!=''){
const response = await useUserStore().setUserAutoLoginAsync(param.uid) const response = await useUserStore().setUserAutoLoginAsync(param.uid)
console.log(param) //console.log(param)
//if(response.isSuccess){ //if(response.isSuccess){
if(param.model=='0') { if(param.model=='0') {
router.push({ router.push({
......
...@@ -122,7 +122,6 @@ const colors = ref<string[]>(['#3556F9','#46CDD9','#591EDB']) ...@@ -122,7 +122,6 @@ const colors = ref<string[]>(['#3556F9','#46CDD9','#591EDB'])
const formatProductHandler = (data: any[]) => { const formatProductHandler = (data: any[]) => {
if (Array.isArray(data)) { if (Array.isArray(data)) {
products.value = data.filter((x) => x.viptype == VipType.TEAM); products.value = data.filter((x) => x.viptype == VipType.TEAM);
console.log(products.value);
} }
}; };
......
...@@ -77,7 +77,6 @@ const initOpModify = async ()=>{ ...@@ -77,7 +77,6 @@ const initOpModify = async ()=>{
} }
const initOpCreate = ()=>{ const initOpCreate = ()=>{
console.log(params)
const ConfigId = parseInt(params.configId.toString()) const ConfigId = parseInt(params.configId.toString())
searchData.value.sellId = 0 searchData.value.sellId = 0
searchData.value.sellTempId = 0 searchData.value.sellTempId = 0
......
...@@ -354,7 +354,7 @@ const UpdateItinerary = async () => { ...@@ -354,7 +354,7 @@ const UpdateItinerary = async () => {
} }
const result = await ConfigService.SetTripOtherTemp(queryMsg); const result = await ConfigService.SetTripOtherTemp(queryMsg);
if (result.data.resultCode == 1) { if (result.data.resultCode == 1) {
console.log('更新行程数据成功-----') //console.log('更新行程数据成功-----')
} }
datas.loading = false datas.loading = false
} }
......
...@@ -84,7 +84,7 @@ const handlePreview = ()=> { ...@@ -84,7 +84,7 @@ const handlePreview = ()=> {
xhr.responseType = 'blob' xhr.responseType = 'blob'
xhr.onprogress = (e:any)=>{ xhr.onprogress = (e:any)=>{
progress.value = parseInt(((e.loaded / e.total) * 100).toString()) progress.value = parseInt(((e.loaded / e.total) * 100).toString())
console.log(e) //console.log(e)
} }
xhr.onload = ()=>{ xhr.onload = ()=>{
isDownLoading.value=false isDownLoading.value=false
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
cropper.reset() cropper.reset()
} }
const ready = () => { const ready = () => {
console.log('Cropper is ready.') //console.log('Cropper is ready.')
} }
const insertImageElement = async (files: FileList,index:number) => { const insertImageElement = async (files: FileList,index:number) => {
let fileType = files[0].name.split('.') let fileType = files[0].name.split('.')
......
...@@ -62,7 +62,6 @@ const loading = ref(false) ...@@ -62,7 +62,6 @@ const loading = ref(false)
const handleChangeMakerImage=(uploadFile:any, uploadFiles:any)=>{ const handleChangeMakerImage=(uploadFile:any, uploadFiles:any)=>{
const raw = uploadFile.raw const raw = uploadFile.raw
console.log(raw.type)
if(raw.type == 'image/jpeg' || raw.type == 'image/png' || raw.type=='image/x-icon'){ if(raw.type == 'image/jpeg' || raw.type == 'image/png' || raw.type=='image/x-icon'){
if(raw.size<=1024*1024*5){ if(raw.size<=1024*1024*5){
var reader = new FileReader(); var reader = new FileReader();
......
...@@ -204,7 +204,7 @@ const getUploadActionUrl=()=>{ ...@@ -204,7 +204,7 @@ const getUploadActionUrl=()=>{
} }
const handleAvatarSuccess=async (res:any)=>{ const handleAvatarSuccess=async (res:any)=>{
console.log("handleAvatarSuccess_res",res); //console.log("handleAvatarSuccess_res",res);
} }
const beforeAvatarUpload=async (res:any)=>{ const beforeAvatarUpload=async (res:any)=>{
......
...@@ -223,7 +223,6 @@ const getUploadActionUrl=()=>{ ...@@ -223,7 +223,6 @@ const getUploadActionUrl=()=>{
} }
const handleAvatarSuccess= (res:any)=>{ const handleAvatarSuccess= (res:any)=>{
console.log("handleAvatarSuccess_res",res);
if(res.data){ if(res.data){
UploadResults.value = res.data UploadResults.value = res.data
if(res.data.successNum>0) emit('imported') if(res.data.successNum>0) emit('imported')
...@@ -234,7 +233,6 @@ const handleAvatarSuccess= (res:any)=>{ ...@@ -234,7 +233,6 @@ const handleAvatarSuccess= (res:any)=>{
const beforeAvatarUpload= (res:any)=>{ const beforeAvatarUpload= (res:any)=>{
closeUploadRes() closeUploadRes()
dialogVisible.value = true dialogVisible.value = true
console.log("beforeAvatarUpload_res",res);
// fileList.value.unshift({ // fileList.value.unshift({
// name: res.name+new Date().getTime(), // name: res.name+new Date().getTime(),
// url: '' // url: ''
......
...@@ -70,6 +70,7 @@ const handleClick = debounce(function() { ...@@ -70,6 +70,7 @@ const handleClick = debounce(function() {
color: props.defaultColor, color: props.defaultColor,
fontname: props.defaultFontName, fontname: props.defaultFontName,
}) })
//console.log('handleClick-debounce',attrs)
mainStore.setRichtextAttrs(attrs) mainStore.setRichtextAttrs(attrs)
}, 30, { trailing: true }) }, 30, { trailing: true })
...@@ -97,7 +98,8 @@ watch(() => props.editable, () => { ...@@ -97,7 +98,8 @@ watch(() => props.editable, () => {
const focus = () => editorView.focus() const focus = () => editorView.focus()
const selectAll = () => autoSelectAll(editorView) const selectAll = () => autoSelectAll(editorView)
const clearSelect = () => clearSelection(editorView) const clearSelect = () => clearSelection(editorView)
defineExpose({ focus,selectAll,clearSelect }) const setClick = () => handleClick()
defineExpose({ focus,selectAll,clearSelect,setClick })
// 执行富文本命令(可以是一个或多个) // 执行富文本命令(可以是一个或多个)
// 部分命令在执行前先判断当前选区是否为空,如果选区为空先进行全选操作 // 部分命令在执行前先判断当前选区是否为空,如果选区为空先进行全选操作
......
...@@ -107,7 +107,8 @@ const handleSelectElement = (e: MouseEvent | TouchEvent, canMove = true) => { ...@@ -107,7 +107,8 @@ const handleSelectElement = (e: MouseEvent | TouchEvent, canMove = true) => {
if(e.button && e.button== 1) return if(e.button && e.button== 1) return
if (props.elementInfo.lock) return if (props.elementInfo.lock) return
e.stopPropagation() e.stopPropagation()
//console.log('触发选中元素:',props.elementInfo.defaultFontName)
editorRef.value?.setClick()
// if(!searchData.value.isTeamManage) mainStore.setToolbarState(ToolbarStates.EL_NORMALDATA) // if(!searchData.value.isTeamManage) mainStore.setToolbarState(ToolbarStates.EL_NORMALDATA)
props.selectElement(e, props.elementInfo, canMove) props.selectElement(e, props.elementInfo, canMove)
} }
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment