Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/page-subspecialty/views/modules/imgEditorFabric/img-editor/importTmpl.vue

@@ -8,10 +8,10 @@
 
 <template>
   <div style="display:inline-block">
-    <el-divider plain orientation="left">标题模板</el-divider>
-    <el-tooltip v-for="(item, i) in list" :key="i + '-bai1-button'" :content="item.label" placement="top">
+    <div plain orientation="left">标题模板</div>
+    <div v-for="(item, i) in list" :key="i + '-bai1-button'" :content="item.label" placement="top">
       <img class="tmpl-img" :alt="item.label" :src="item.src" @click="getTempData(item.tempUrl)">
-    </el-tooltip>
+    </div>
   <!-- <Divider plain orientation="left">形状模板</Divider> -->
   </div>
 </template>
@@ -19,12 +19,12 @@
 <script>
 import select from '@/mixins/select'
 import { downFontByJSON } from '@/utils/utils'
-import { Tooltip, Divider } from 'view-design'
+// import { Tooltip, Divider } from 'view-design'
 
 export default {
   name: 'ToolBar',
   components: {
-    Tooltip, Divider
+    // Tooltip, Divider
   },
   mixins: [select],
   data() {

src/page-subspecialty/views/modules/imgEditorFabric/index.vue

@@ -100,7 +100,7 @@ import 'fabric/src/mixins/eraser_brush.mixin'
 import initAligningGuidelines from '@/core/initAligningGuidelines'
 import initHotkeys from '@/core/initHotKeys'
 import initControls from '@/core/initControls'
-import { changeColor } from 'view-design/src/components/color-picker/utils'
+// import { changeColor } from 'view-design/src/components/color-picker/utils'
 const event = new EventHandle()
 const canvas = {}
 export default {