Merge pull request 'lyc-dev' (#128) from lyc-dev into main

This commit is contained in:
lyc 2024-12-13 09:47:56 +08:00
commit b4864bc109
5 changed files with 35 additions and 23 deletions

View File

@ -19,7 +19,8 @@
import { ref, reactive, onMounted, computed } from 'vue';
import { sessionStore } from '@/utils/store'
import { getSmarttalkPage } from '@/api/file'
import { getFileSuffix, urlToBase64 } from '@/utils/ruoyi.js'
import * as commUtils from '@/utils/comm.js'
import { getFileSuffix } from '@/utils/ruoyi.js'
const emit = defineEmits(['insertMaterial', 'close'])
@ -62,12 +63,15 @@ const fileUrl = computed(() => (item) =>{
//
const onInsert = async (item) =>{
const res = await fetch(item.fileFullPath)
const bolb = await res.blob()
const file = commUtils.blobToFile(bolb, item.fileShowName)
if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
emit('insertMaterial',{ type: 'video', data: item.fileFullPath })
emit('insertMaterial',{ type: 'video', file })
}
else{
const base64 = await urlToBase64(item.fileFullPath)
emit('insertMaterial',{ type: 'img', data: base64 })
emit('insertMaterial',{ type: 'img', file })
}
}

View File

@ -132,7 +132,7 @@
<Modal
v-model:visible="imgVisible"
:width="1300">
<TextCreateImg hasPPt @insertImg="(url: string) => { createImageElement(url); imgVisible = false }" />
<TextCreateImg hasPPt @insertImg="insertImg" />
</Modal>
</div>
</template>
@ -165,6 +165,7 @@ import { PPTApi } from '../../../api'
import TextCreateImg from '@/components/ai-kolors/index.vue'
import { toPng } from 'html-to-image' // html-to-image
const mainStore = useMainStore()
const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
const { canUndo, canRedo } = storeToRefs(useSnapshotStore())
@ -280,10 +281,11 @@ const toggleNotesPanel = () => {
//
interface MaterialParams {
type: string,
data: string
file: any
}
const insertMaterial = (item: MaterialParams) =>{
const { type, data } = item
const { type, file } = item
PPTApi.toRousrceUrl(file).then(data=>{
if(type == 'video'){
createVideoElement(data)
}
@ -291,10 +293,19 @@ const insertMaterial = (item: MaterialParams) =>{
createImageElement(data)
}
materiaVisible.value = false
})
}
//
const imgVisible = ref(false)
const insertImg = async (file: any) =>{
PPTApi.toRousrceUrl(file).then(data=>{
createImageElement(data)
imgVisible.value = false
})
}
</script>
<style lang="scss" scoped>

View File

@ -482,10 +482,7 @@ export default {
//
async saveImage(resultIndex, index, url, resultItem) {
if(this.hasPPt){
this.$emit('insertImg', url)
return
}
this.buttonStates[resultIndex][index].disabled = true;
this.buttonStates[resultIndex][index].text = "正在保存...";
const numberIndex = url.indexOf('filename=');
@ -495,6 +492,7 @@ export default {
try {
const blob = await this.getImageBlob(`https://ai.ysaix.com:7853/view?filename=${finalPath}&type=temp`);
const hash = CryptoJS.MD5(blob).toString();
const formData = new FormData();
@ -502,7 +500,10 @@ export default {
let file = new File([blob], `${resultItem}.png`, {
type: 'image/png'
})
if(this.hasPPt){
this.$emit('insertImg', file)
return
}
//
formData.append('md5', hash);
formData.append('file', file);

View File

@ -44,7 +44,6 @@ const breadList = ref([])
watch(
() => router.currentRoute.value,
(newValue) => {
console.log(newValue)
const { showBread } = newValue.meta
if (showBread) {
isShowBack.value = true

View File

@ -96,7 +96,6 @@ const pgDialog = reactive({ // 弹窗-进度条
}
})
emitter.on('changeMode', (item) => {
console.log(item, 'item')
resultList.value = item.child
// conversation()
getTempResult(item.id)
@ -106,7 +105,6 @@ emitter.on('changeMode', (item) => {
//
const getTempResult = (id) => {
tempResult({ mainModelId: id }).then(res => {
console.log(res, 2000)
let rows = res.rows
if (rows.length > 0) {
resultList.value.forEach(item => {
@ -357,7 +355,6 @@ const toRousrceUrl = async(o) => {
const curNode = reactive({})
onMounted(() => {
let data = sessionStore.get('subject.curNode')
console.log('data', sessionStore)
Object.assign(curNode, data);
courseObj.node = data