@zhijiancloud/bpm 0.0.5 → 0.0.7

package/components/lib/bpmFormField/src/lib/mixin.js

@@ -0,0 +1,245 @@
+import Vue from 'vue'
+
+export default function () {
+    return {
+        props: ["container", "rowIndex", "isNew", "hideLabel"],
+        data() {
+            return {
+                optAssWatchList: [],
+                hasAddOptAssWatch: false,
+                defaultVal: null,
+                firstListVal: null,
+                loadedDefault: false
+            }
+        },
+        computed: {
+            isSubForm() {
+                return false
+            },
+            topContainer() {
+                if (this.container.isSubForm) {
+                    return this.container.container
+                }
+                return this.container
+            },
+            fieldSelf() {
+                return this
+            },
+            fieldPath() {
+                return this._getFieldPath()
+            },
+            readonly() {
+                return true
+            },
+            inner() {
+                return this.$bpm.matchInnerComponent(this.fieldConf.type, this.readonly)
+            },
+            // value: {
+            //     get() {
+            //         return this._getValue()
+            //     },
+            //     set(val) {
+            //         this._setValue(val)
+            //     }
+            // }
+        },
+        created() {
+
+            this.topContainer.$once("beforeSchemaLoad", (form) => {
+                this.clearOptAssWatch()
+            })
+            this.topContainer.$once("dataLoaded", (form) => {
+                this.addOptAssWatch()
+
+            })
+            if (this.isNew && !this.hasAddOptAssWatch) {
+                this.addOptAssWatch()
+
+                this.$emit('update:isNew', false);
+            }
+
+        },
+        methods: {
+            async getConfDefaultValue() {
+               // let compType = this.fieldConf.value_type
+                let defaultType = _.get(this.fieldConf, "default.value.type")
+                defaultType = defaultType ? defaultType : _.get(this.fieldConf, "default.value.type")
+                let val = _.get(this.fieldConf, "default.value.value")
+                let oldDefaultType = _.get(this.fieldConf, "default.type")
+                if(this.defaultVal || this.loadedDefault) return this.defaultVal
+                if (oldDefaultType == 'EVCConfig') {
+                    val = _.get(this.fieldConf, "default.value")
+                    this.defaultVal = val
+                }
+
+
+                if (defaultType == 'EVCExpression' || oldDefaultType == 'EVCExpression') {
+                    this.defaultVal = await this.$bpm.loadValDefault({
+                        fieldId: this.fieldConf.id,
+                        params: {},
+                        cusFormName: this.container.cusFormId,
+                        container: this.container
+                    })
+                    this.loadedDefault = true
+                    return this.defaultVal
+                }
+                else {
+                    let isEVCFirstElem = _.get(this.fieldConf, "default.value.type") == 'EVCFirstElem'
+                    //let isEVCAllElem = _.get(this.fieldConf, "default.value.type") == 'EVCAllElem'
+                    if (isEVCFirstElem) val = this.firstListVal
+                    this.defaultVal = val
+                    this.loadedDefault = true
+                    return val
+                }
+
+            },
+            getTypeValidEmptyValue() {
+                let type = this.fieldConf.value_type
+                let compType = this.fieldConf.type
+                switch (type) {
+                    case "int":
+                        return 0
+                    case "struct":
+                        return compType.substr(0, 3) == "Mul" || compType == "OnlineEditor" || this.isSubForm ? [] : {}
+                    default:
+                        return compType.substr(0, 3) == "Mul" || compType == "OnlineEditor" || this.isSubForm ? [] : ""
+                }
+            },
+            removeValue() {
+                let container = this.container
+                let srcObj = container.value
+                // 从属子表单，获取成员
+                if (container.isSubForm) {
+                    srcObj = _.get(srcObj, [this.rowIndex])
+                }
+
+                // 若不存在父元素，则退出
+                if (!srcObj) return
+
+                // 移除字段
+                // let fieldName = _.last(this.fieldPath)
+                // Vue.delete(srcObj, fieldName)
+                this.value = null
+
+            },
+            _getFieldPath(isFullPath = false) {
+                if (this.container.isSubForm) { // 如果容器为子表单
+                    if (isFullPath) {
+                        return [this.container.fieldConf.id, this.rowIndex, this.fieldConf.id]
+                    }
+                    return [this.rowIndex, this.fieldConf.id]
+                }
+                return [this.fieldConf.id]
+            },
+            // TODO _getValue, _setValue 不要了吧，应该改为 emit input 事件
+            _getValue() {
+                // let defaultVal = this.getConfDefaultValue()
+                // let containerType = _.get(this.container, "conf.type")
+                // defaultVal = this.isPromise(defaultVal) || containerType == 'Quote' ? this.defaultVal : defaultVal
+                console.log("this.container",this.container)
+
+
+                let value = ""
+                if(this.container){
+                     value = _.get(
+                        this.container.value,
+                        this.fieldPath
+                    )
+    
+                }else{
+                    value = "666";
+                }
+               
+            
+
+                // value = _.isObject(value) && value.type == "EVCExpression" ? defaultVal : value
+                return value
+            },
+            isPromise(e) {
+                return !!e && typeof e.then == "function";
+            },
+            _setValue(val) {
+                let container = this.container
+                
+                let srcObj = _.cloneDeep(container.value)
+                if (container.isQuote) return
+               
+                // 从属于子表单，设置 containerVal 为对应的数组成员
+                let fieldName = _.last(this.fieldPath)
+                if (container.isSubForm) {
+                    // 确保为一个有效的数组
+                    if (!srcObj) {
+                        srcObj = []
+                    }
+                    // 确保当前 rowIndex 存在对象
+                    let rowIndex = this.rowIndex
+                    if (!srcObj[rowIndex]) {
+                        if (container.isXSubForm) {
+                            Vue.set(srcObj, rowIndex, container.getItem(rowIndex))
+                        }
+                        else {
+                            Vue.set(srcObj, rowIndex, {})
+                        }
+                    }
+                    else {
+                        this.$set(container.value[rowIndex], fieldName, val)
+                        return
+                    }
+                    srcObj = srcObj[rowIndex]
+                    try {
+                        Vue.set(
+                            container.value,
+                            rowIndex,
+                            srcObj
+                        )
+                    } catch (error) {
+                        console.log("error", container.value)
+                    }
+
+                    return
+
+                }
+                // 获取真正的字段名
+
+                Vue.set(
+                    container.value,
+                    fieldName,
+                    val
+                )
+                console.log("container.value",container.value, fieldName, val)
+
+            },
+            clearOptAssWatch() {
+                this.hasAddOptAssWatch = false
+                _.each(this.optAssWatchList, unwatchItem => {
+                    unwatchItem()
+                })
+            },
+            addOptAssWatch() {
+                this.hasAddOptAssWatch = true
+                let optAssMap = _.get(this.fieldConf, "optAssMap")
+                let defaultVisible = _.get(this.fieldConf, "perm.visible")
+                if (!optAssMap || _.isEmpty(optAssMap) || !defaultVisible) return
+                let i = 0
+                _.map(optAssMap, (visibleVals, field) => {
+                    //多个一起联动
+                    field = _.replace(field, "&", ".")
+                    let unWatchItem = this.$watch(`row.f_fields.${field}`, (val) => {
+                        let visible = true
+                        _.map(optAssMap, (visibleVals, field) => {
+                            field = _.replace(field, "&", ".")
+                            let val = _.get(this.row, `f_fields.${field}`)
+                            val = _.toString(val)
+                            visible = visible && _.includes(visibleVals, val)
+                        })
+                        this.fieldConf.perm.visible = visible
+                    }, {
+                        immediate: i == 0
+                    })
+                    i++;
+                    this.optAssWatchList.push(unWatchItem)
+                })
+            }
+        }
+    }
+}

