Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/component/HomePage/Generate.vue

@@ -39,6 +39,41 @@
 							</div>
 						</div>
 					</div>
+					<a-dropdown>
+						<i class="fi fi-br-upload" :class="{ Guide_1_2_6:type_.type2 == 'Printboard'}"></i>
+						<template #overlay>
+							<a-menu>
+								<a-menu-item>
+										<a-upload
+											class="search_upImg"
+											:capture="null"
+											:action="uploadUrl + '/api/element/upload'"
+											list-type="picture-card"
+											:data="{
+												...upload,
+											}"
+											:maxCount='1'
+											:headers="{ Authorization: token }"
+											v-model:file-list="sketchboardList"
+											:before-upload="beforeUpload"
+											accept=".jpg,.png,.jpeg,.bmp"
+											@change="(file) => fileUploadChange(file)"
+										>
+										<div class="drop-container">
+										<i class="fi fi-br-upload" :class="{ Guide_1_2_6:type_.type2 == 'Printboard'}" :title="$t('Generate.uploadTitle')" v-show="!isTextarea && upload.level1Type !== 'Moodboard' && scene?.value != 'Slogan' && scene?.value != 'Logo'"></i>
+											<div>{{ $t('PrintboardUpload.Upload') }}</div>
+										</div>
+										</a-upload>
+								</a-menu-item>
+								<a-menu-item>
+									<div class="drop-container" @click.stop="handleOpenLibrarySelect">
+										<i class="fi fi-rr-followcollection"></i>
+										<div>{{ $t('PrintboardUpload.Library') }}</div>
+									</div>
+								</a-menu-item>
+							</a-menu>
+						</template>
+					</a-dropdown>
 					<textarea 
 						class="textarea"  
 						@input="ifMaximumLength" 
@@ -50,25 +85,7 @@
 						@paste="onPaste"
 
 					></textarea>
-					<i class="fi fi-rr-followcollection"></i>
+					
-					<i class="fi fi-br-upload" :class="{ Guide_1_2_6:type_.type2 == 'Printboard'}" :title="$t('Generate.uploadTitle')" v-show="!isTextarea && upload.level1Type !== 'Moodboard' && scene?.value != 'Slogan' && scene?.value != 'Logo'">
-						<a-upload
-							class="search_upImg"
-							:capture="null"
-							:action="uploadUrl + '/api/element/upload'"
-							list-type="picture-card"
-							:data="{
-								...upload,
-							}"
-							:maxCount='1'
-							:headers="{ Authorization: token }"
-							v-model:file-list="sketchboardList"
-							:before-upload="beforeUpload"
-							accept=".jpg,.png,.jpeg,.bmp"
-							@change="(file) => fileUploadChange(file)"
-						>
-						</a-upload>
-					</i>
 					<i v-show="scene?.value == 'Slogan'" :title="$t('Generate.sloganTitle')" @click.stop="setSlogan" class="fi fi-rr-poll-h"></i>
 					<!-- <i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="setTextareaShow"></i>
 					<i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="setTextareaShow"></i> -->
@@ -204,6 +221,13 @@
         </div>
 		<scaleImage ref="scaleImage" :imgType="type_.type2" :sex="workspace.sex"></scaleImage>
 		<createSlogan ref="createSlogan" @setSloganData="setSloganData"></createSlogan>
+			<SelectImages
+				radio
+				full-data
+				ref="selectImages"
+				@select="handleImageSelect"
+				:api="Https.httpUrls.queryLibraryPage"
+				isLibrary/>
     </div>
 </template>
 <script lang="ts">
@@ -223,6 +247,7 @@ import { openGuide,driverObj__,driverIndex__ } from "@/tool/guide";
 import createSlogan from "@/component/HomePage/createSlogan.vue";
 import { useI18n } from "vue-i18n";
 import sketchCategory from "@/component/HomePage/sketchCategory.vue";
