@toolspack/ttd-common 0.2.2 → 0.2.5

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@toolspack/ttd-common",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "private": false,
-  "main": "lib/ttd-common.umd.min.js",
+  "main": "src/packages/index.js",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -37,4 +37,4 @@
     "eslint-plugin-vue": "^6.2.2",
     "vue-template-compiler": "^2.6.11"
   }
-}
+}

package/src/packages/cfca/CfcaPdf.vue

@@ -463,7 +463,7 @@ export default {
     signFileKeyImage(item, image) {
       // 将印章内的图片合成到pdf中，此处使用PDFCtrl在 引用该组件的view内
       const certSN = this.PDFCtrl.GetSignCertInfo('SerialNumber')
-      console.log(`-signFileKeyImage--certSN-${ certSN}`)
+      console.log(`-signFileKeyImage--certSN-${ certSN}`, item)
 
       try {
         let lacotionX = ''; let lacotionY = '';

package/src/packages/label-list/LabelOperate.vue

@@ -1,28 +1,20 @@
 <!--打标签  右侧-->
 <template lang="html">
   <div class="label-done-area">
-    <div class="label-group">
+    <div class="label-group" v-if="operateConfig.length">
       <el-menu
-        class="el-menu-vertical-demo title-con"
+        class="label-operate-menu title-con"
+        text-color="#4B5973"
         menu-trigger="click"
         >
-        <template v-for="(item, index) in operateConfig">
-          <el-submenu :index="''+index" :key="index">
+          <el-submenu  :index="''+index" v-for="(item, index) in operateConfig" :key="index" >
             <template slot="title">
               <span>{{item.typeName}}</span>
             </template>
-            <el-menu-item-group v-for="(item2,index2) in item.typeSeal" :key="index2">
-              <el-menu-item :index="index+'-'+index2" @click="changeColor(index,index2)">
-                <el-button
-                  type="text"
-                  @click="emitSignItem(item2)"
-                  :class="{'colorChnage':ind=== index+'-'+index2, 'label-item-btn': true}"
-                  >{{item2.name}}
-                </el-button>
-              </el-menu-item>
-            </el-menu-item-group>
+            <el-menu-item v-for="(item2,index2) in item.typeSeal" :key="index2" :index="index+'-'+index2" @click="changeColor(index,index2)">
+               <span  @click="emitSignItem(item2)" :class="{'colorChnage':ind=== index+'-'+index2, 'label-item-btn': true}" slot="title">{{item2.name}}</span>
+            </el-menu-item>
           </el-submenu>
-        </template>
       </el-menu>
     </div>
     <!-- 文本标签的插槽 -->
@@ -60,17 +52,15 @@ export default {
 </script>
 <style  lang="less">
 .label-done-area {
-  .label-group {
-    .el-submenu__title {
+  .label-operate-menu{
+     .el-submenu__title {
       font-size: 18px;
-      padding: 0 !important;
+      color: #222 !important;
       border-bottom: 1px solid #dcdde3;
     }
-    .el-submenu__title:hover {
-      color: #2e6be6;
-    }
-    .el-menu-item {
-      padding: 0 !important;
+    .el-menu-item{
+      height: 40px;
+      line-height: 40px;
     }
     .el-menu.el-menu--inline {
       border-bottom: 1px solid #dcdde3;
@@ -85,52 +75,26 @@ export default {
       transform: translateY(-50%);
     }
     .el-submenu.is-opened .el-submenu__title {
-      background: #fff !important;
       border-bottom: 1px solid #dcdde3;
     }
-    .el-menu.el-menu--inline li {
-      background: #fbfcfd !important;
-    }
-    .el-menu-item-group__title {
-      height: 0 !important;
-      padding: 0 !important;
-    }
-    .el-submenu.is-active > .el-submenu__title,
-    .el-submenu.is-active > .el-submenu__title i {
-      color: #2e6be6 !important;
-    }
-    .el-submenu.is-opened > .el-submenu__title .el-submenu__icon-arrow {
-      -webkit-transform: rotateX(180deg);
-      transform: rotateX(180deg);
-    }
-    .label-item-btn {
-      line-height: 50px;
+  }
+}
+</style>
+
+<style lang="less" scoped>
+.label-group {
+  margin-bottom: 20px;
+  border: 1px solid #ccc;
+   .label-item-btn {
+      line-height: 40px;
       width: 280px;
       background: none;
-      color: #222222;
       border: none;
       cursor: pointer;
       padding: 0;
       text-align: left;
       font-size: 16px;
     }
-  }
-}
-</style>
-
-<style scoped>
-.label-group {
-  margin-bottom: 20px;
-  border: 1px solid #ccc;
-}
-.title-con {
-  text-indent: 20px;
-  color: #333;
-  font-size: 20px;
-  line-height: 50px;
-  border-bottom: 1px solid #ccc;
-  margin-bottom: -1px;
-  margin-right: -1px;
 }
 .label-done-area {
   width: 320px;

package/src/packages/make-label/LabelMake.vue

@@ -22,7 +22,7 @@
         :key="index"
       >
         <i class="labelCon" :style="getStyleCon(item)">
-          <span class="span-text">{{item.labelType === 2 ? '' : item.showName}}</span>
+          <span class="span-text">{{item.showName}}</span>
         </i>
         <i v-if="isclose" class="close" @click="deleteTag(item, index)">+</i>
         <div v-if="item.labelType===1 && issize" v-size="handlerResize" class="resize-tag"></div>
@@ -171,7 +171,7 @@ export default {
         } else {
           // 返回字符串的 index
           const index = me.mousedownEl.getAttribute('index')
-          console.log(`move${index}`, me.mousedownEl.offsetTop)
+          // console.log(`move${index}`, me.mousedownEl.offsetTop)
           if (index) {
             // 需要转换成Number
             const targetLabel = me.labelData[Number(index)]
@@ -300,7 +300,7 @@ export default {
       // 指定最外层容器的mousemove执行的方法
       this.mousedownEl = el
       this.mousedonwType = 'move'
-      console.log('move mousemoveFn', e.target.className)
+      // console.log('move mousemoveFn', e.target.className)
       if (e.target.className === 'close' || e.target.className === 'resize-tag') {
         return
       }

package/src/packages/make-label/directive.js

@@ -3,7 +3,7 @@ const directive = {
     inserted(el, binding, vnode) {
       el.onmousedown = function (e) {
         binding.value(e, el)
-        console.log('执行onmousedown', el.className)
+        // console.log('执行onmousedown', el.className)
         e.stopPropagation();
       }
     },
@@ -13,7 +13,7 @@ const directive = {
       // 修改标签大小
       el.onmousedown = function (e) {
         binding.value(e, el)
-        console.log('onmousedown', el.className)
+        // console.log('onmousedown', el.className)
         e.stopPropagation();
       }
     },

package/src/views/MakeLabel.vue

@@ -53,11 +53,9 @@
               <div class="label-done">
                 <ttd-label-operate
                   :showSelectLabel="false"
-                  isConsign
                   :operateConfig="operateConfig"
                   :labelData="labelData"
                   @getSignItem="getSignItem"
-                  @setLabelView="labelView=$event"
                 >
                   <search-label @emit-label="getSignItem" />
                 </ttd-label-operate>