Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

zhangyu 4 năm trước cách đây
mục cha
commit
ca0b3b8123
3 tập tin đã thay đổi với 10 bổ sung4 xóa
  1. 2 2
      package.json
  2. 1 1
      src/components/edit/edit-dialog.vue
  3. 7 1
      src/components/edit/left_toolbar.vue

+ 2 - 2
package.json

@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.22",
-    "@saga-web/big": "1.0.65",
+    "@saga-web/big": "1.0.66",
     "@saga-web/draw": "2.1.100",
-    "@saga-web/feng-map": "1.0.16",
+    "@saga-web/feng-map": "1.0.17",
     "@saga-web/graph": "2.1.101",
     "ant-design-vue": "^1.6.0",
     "core-js": "^3.6.4",

+ 1 - 1
src/components/edit/edit-dialog.vue

@@ -33,7 +33,7 @@
                 class="search-select"
                 width="236"
             />
-            <a-input-search placeholder="搜索" class="press-enter" @search="onSearch" v-model="keyword"/>
+            <a-input-search placeholder="搜索位置名称" class="press-enter" @search="onSearch" v-model="keyword"/>
 
           </div>
         </div>

+ 7 - 1
src/components/edit/left_toolbar.vue

@@ -107,6 +107,7 @@
                     v-for="(items,indexs) in item.GraphElements"
                     :key="indexs"
                     :class="[activeIndexs==indexs &&activeIndex==index ?'active-li':'']"
+                    :title="items.Name"
                   >
                     <img
                       :class="['item',`item-${items.Type}`]"
@@ -641,8 +642,13 @@ export default {
               background: #fff;
             }
             .text {
+              width: 100%;
+              padding: 0 5px;
               font-size: 12px;
-              margin: 0 auto;
+              text-align: center;
+              overflow: hidden;
+              text-overflow:ellipsis;
+              white-space: nowrap;
             }
           }
           .active-li {