From b55b6e7ddd9c9bdfafad010ba5481c9e0aef889d Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 21 Apr 2022 12:07:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=96=87=E6=9C=AC,?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7,=E6=9D=A1=E7=A0=81=202022-04-21=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/panel/layers.vue        |  2 +-
 src/components/panel/options/index.vue | 41 ++++++++++++++++++---
 src/components/panel/style.vue         | 49 +++++++++++++++++++++++---
 3 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/src/components/panel/layers.vue b/src/components/panel/layers.vue
index b8723ed..61f7777 100644
--- a/src/components/panel/layers.vue
+++ b/src/components/panel/layers.vue
@@ -8,7 +8,7 @@
       :type="layer === activeElement?'':'info'"
       @click="(e) => {activeLayer(e, layer)}"
       @close="(e) => {dele(e, layer)}"
-    >{{ layer.value }}</el-tag>
+    >{{ layer.title }}</el-tag>
   </div>
 </template>
 
diff --git a/src/components/panel/options/index.vue b/src/components/panel/options/index.vue
index ffa3371..ecc72d6 100644
--- a/src/components/panel/options/index.vue
+++ b/src/components/panel/options/index.vue
@@ -12,7 +12,7 @@
           <el-checkbox-group v-model="item.selectCol">
             <el-row>
               <el-col v-for="col in item.columnsAttr" :key="col.name" :span="12">
-                <el-checkbox :label="col.name">{{ col.title }}</el-checkbox>
+                <el-checkbox :label="col.name">{{ col.name }}</el-checkbox>
               </el-col>
             </el-row>
           </el-checkbox-group>
@@ -74,7 +74,7 @@ export default {
           defaultValue: "属性",
           dragable: true,
           height: 40,
-          id: 335,
+          id: 336,
           isEdit: 1,
           left: 50,
           lodopStyle: null,
@@ -106,7 +106,7 @@ export default {
           defaultValue:"CK-1234567890",
           dragable:true,
           height:40,
-          id:338,
+          id:337,
           isEdit:1,
           left:50,
           lodopStyle: {
@@ -134,7 +134,40 @@ export default {
           type:"bar-code",
           value:"{单号}",
           width:120
-        }
+        },
+        {
+          columnsAttr:null,
+          defaultValue:"http://192.168.1.83:9100/iamge/666.jpg",
+          dragable:true,
+          height:40,
+          id:338,
+          isEdit:1,
+          left:50,
+          lodopStyle: {
+            id:5,
+            qrCodeErrorlevel:"L",
+            qrCodeVersion:"1",
+            site:null,
+            supplierId:338
+          },
+          name:"图片",
+          remark:null,
+          resizable:true,
+          site:null,
+          status:null,
+          style: {
+            ItemType:0,
+            zIndex:0,
+            height: 100,
+            width: 100
+          },
+          supplierId:1,
+          title:"图片",
+          top:0,
+          type:"braid-image",
+          value:"",
+          width:120
+        },
       ]
     }
   },
diff --git a/src/components/panel/style.vue b/src/components/panel/style.vue
index 8408902..c8cc935 100644
--- a/src/components/panel/style.vue
+++ b/src/components/panel/style.vue
@@ -160,29 +160,68 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row v-if=" activeElement.isEdit==1">
         <el-col :span="12">
-         <el-form-item label="文本内容">
-           <el-input v-model="activeElement.value"></el-input>
+         <el-form-item label="控件名称">
+           <el-input v-model="activeElement.title"></el-input>
          </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item v-if="activeElement.isEdit==1" label="属性值">
+          <el-form-item v-if=" activeElement.type != 'braid-image' " label="属性值">
+            <el-input v-model="activeElement.value"></el-input>
+          </el-form-item>
+          <el-form-item v-if=" activeElement.type == 'braid-image' " label="文件名">
             <el-input v-model="activeElement.name"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if=" activeElement.isEdit==0">
+        <el-col :span="12">
+          <el-form-item label="控件名称">
+            <el-input v-model="activeElement.title"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="文本内容">
+            <el-input v-model="activeElement.value"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
   </div>
 </template>
 <script>
 import { getCodeTypeArray, getItemTypeArray } from '../../libs/props.js'
-
+//activeElement.value
 export default {
   data() {
     return {
+      imageName: '',
+      value: '',
       codeTypeArray: getCodeTypeArray(),
       itemTypeArray: getItemTypeArray(),
+      url: 'http://192.168.1.83:9100/iamge/'
+    }
+  },
+  watch :{
+    imageName:{
+      handler: function (newV, oldV) {
+        this.activeElement.value = 'http://192.168.1.83:9100/iamge/'+this.imageName
+      }
+    },
+    activeElement:{
+      deep: true,
+      handler: function (newV, oldV) {
+        if (this.activeElement.isEdit == 1 &&  this.activeElement.type != 'braid-image'){
+          this.activeElement.name = this.activeElement.value.substring(1,this.activeElement.value.length-1)
+        }
+        if (this.activeElement.isEdit == 1 &&  this.activeElement.type == 'braid-image'){
+          this.activeElement.value = 'http://192.168.1.83:9100/iamge/'+this.activeElement.name
+        }
+        if (this.activeElement.isEdit == 0){
+          this.activeElement.defaultValue = this.activeElement.value
+        }
+      }
     }
   },
   computed: {