Browse Source

样式修改

黄琪勇 4 weeks ago
parent
commit
2ef522dbd7

+ 4 - 2
src/views/Editor/Canvas/Operate/index.vue

@@ -13,12 +13,14 @@
       v-if="isSelected"
       :is="currentOperateComponent"
       :elementInfo="elementInfo"
-      :handlerVisible="!elementInfo.lock && (isActiveGroupElement || !isMultiSelect)"
+      :handlerVisible="
+        !elementInfo.lock && (isActiveGroupElement || !isMultiSelect) && !(elementInfo.type === 'elf' && elementInfo.subtype === 'elf-enjoy')
+      "
       :rotateElement="rotateElement"
       :scaleElement="scaleElement"
       :dragLineElement="dragLineElement"
       :moveShapeKeypoint="moveShapeKeypoint"
-    ></component>
+    />
 
     <div class="animation-index" v-if="toolbarState === 'elAnimation' && elementIndexListInAnimation.length">
       <div class="index-item" v-for="index in elementIndexListInAnimation" :key="index">{{ index + 1 }}</div>

+ 1 - 0
src/views/components/element/enjoyElement/enjoyElement.vue

@@ -73,6 +73,7 @@ const handleSelectElement = (e: MouseEvent | TouchEvent, canMove = true) => {
 .handler-border {
   position: absolute;
   cursor: move;
+  z-index: 1;
 
   &.t {
     width: 100%;

+ 10 - 6
src/views/components/element/enjoyElement/resourcesList/resourcesList.vue

@@ -30,7 +30,7 @@
             v-for="item in resourcesTypeOption"
             :key="item.value"
             @click="handleTypeChange(item.value)"
-            :class="['queryTip', queryData.type === item.value && 'active']"
+            :class="['queryTip', queryData.type === item.value && 'tabActive']"
           >
             {{ item.text }}
           </div>
@@ -132,7 +132,7 @@
             <Empty v-if="!musicList.length && !loading" />
           </div>
           <div class="pagination" v-show="musicList.length">
-            <el-pagination layout="prev, pager, next" :default-page-size="21" @current-change="handleCurrentChange" :total="queryData.total" />
+            <el-pagination layout="prev, pager, next" :default-page-size="20" @current-change="handleCurrentChange" :total="queryData.total" />
           </div>
         </div>
       </div>
@@ -206,9 +206,9 @@ const subjectList = ref<any[]>([])
 
 const queryData = reactive({
   page: 1,
-  rows: 21,
+  rows: 20,
   total: 0,
-  type: "SONG",
+  type: "IMG",
   materialTagId: "",
   sourceType: tabData[0].value,
   name: "",
@@ -261,7 +261,7 @@ function handleSubjectDefault() {
 }
 function clearQueryData() {
   queryData.page = 1
-  queryData.rows = 21
+  queryData.rows = 20
   queryData.total = 0
   queryData.sourceType = 5
   queryData.name = ""
@@ -304,7 +304,7 @@ function handleCurrentChange(e: number) {
 }
 function handleQuery() {
   queryData.page = 1
-  queryData.rows = 21
+  queryData.rows = 20
   handleGetQuery()
 }
 
@@ -478,6 +478,10 @@ const highlightedText = (text: string, query: string) => {
             background: #d2ecff;
             color: rgba(0, 0, 0, 1);
           }
+          &.tabActive {
+            background: #198cfe;
+            color: #ffffff;
+          }
         }
       }
       .query {