icon upload

src/assets/font/demo_index.html

@@ -55,6 +55,36 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe740;</span>
+                <div class="name">new_left</div>
+                <div class="code-name">&amp;#xe740;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe741;</span>
+                <div class="name">new_right</div>
+                <div class="code-name">&amp;#xe741;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe742;</span>
+                <div class="name">new</div>
+                <div class="code-name">&amp;#xe742;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe743;</span>
+                <div class="name">layout</div>
+                <div class="code-name">&amp;#xe743;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe73f;</span>
+                <div class="name">delete</div>
+                <div class="code-name">&amp;#xe73f;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe7f5;</span>
                 <div class="name">backout</div>
                 <div class="code-name">&amp;#xe7f5;</div>
@@ -91,12 +121,6 @@
               </li>
           
             <li class="dib">
-              <span class="icon iconfont">&#xe7f4;</span>
-                <div class="name">layout</div>
-                <div class="code-name">&amp;#xe7f4;</div>
-              </li>
-          
-            <li class="dib">
               <span class="icon iconfont">&#xe7fb;</span>
                 <div class="name">layout_two</div>
                 <div class="code-name">&amp;#xe7fb;</div>
@@ -318,9 +342,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1774585738290') format('woff2'),
-       url('iconfont.woff?t=1774585738290') format('woff'),
-       url('iconfont.ttf?t=1774585738290') format('truetype');
+  src: url('iconfont.woff2?t=1775094317776') format('woff2'),
+       url('iconfont.woff?t=1775094317776') format('woff'),
+       url('iconfont.ttf?t=1775094317776') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -347,6 +371,51 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-new_left"></span>
+            <div class="name">
+              new_left
+            </div>
+            <div class="code-name">.icon-new_left
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-new_right"></span>
+            <div class="name">
+              new_right
+            </div>
+            <div class="code-name">.icon-new_right
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-new"></span>
+            <div class="name">
+              new
+            </div>
+            <div class="code-name">.icon-new
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-layout"></span>
+            <div class="name">
+              layout
+            </div>
+            <div class="code-name">.icon-layout
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-delete"></span>
+            <div class="name">
+              delete
+            </div>
+            <div class="code-name">.icon-delete
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-backout"></span>
             <div class="name">
               backout
@@ -401,15 +470,6 @@
           </li>
           
           <li class="dib">
-            <span class="icon iconfont icon-layout"></span>
-            <div class="name">
-              layout
-            </div>
-            <div class="code-name">.icon-layout
-            </div>
-          </li>
-          
-          <li class="dib">
             <span class="icon iconfont icon-layout_two"></span>
             <div class="name">
               layout_two
@@ -744,6 +804,46 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-new_left"></use>
+                </svg>
+                <div class="name">new_left</div>
+                <div class="code-name">#icon-new_left</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-new_right"></use>
+                </svg>
+                <div class="name">new_right</div>
+                <div class="code-name">#icon-new_right</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-new"></use>
+                </svg>
+                <div class="name">new</div>
+                <div class="code-name">#icon-new</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-layout"></use>
+                </svg>
+                <div class="name">layout</div>
+                <div class="code-name">#icon-layout</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-delete"></use>
+                </svg>
+                <div class="name">delete</div>
+                <div class="code-name">#icon-delete</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-backout"></use>
                 </svg>
                 <div class="name">backout</div>
@@ -792,14 +892,6 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-layout"></use>
-                </svg>
-                <div class="name">layout</div>
-                <div class="code-name">#icon-layout</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-layout_two"></use>
                 </svg>
                 <div class="name">layout_two</div>

src/assets/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4789215 */
-  src: url('iconfont.woff2?t=1774585738290') format('woff2'),
-       url('iconfont.woff?t=1774585738290') format('woff'),
-       url('iconfont.ttf?t=1774585738290') format('truetype');
+  src: url('iconfont.woff2?t=1775094317776') format('woff2'),
+       url('iconfont.woff?t=1775094317776') format('woff'),
+       url('iconfont.ttf?t=1775094317776') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-new_left:before {
+  content: "\e740";
+}
+
+.icon-new_right:before {
+  content: "\e741";
+}
+
+.icon-new:before {
+  content: "\e742";
+}
+
+.icon-layout:before {
+  content: "\e743";
+}
+
+.icon-delete:before {
+  content: "\e73f";
+}
+
 .icon-backout:before {
   content: "\e7f5";
 }
@@ -37,10 +57,6 @@
   content: "\e7fa";
 }
 
-.icon-layout:before {
-  content: "\e7f4";
-}
-
 .icon-layout_two:before {
   content: "\e7fb";
 }

