@zhijiancloud/bpm 0.0.3 → 0.0.5

package/components/lib/bpmMulFile/src/part/reader.vue

@@ -7,7 +7,7 @@
     <viewer :images="photo" rebuild @inited="inited" ref="viewer">
       <span v-for="item in value" :key="item.md5">
         <div class="file-box" v-if="isImageFile(item)">
-          <div class="file-icon">
+          <div class="file-icon" style="height: 20px;border: 1px dashed #ececec;">
             <img :src="fileLink(item, 600)" alt />
           </div>
           <div

package/components/lib/bpmMulImage/src/part/editor.vue

@@ -12,10 +12,12 @@
       :on-success="onUploaded"
       :on-error="onFail"
       :file-list="fileList"
-      v-bind="$attrs" 
+      v-bind="$attrs"
       v-on="$listeners"
     >
-      <el-button size="small" type="primary" slot="trigger" :disabled="disabled">点击上传</el-button>
+      <el-button size="small" type="primary" slot="trigger" :disabled="disabled"
+        >点击上传</el-button
+      >
     </el-upload>
     <div class="row gutter-sm q-my-sm file-list">
       <template v-if="curVal && curVal.length">
@@ -27,7 +29,11 @@
           @inited="inited"
         >
           <div class="col-12 file-box" v-for="item in curVal" :key="item.md5">
-            <span class="file-content" @click="previewImg(item)" v-if="isImageFile(item)">
+            <span
+              class="file-content"
+              @click="previewImg(item)"
+              v-if="isImageFile(item)"
+            >
               <img class="preview-img" :src="fileLink(item)" />
             </span>
             <span @click="preview(item)" v-else class="file-content q-mb-xs">
@@ -45,9 +51,7 @@
             >
               {{ item.name }}
             </div>
-            <div class="file-remove" @click="remove(item.md5, item)">
-              删除
-            </div>
+            <div class="file-remove" @click="remove(item.md5, item)">删除</div>
           </div>
         </viewer>
       </template>
@@ -78,7 +82,7 @@ Vue.use(Dialog);
 import Vue from "vue";
 import Viewer from "v-viewer";
 import "viewerjs/dist/viewer.css";
-import "font-awesome/css/font-awesome.min.css"
+import "font-awesome/css/font-awesome.min.css";
 const piexif = require("piexifjs");
 import { comparessImg, ImageTool } from "./lib/compressImageUtils";
 import { showGPSInfo, getFileType, gethashcode } from "./lib/utils";
@@ -120,32 +124,33 @@ export default {
       fileList: [],
       opened: false,
       officeUrl: "",
-      windowH: 0
+      windowH: 0,
     };
   },
   watch: {
     curVal(val) {
-      let result = this.isSign ? _.get(val, "0.md5", "") : val
+      let result = this.isSign ? _.get(val, "0.md5", "") : val;
       this.$emit("input", result);
     },
-    isSign(){
-      return this.fieldConf.type == 'Signature'
+    value() {
+      this.curVal =
+        this.isSign && _.isString(this.value) && this.value
+          ? [
+              {
+                md5: this.value,
+                name: "",
+                type: "image/png",
+              },
+            ]
+          : this.value;
     },
-    value(){
-      this.curVal = this.isSign
-        ? [
-            {
-              md5: this.value,
-              name: "",
-              type: "image/png",
-            },
-          ]
-        : this.value;
-    }
   },
   computed: {
     url() {
-      return "/platform/v1/papi/app_file/upload/"
+      return "/platform/v1/papi/app_file/upload/";
+    },
+    isSign() {
+      return this.fieldConf.type == "Signature";
     },
     photo() {
       let list = [];
@@ -173,7 +178,7 @@ export default {
       return this.maxCountConf - this.curVal && this.curVal.length;
     },
     disabled() {
-      let val = this.curVal ? this.curVal  : []
+      let val = this.curVal ? this.curVal : [];
       return val.length >= this.maxCountConf;
     },
   },
@@ -181,11 +186,12 @@ export default {
     // getAgent.register();
   },
   mounted() {
-    this.curVal = this.isSign
+    this.curVal =
+      this.isSign && _.isString(this.value) && this.value
         ? [
             {
               md5: this.value,
-              name: "",
+              name: "签名",
               type: "image/png",
             },
           ]
@@ -231,10 +237,10 @@ export default {
       let attrMap = {
         type: "text/javascript",
         async: /^http/.test(url) ? "async" : "",
-        src: url
-      }
+        src: url,
+      };
       for (var key in attrMap) {
-        link[key] = attrMap[key]
+        link[key] = attrMap[key];
       }
       document.head.appendChild(link);
     },
@@ -408,10 +414,10 @@ export default {
     },
     onFail(err, file) {
       let message = `${file.name}上传失败`;
-      console.log("err:", message)
+      console.log("err:", message);
     },
     onUploaded(response, file) {
-      console.log("file", file)
+      console.log("file", file);
 
       let items = _.isArray(this.curVal) ? this.curVal : [];
 
@@ -421,7 +427,7 @@ export default {
         md5: _.get(response, "data.file_md5"),
       });
       this.curVal = _.cloneDeep(items);
-      console.log("this.curVal", this.curVal)
+      console.log("this.curVal", this.curVal);
     },
     remove(md5) {
       this.curVal = _.filter(this.curVal, (item) => item.md5 != md5);

package/components/lib/bpmSelectCheckItem/src/part/editor.vue

@@ -78,8 +78,9 @@ export default {
       resolve(list);
     },
     transformResultToTree(items) {
+      console.log("fieldConf", this.fieldConf)
       let type = _.get(this.fieldConf, "type");
-      if (type == "Sort" || type == "MulSort") {
+      if (type == "SelectCheckItem" || type == "MulSelectCheckItem") {
         return _.map(items, (item) => {
           return {
             value: item[0],
@@ -88,7 +89,7 @@ export default {
           };
         });
       }
-      if (type == "CheckItem" || type == "MulCheckItem") {
+      if (type == "SelectSort" || type == "MulSelectSort") {
         return _.map(items, (item) => {
           return {
             value: item.value,

package/components/lib/bpmText/src/part/editor.vue

@@ -76,7 +76,8 @@ export default {
     async handleAddWord(str) {
       this.selectWord = str;
       if (this.curVal) {
-        let elem = this.$refs.component.$refs.input;
+        let elem = this.$refs.component.$refs.textarea;
+        if(!elem) elem = this.$refs.component.$refs.text
         let startPos = elem.selectionStart;
         let endPos = elem.selectionEnd;
         let value = this.curVal;
@@ -84,7 +85,6 @@ export default {
         let endStr = value.substring(endPos, value.length);
         let result = preStr + str + endStr;
         this.curVal = result;
-
         await this.$nextTick();
         elem.focus();
 

package/components/lib/mixins/RemoteSelectReader.vue

@@ -24,7 +24,13 @@ export default {
       let value = this.value;
       if (_.isNil(value) || !value) return (this.label = "未选择");
       try {
-        if(_.isObject(value)) value = JSON.parse(value)
+        if(_.isObject(value)){
+          try {
+            value = JSON.parse(value)
+          } catch (error) {
+            console.log("error", error)
+          }
+        } 
         let values = _.isArray(value) ? value : [value];
         let fieldId = _.get(this.fieldConf, "id");