+import SelectImages from '@/component/common/SelectImages.vue'
 
 export default defineComponent({
 	components: {
@@ -230,6 +255,7 @@ export default defineComponent({
 		generalMenu,
 		createSlogan,
 		sketchCategory,
+		SelectImages
 	},
     props: ["msg",'sketchCatecoryList','scene','gender'],
 	emits:['setLibrary'],
@@ -393,6 +419,7 @@ export default defineComponent({
 			openSpeed,
 			setSpeed,
 			upload,
+			Https
         };
     },
     data(prop) {
@@ -898,6 +925,7 @@ export default defineComponent({
 					let paste = this.sketchboardList.filter((v: any) => v.id === file.id);
 					if(paste.length == 0)this.sketchboardList.push(file);
 					this.sketchboardList = this.sketchboardList.filter((v: any) => v.status === "done");
+					console.log('插入图片',this.sketchboardList)
 					nextTick().then(()=>{
 						if(this.driver__.driver && this.type_.type2 == 'Printboard'){
 							driverObj__.moveNext()
@@ -1038,6 +1066,22 @@ export default defineComponent({
 				})
 			}
 			
+		},
+		handleOpenLibrarySelect(){
+			let selectImages:any = this.$refs.selectImages
+			selectImages.init()
+		},
+		handleImageSelect(data:any){
+			const	file={
+				status: 'done',
+				...data,
+				errCode:0,
+				imgUrl:data.url,
+				xhr:{
+					response:JSON.stringify({...data,errCode:0,imgUrl:data.url,status:'done'})
+				}
+			}
+			this.sketchboardList = [file]
 		}
     },
 });
@@ -1180,6 +1224,22 @@ export default defineComponent({
             }
         }
     }
-}
 
+	}
+
+	.search_upImg	:deep(.ant-upload.ant-upload-select-picture-card){
+		background-color: transparent;
+		border: none;
+		width: inherit;
+		height: inherit;
+		margin: 0;
+	}
+
+	.drop-container{
+		display: flex;
+		align-items: center;
+		column-gap: 1rem;
+		padding: 0.25rem 0.3rem 0.25rem;
+		
+	}
 </style>

src/component/LoginPage/verificationCodeInput.vue

@@ -3,9 +3,12 @@
     <div class="captcha">
       <input v-for="(c, index) in getCtData" :key="index"
 		type="text"
-       	ref="input" 
+        v-model="getCtData[index]" ref="input" 
+		inputmode="numeric"
+		pattern="[0-9]*"
         @input="e => {onInput(e.target.value, index)}" 
-        @keydown.delete="e=>{onKeydown(e.target.value, index)}"
+        @keydown="e => {onKeydown(e, index)}"
+        @keypress="e => {onKeypress(e)}"
         @focus="onFocus"
         :disabled="loading"
         >
@@ -54,6 +57,7 @@ export default defineComponent({
   },
   methods: {
     onInput(val, index) {
+      console.log('input',val,index)
 		// val = val.replace(/[^0-9]/g, '');
 	    val = String(val).replace(/\D/g, '');
 		this.getCtData[index] = val
@@ -79,14 +83,29 @@ export default defineComponent({
       index = (index + this.ctSize) % this.ctSize;
       this.$refs.input[index].focus();
     },
-    onKeydown(val, index) {
+    onKeypress(e) {
-      if (val === '') {
+      // 只允许输入数字0-9
-        // 删除上一个input里的值，并对其focus。
+      const char = String.fromCharCode(e.which);
-        if (index > 0) {
+      if (!/[0-9]/.test(char)) {
-          this.getCtData[index - 1] = '';
+        e.preventDefault();
-          this.$refs.input[index - 1].focus();
+      }
+    },
+    onKeydown(e, index) {
+      // 处理删除键
+      if (e.key === 'Backspace' || e.key === 'Delete') {
+        const val = e.target.value;
+        if (val === '') {
+          // 删除上一个input里的值，并对其focus。
+          if (index > 0) {
+            this.getCtData[index - 1] = '';
+            this.$refs.input[index - 1].focus();
+          }
         }
       }
+      // 阻止其他非数字字符
+      else if (e.key && !/[0-9]/.test(e.key) && !['Backspace', 'Delete', 'Tab', 'Enter', 'ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(e.key)) {
+        e.preventDefault();
+      }
     },
 
     sendCaptcha() {

src/component/common/SelectImages.vue

@@ -102,6 +102,14 @@ const props = defineProps({
   isLibrary: {
     type: Boolean,
     default: false
+  },
+  radio: {
+    type: Boolean,
+    default: false
+  },
+  fullData: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -236,11 +244,18 @@ watch(
 
 // 处理图片点击
 const handleImageClick = item => {
-  // 已选中，取消选中
+  const isSelected = selectList.value.includes(item.url)
-  if (selectList.value.includes(item.url)) {
+
-    selectList.value = selectList.value.filter(url => url !== item.url)
+  if (props.radio) {
+    // 单选模式：选中当前图片或取消选中
+    selectList.value = isSelected ? [] : [item.url]
   } else {
-    selectList.value.push(item.url)
+    // 多选模式：切换选中状态
+    if (isSelected) {
+      selectList.value = selectList.value.filter(url => url !== item.url)
+    } else {
+      selectList.value.push(item.url)
+    }
   }
 }
 
@@ -262,7 +277,15 @@ const handleImageError = event => {
 }
 
 const confirm = () => {
-  emits('select', selectList.value)
+  // console.log('selectList.value',selectList.value,'list.value',list.value)
+  let emitData = null
+  if (props.fullData) {
+    const selected = list.value.filter(item => selectList.value.includes(item.url))
+    emitData = props.radio ? selected[0] : selected
+  } else {
+    emitData = selectList.value
+  }
+  emits('select', emitData)
   showPanel.value = false
 }
 

src/component/home/newProject/setting.vue

@@ -126,8 +126,8 @@ export default defineComponent({
 			dataDom.workspace.init(storeData)
 		}
 		const setProject = ()=>{
+			emit('getHistory',{ data: data.projectData })
 			cleardata()
-			emit('getHistory')
 		}
 		return{
 			...toRefs(dataDom),

src/views/HomeView/history.vue

@@ -70,7 +70,7 @@
     <!-- <setLabel ref="setLabel"></setLabel> -->
     <!-- <RobotAssist></RobotAssist> -->
     <!-- <searchLabel ref="searchLabel" isHistory></searchLabel> -->
-    <projectSetting ref="projectSetting" @getHistory="getHistoryList"></projectSetting>
+    <projectSetting ref="projectSetting" @getHistory="handleConfirmEdit"></projectSetting>
     <div class="history_loading" v-show="isShowMark">
       <a-spin size="large" />
     </div>
@@ -95,6 +95,7 @@ import TableSearchBar from '@/component/common/TableSearchBar.vue'
 // import searchLabel from '@/component/LibraryPage/searchLabel.vue'
 import projectSetting from '@/component/home/newProject/setting.vue'
 import { useStore } from 'vuex'
+import router from '@/router'
 
 export default defineComponent({
   components: {
@@ -423,7 +424,11 @@ export default defineComponent({
       // searchLabel.init(record, index)
       this.$refs.projectSetting.init(record)
     },
-
+    handleConfirmEdit({ data }) {
+      // console.log('data', data)
+      router.push(`/home?history=${data.id}`)
+      this.getHistoryList()
+    },
     retrieveHome(record: any) {
       // let num = true
       // if (record.original == 0) {