src/assets/font/iconfont.json

@@ -6,6 +6,41 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "47237723",
+      "name": "new_left",
+      "font_class": "new_left",
+      "unicode": "e740",
+      "unicode_decimal": 59200
+    },
+    {
+      "icon_id": "47237722",
+      "name": "new_right",
+      "font_class": "new_right",
+      "unicode": "e741",
+      "unicode_decimal": 59201
+    },
+    {
+      "icon_id": "47237721",
+      "name": "new",
+      "font_class": "new",
+      "unicode": "e742",
+      "unicode_decimal": 59202
+    },
+    {
+      "icon_id": "47237720",
+      "name": "layout",
+      "font_class": "layout",
+      "unicode": "e743",
+      "unicode_decimal": 59203
+    },
+    {
+      "icon_id": "47237652",
+      "name": "delete",
+      "font_class": "delete",
+      "unicode": "e73f",
+      "unicode_decimal": 59199
+    },
+    {
       "icon_id": "47190607",
       "name": "backout",
       "font_class": "backout",
@@ -48,13 +83,6 @@
       "unicode_decimal": 59386
     },
     {
-      "icon_id": "47190582",
-      "name": "layout",
-      "font_class": "layout",
-      "unicode": "e7f4",
-      "unicode_decimal": 59380
-    },
-    {
       "icon_id": "47190581",
       "name": "layout_two",
       "font_class": "layout_two",

src/view/case/photos/canvas-photo-editor.js

@@ -933,11 +933,9 @@ export class CanvasPhotoEditor {
       // 仅首次绑定onload，避免重复绑定
       img.onload = () => {
         // 加载完成后触发全量重绘（保证使用最新状态）
-        console.log(`图片 ${photoId} 加载成功:`)
-        debounce(this.drawAllPages, 500)
+        this.drawAllPages()
       }
       img.onerror = (err) => {
-        console.error(`图片 ${photoId} 加载失败:`, err)
       }
       img.src = photo.url
       this.imgCache.set(photoId, img)

src/view/case/photos/index.vue

@@ -21,13 +21,13 @@
         <span :class="{disable: indexing}">  
         <div class="border-icon" >
           <i
-            class="iconfont icon-repeal"
+            class="iconfont icon-backout"
             :class="{ disable: currentIndex < 1 }"
             @click="undo(true)"
             style="margin-right: 24px"
           ></i>
           <i
-            class="iconfont icon-recover"
+            class="iconfont icon-redo"
             @click="undo(false)"
             :class="{ disable: historylength == currentIndex + 1 }"
             style="margin-right: 24px"
@@ -53,14 +53,14 @@
           </template>
         </el-dropdown> -->
         <i
-          class="iconfont icon-keys_a"
+          class="iconfont icon-new"
           @click="insertBlankPage"
           v-if="pages.length == 1 || selectedPageIndex === -1"
           style="margin-right: 24px"
         ></i>
         <el-dropdown v-else trigger="click" @command="handleAddType">
           <i
-          class="iconfont icon-keys_a"
+          class="iconfont icon-new"
           style="margin-right: 24px"
         ></i>
           <template #dropdown>
@@ -97,7 +97,7 @@
           </template>
         </el-dropdown>
         <i
-          class="iconfont icon-del"
+          class="iconfont icon-delete"
           @click="deleteSelectedPage"
           :class="{
             disable:
@@ -136,6 +136,7 @@
                   ><Check
                 /></el-icon>
               </span>
+              <div class="selectImg" v-if="selectPhotos.includes(photo.id)">已导入</div>
             </div>
           </div>
         </div>
@@ -197,6 +198,19 @@ const selectedPageItem = ref({
   pageIndex: -1,
 });
 const photos = ref([]);
+const selectPhotos = computed(() => {
+  if(editor.value){
+    let newlist = []
+    editor.value.pages.map(ele => {
+      if(ele.list && ele.list.length > 0){
+        newlist = newlist.concat(ele.list)
+      }
+    })
+    return newlist
+  }else{
+    return []
+  }
+});
 
 const selectedPhotos = ref([]);
 const selectedPhotosbf = ref([]);

src/view/case/photos/style.scss

@@ -125,6 +125,22 @@
   line-height: 28px;
   border-radius: 50%;
 }
+.selectImg{
+  display: inline-block;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 22px;
+  font-family: Roboto, Roboto;
+  font-weight: 400;
+  font-size: 12px;
+  color: #E6F7FF;
+  line-height: 22px;
+  text-align: center;
+  background: #26559B;
+  border-radius:10px 0 0 0 ;
+  padding: 0 4px 0 8px;
+}
 
 .layout-setting {
   padding: 16px;