package/components/lib/bpmFormField/src/main.vue

@@ -0,0 +1,35 @@
+<template>
+  <component
+    v-if="curComponent"
+    class="bpm-field"
+    ref="inner-component"
+    v-model="curVal"
+    :is="curComponent"
+    :type="type"
+    :fieldConf="fieldConf"
+    :row="row"
+    :mode="fieldMode"
+    :uiType="uiType"
+    :formDefId="formDefId"
+    :orgInfo="orgInfo"
+    :clearable="clearable"
+    :disabled="fieldDisabled"
+    :isMultiple="isMul"
+    :container="container"
+    v-bind="$attrs" 
+    v-on="$listeners"
+  >
+  </component>
+</template>
+<script>
+
+//依赖联动关系
+import buildFormMixin from "./lib/form_mixin"
+
+import fieldBaseMixin from "../../../mixins/field_base_mixin.vue"
+
+export default {
+  name: "BpmFormField",
+  mixins:[fieldBaseMixin,buildFormMixin()]
+};
+</script>

package/components/lib/bpmMulFile/src/main.vue

@@ -82,5 +82,4 @@ export default {
 </script>
 
 <style>
-@import "../../../css/bpmMulFile.less";
 </style>

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

@@ -44,7 +44,7 @@
               {{ item.name }}
             </div>
             <div class="file-remove" @click="remove(item.md5, item)">
-              删除
+              <span class="operation-btn">删除</span>
             </div>
           </div>
         </viewer>

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

@@ -38,23 +38,17 @@
             {{ item.name }}
           </div>
           <div class="operation-box">
-            <a href="javascript:;" v-if="!isDwg(item)" @click="preview(item)"
+            <a href="javascript:;" class="operation-btn" v-if="!isDwg(item)" @click="preview(item)"
               >预览</a
             >
-            <span v-if="!is_mobile && !isDwg(item)">|</span>
-            <a
-              v-if="!is_mobile"
+            <span v-if="!isDwg(item)">|</span>
+            <a  
               href="javascript:;"
+              class="operation-btn"
               @click="download(item)"
               >下载</a
             >
-            <span v-if="is_mobile">|</span>
-            <a
-              v-if="is_mobile"
-              href="javascript:;"
-              @click="share(item)"
-              >分享</a
-            >
+
           </div>
         </span>
       </span>
@@ -85,7 +79,7 @@ Vue.use(Dialog);
 
 import "viewerjs/dist/viewer.css";
 // import {wvAgent} from "./lib/utils"
-import {urlAppendParam, isMobile} from "../../../utils"
+import {urlAppendParam} from "../../../utils"
 import { showGPSInfo, getFileType, gethashcode } from "./lib/utils";
 
 Vue.use(Viewer);
@@ -121,9 +115,7 @@ export default {
     };
   },
   computed: {
-    is_mobile(){
-      return isMobile()
-    }
+  
   },
   watch: {
     value() {
@@ -206,9 +198,9 @@ export default {
       return result;
     },
     reviewOnMobile(item) {
-      if (this.is_mobile) {
-        this.preview(item);
-      }
+      // if (this.is_mobile) {
+      //   this.preview(item);
+      // }
     },
     async preview(item) {
       let res = await zj.net.w.noapi({
@@ -241,9 +233,7 @@ export default {
         let index = preview_url.lastIndexOf(".com");
         preview_url = preview_url.substring(index + 4, preview_url.length);
         preview_url = encodeURIComponent(preview_url);
-        if (this.is_mobile)
-          url = `/public/app3/bpm/view_pdf.html?url=${preview_url}`;
-        else url = `/public/bpm/app/view_pdf.html?url=${preview_url}`;
+        url = `/public/bpm/app/view_pdf.html?url=${preview_url}`;
       }
 
       this.officeUrl = url;
@@ -255,18 +245,7 @@ export default {
       let res = await zj.net.w.noapi({
         url: `/platform/v1/papi/app_file/download/?file_md5=${item.md5}&webp=0`,
       });
-
-      //如果是移动平台，调用客户端预览页面
-      if (this.is_mobile) {
-        let fileInfo = {
-          share_url: _.get(res, "url_list.0.path.0"),
-          title: item.name,
-          logo_url: "",
-          context: item.name,
-        };
-
-        this.toShare(fileInfo);
-      }
+      return res
     },
 
     //打开预览页

package/components/lib/bpmMulImage/src/main.vue

@@ -24,7 +24,7 @@ export default {
   },
   props: {
     value: {
-      type: String,
+      type: [String, Array],
       
     },
     fieldConf: {
@@ -83,5 +83,4 @@ export default {
 </script>
 
 <style>
-@import "../../../css/bpmMulFile.less";
 </style>

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

@@ -108,6 +108,10 @@ Viewer.setDefaults({
 var AMap = null;
 export default {
   props: {
+    type: {
+      type: String,
+      default: 'MulImage'
+    },
     value: {},
     fieldConf: {},
     row: {},
@@ -128,10 +132,6 @@ export default {
     };
   },
   watch: {
-    curVal(val) {
-      let result = this.isSign ? _.get(val, "0.md5", "") : val;
-      this.$emit("input", result);
-    },
     value() {
       this.curVal =
         this.isSign && _.isString(this.value) && this.value
@@ -150,7 +150,7 @@ export default {
       return "/platform/v1/papi/app_file/upload/";
     },
     isSign() {
-      return this.fieldConf.type == "Signature";
+      return this.type === 'Signature' || this.fieldConf.type == "Signature";
     },
     photo() {
       let list = [];
@@ -427,11 +427,15 @@ export default {
         md5: _.get(response, "data.file_md5"),
       });
       this.curVal = _.cloneDeep(items);
-      console.log("this.curVal", this.curVal);
+      let result = this.isSign ? _.get( this.curVal, "0.md5", "") :  this.curVal;
+      this.$emit("input", result);
+      
     },
     remove(md5) {
       this.curVal = _.filter(this.curVal, (item) => item.md5 != md5);
       this.$refs.uploader.queue = [];
+      let result = this.isSign ? _.get( this.curVal, "0.md5", "") :  this.curVal;
+      this.$emit("input", result);
     },
     onHide() {
       this.opened = false;

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

@@ -1,7 +1,12 @@
 <template>
   <div class="bpm-mul-image-reader">
     <div v-show="!curVal || curVal.length == 0">暂无图片</div>
-    <viewer :images="photo" rebuild @inited="inited" ref="viewer">
+
+    <template v-if="isSignature && curVal && curVal[0]">
+      <img :src="fileLink(curVal[0])" alt="电子签名" width="100%" height="100%">
+    </template>
+    
+    <viewer v-else :images="photo" rebuild @inited="inited" ref="viewer">
       <span v-for="item in curVal" :key="item.md5">
         <div class="file-box" v-if="isImageFile(item)">
           <div class="file-icon" style="height: 20px;border: 1px dashed #ececec;">
@@ -50,7 +55,10 @@ Viewer.setDefaults({
 });
 
 export default {
-  props: ["value", "fieldConf", "row"],
+  props: [
+    'type',
+    "value", "fieldConf", "row"
+  ],
   data() {
     return {
       vueLightId1: null,
@@ -58,14 +66,16 @@ export default {
       curVal: [],
       officeUrl: "",
       opened: false,
-      windowH: 0,
-      type: "small",
+      windowH: 0
     };
   },
   computed: {
     is_mobile() {
       return isMobile();
     },
+    isSignature () {
+      return this.type === 'Signature'
+    }
   },
   watch: {
     value() {

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

@@ -1,6 +1,10 @@
 <template>
   <div style="position: relative">
-    <el-input-number ref="component" v-model="curVal"  :precision="precision"></el-input-number>
+    <el-input-number
+      ref="component"
+      v-model="curVal"
+      :precision="precision"
+      @change="handleChange"></el-input-number>
   </div>
 </template>
 
@@ -22,9 +26,6 @@ export default {
   props: ['value','fieldConf', 'row'],
 
   watch: {
-    curVal() {
-      this.$emit("input",this.curVal)
-    },
     value(){
       
       this.curVal = this.value
@@ -37,11 +38,9 @@ export default {
     }
   },
   methods: {
-  },
- 
-  mounted(){
-    console.log("input-value",  this.value)
-    this.curVal = this.value ;
+    handleChange () {
+      this.$emit("input",this.curVal)
+    }
   }
 };
 </script>

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

@@ -1,12 +1,18 @@
 <template>
-    <span :title="label" :class="isButton && value ? 'btn-select' : ''">{{label}}</span>
+    <span v-if="isStatus && rangeEnumMap[value]" :style="{ background: colorMap[value] }" class="bpm-status_tag-status">{{ rangeEnumMap[value] }}</span>
+    <span v-else :title="label" :class="isButton && value ? 'btn-select' : ''">{{label}}</span>
 </template>
 
 <script>
 import _ from "lodash"
 
 export default {
-    props: ['value','fieldConf','row'],
+    props: ['type', 'value','fieldConf','row'],
+    data() {
+        return {
+            colorMap: {}
+        }
+    },
     computed: {
         _value(){
             return _.isArray(this.value) ? this.value : [this.value]
@@ -29,6 +35,9 @@ export default {
         },
         isButton(){
             return _.get(this.fieldConf, "style") == "button";
+        },
+        isStatus () {
+            return this.type === 'Status' || this.fieldConf.type === 'Status'
         }
     },
     methods: {

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

@@ -69,16 +69,12 @@ export default {
         father: node.level === 0 ? "" : node.data.value || "",
       };
       params = _.merge(params, this.orgInfo);
-      let result = await zj.net.w.noapi({
-        url: `/app_flow/v1/papi/dm/assist_tree_field/${formName}/${fieldId}/search_title/`,
-        params,
-      });
-
-      let list = this.transformResultToTree(result.data);
+      let result = await this.$bpm.searchSelectOpts(fieldId, "", formName, this, false, params)
+      
+      let list = this.transformResultToTree(result);
       resolve(list);
     },
     transformResultToTree(items) {
-      console.log("fieldConf", this.fieldConf)
       let type = _.get(this.fieldConf, "type");
       if (type == "SelectCheckItem" || type == "MulSelectCheckItem") {
         return _.map(items, (item) => {

package/components/lib/bpmSelectEntranceForm/index.js

@@ -0,0 +1,7 @@
+import BpmSelectEntranceForm from './src/main.vue'
+
+BpmSelectEntranceForm.install = function(Vue) {
+    Vue.component(BpmSelectEntranceForm.name , BpmSelectEntranceForm);
+}
+
+export default BpmSelectEntranceForm