Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

.gitignore

@@ -23,3 +23,4 @@ pnpm-debug.log*
 package-lock.json
 yarn.lock
 components.d.ts
+auto-imports.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']
-}

src/App.vue

@@ -64,7 +64,6 @@ onMounted(() => {
   const rules = ['/editor/','/team_editor/','/manager_template/','/create_template/']
   window.onbeforeunload = function(event) {
     const currentUrl = window.location.pathname;
-    console.log(currentUrl)
     const shouldShowWarning = rules.some(rule => currentUrl.includes(rule));
     if (shouldShowWarning) {
       event.preventDefault();

src/components/CloudDisk/cellList.vue

@@ -125,7 +125,6 @@
         item.check = !item.check
         let str = item.DetailsId;
         let i = props.Parent.SelectedDatas.indexOf(str)  // 判断选中列表中是否包含这个点击的div
-        console.log(val,item,i);
         if (i < 0) {
             // multipleSelection.value.push(item);  // 如果不包含就加进去
         } else {

src/components/Maps/index.vue

@@ -177,7 +177,6 @@ const createScriptMap = (r:any)=>{
             }
             return city
         })
-        console.log(cities)
         setMarks(cities)
         setLines(points)
     }, 1000);

src/components/Maps/useMap.ts

@@ -235,7 +235,6 @@ export default (MapDOM: Ref<HTMLElement | undefined>, loadingStatus: Ref<boolean
                 label.fill = am4core.color(fillColor.value.realColor)
                 label.currentText = x.name
                 label.text = x.name
-                console.log(x.name)
                 // labelChildren.children.getIndex(0).hide()
                 // label.marginBotton=0
                 label.y = 6
@@ -806,7 +805,6 @@ export default (MapDOM: Ref<HTMLElement | undefined>, loadingStatus: Ref<boolean
                     x.fill = am4core.color(color);
                 })
             }
-            console.log(countrySeries.mapPolygons)
             countrySeries.mapPolygons.template.stroke = am4core.color(n.borderColor);
             countrySeries.mapPolygons.template.strokeWidth = n.border
             if(!countrySeries.include) countrySeries.geodataSource.load();

src/views/Auth/AutoLogin.vue

@@ -24,7 +24,7 @@ const userLoginHandler = async ()=>{
     if(param.uid && param.uid!=''){
         
         const response = await useUserStore().setUserAutoLoginAsync(param.uid)
-        console.log(param)
+        //console.log(param)
         //if(response.isSuccess){
             if(param.model=='0') {
                 router.push({

src/views/Company/Product.vue

@@ -122,7 +122,6 @@ const colors = ref<string[]>(['#3556F9','#46CDD9','#591EDB'])
 const formatProductHandler = (data: any[]) => {
   if (Array.isArray(data)) {
     products.value = data.filter((x) => x.viptype == VipType.TEAM);
-    console.log(products.value);
   }
 };
 

src/views/Editor/Editor.vue

@@ -77,7 +77,6 @@ const initOpModify = async ()=>{
 }
 
 const initOpCreate = ()=>{
-    console.log(params)
     const ConfigId = parseInt(params.configId.toString())
     searchData.value.sellId = 0
     searchData.value.sellTempId = 0

src/views/Editor/EditorHeader/index.vue

@@ -354,7 +354,7 @@ const UpdateItinerary = async () => {
   }
   const result = await ConfigService.SetTripOtherTemp(queryMsg);
   if (result.data.resultCode == 1) {
-    console.log('更新行程数据成功-----')
+    //console.log('更新行程数据成功-----')
   }
   datas.loading = false
 }

src/views/SellTemplate/Download.vue

@@ -84,7 +84,7 @@ const handlePreview = ()=> {
   xhr.responseType = 'blob'
   xhr.onprogress = (e:any)=>{
       progress.value = parseInt(((e.loaded / e.total) * 100).toString())
-      console.log(e)
+      //console.log(e)
   }
   xhr.onload = ()=>{
     isDownLoading.value=false

src/views/TeamCenter/LogoDisposition.vue

@@ -393,7 +393,7 @@
       cropper.reset()
     }
     const ready = () => {
-      console.log('Cropper is ready.')
+      //console.log('Cropper is ready.')
     }
     const insertImageElement = async (files: FileList,index:number) => {
         let fileType = files[0].name.split('.')

src/views/TeamCenter/OrgInfo.vue

@@ -62,7 +62,6 @@ const loading = ref(false)
 
 const handleChangeMakerImage=(uploadFile:any, uploadFiles:any)=>{
     const raw = uploadFile.raw
-    console.log(raw.type)
     if(raw.type == 'image/jpeg' || raw.type == 'image/png' || raw.type=='image/x-icon'){
         if(raw.size<=1024*1024*5){
             var reader = new FileReader();

src/views/UserCenter/Setting.vue

@@ -204,7 +204,7 @@ const getUploadActionUrl=()=>{
 }
 
 const handleAvatarSuccess=async (res:any)=>{
-   console.log("handleAvatarSuccess_res",res);
+   //console.log("handleAvatarSuccess_res",res);
 }
 
 const beforeAvatarUpload=async (res:any)=>{

src/views/components/Team/InviteMember.vue

@@ -223,7 +223,6 @@ const getUploadActionUrl=()=>{
 }
 
 const handleAvatarSuccess= (res:any)=>{
-    console.log("handleAvatarSuccess_res",res);
     if(res.data){
         UploadResults.value = res.data
         if(res.data.successNum>0) emit('imported')
@@ -234,7 +233,6 @@ const handleAvatarSuccess= (res:any)=>{
 const beforeAvatarUpload=  (res:any)=>{
     closeUploadRes()
     dialogVisible.value = true
-    console.log("beforeAvatarUpload_res",res);
     // fileList.value.unshift({
     //     name: res.name+new Date().getTime(),
     //     url: ''

src/views/components/element/ProsemirrorEditor.vue

@@ -70,6 +70,7 @@ const handleClick = debounce(function() {
     color: props.defaultColor,
     fontname: props.defaultFontName,
   })
+  //console.log('handleClick-debounce',attrs)
   mainStore.setRichtextAttrs(attrs)
 }, 30, { trailing: true })
 
@@ -97,7 +98,8 @@ watch(() => props.editable, () => {
 const focus = () => editorView.focus()
 const selectAll = () => autoSelectAll(editorView)
 const clearSelect = () => clearSelection(editorView)
-defineExpose({ focus,selectAll,clearSelect })
+const setClick = () => handleClick()
+defineExpose({ focus,selectAll,clearSelect,setClick })
 
 // 执行富文本命令（可以是一个或多个）
 // 部分命令在执行前先判断当前选区是否为空，如果选区为空先进行全选操作

src/views/components/element/TextElement/index.vue

@@ -107,7 +107,8 @@ const handleSelectElement = (e: MouseEvent | TouchEvent, canMove = true) => {
   if(e.button && e.button== 1) return
   if (props.elementInfo.lock) return
   e.stopPropagation()
-
+  //console.log('触发选中元素：',props.elementInfo.defaultFontName)
+  editorRef.value?.setClick()
   // if(!searchData.value.isTeamManage) mainStore.setToolbarState(ToolbarStates.EL_NORMALDATA)
   props.selectElement(e, props.elementInfo, canMove)
 }