centaline-data-driven 1.2.91 → 1.2.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.91",
+  "version": "1.2.92",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/dynamicCompound/src/dynamicCompound.vue

@@ -1,11 +1,11 @@
 <template>
-  <el-row v-if="model.fields.length > 0">
-    <el-col v-for="(col, index) in model.fields" :key="index" v-if="col.show !== false" :span="col.colspan" :class="index>0&&col.label==''?'complex-left-10':''">
+  <el-container  v-if="model.fields.length > 0">
+    <div v-for="(col, index) in model.fields" :key="index" v-if="col.show !== false" :class="index>0&&col.label==''?'complex-left-10':''" :style="{'width':(col.width!='0'?col.width+'px':'100%'),'flex':(col.width!='0'?'0 0 '+col.width+'px':'100%')}">
       <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
-                           @click="fieldClickHandler(col,index)" @change="changeHandler(col,index)"
-                           @input="inputHandler(col,index)"></component>
-    </el-col>
-  </el-row>
+                 @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
+                 @input="inputHandler(col,$event)"></component>
+    </div>
+  </el-container>
 </template>
 
 <script>
@@ -15,7 +15,6 @@
     },
     data: function () {
       return {
-
       }
     },
     methods: {
@@ -30,7 +29,8 @@
     },
     props: {
       vmodel: Object,
-      api: String
+      api: String,
+      parentModel: Object,
     },
     data() {
       return {
@@ -40,7 +40,6 @@
       }
     },
     created() {
-      let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;
     },
@@ -67,17 +66,59 @@
         } 
         return rtnBool;
       },
-      changeHandler(field,index) {
+      changeHandler(field) {
         var self = this;
-        this.model.change = field.change;
-        self.$emit('change');
+        if (typeof field.change !== 'undefined') {
+          if (typeof this.model.scripts !== 'undefined') {
+            this.model.scripts.formData.setExcuteListData(this.model.fields);
+          }
+          this.model.scripts.$fd = field.id;
+          this.$common.excute.call(this.model.scripts, field.change);
+        }
+
+        self.model.isChanged = true;
+        self.model.hiddenHandle(field);
+        self.model.requiredHandle(field);
+        //self.model.validMrf(field);
+
+        if (field.onAfterChanged) {
+          var router = self.model.actionRouters.find((v) => {
+            return v.id === field.onAfterChanged;
+          });
+          self.$parent.$parent.$parent.$parent.clickHandler(router);
+        }
+
+        self.$forceUpdate();
       },
-      inputHandler(field, index) {
+      inputHandler(field) {
         var self = this;
         this.model.input = field.input;//当前小组件事件作为大组件事件
         self.$emit('input');
 
       },
+      fieldClickHandler(field) {
+        let submitData = null;
+        var router = this.model.buttons.find((v) => {
+          return v.id === field.id;
+        });
+        if (router == undefined) {
+          router = this.model.links.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if (router == undefined) {
+          router = this.model.actionRouters.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if (router && field.isSubmitDataFromSelf) {
+          submitData = {};
+          router.submitFormField.forEach((v) => {
+            submitData[v] = field.list[field.listIndex].code;
+          });
+        }
+        this.$parent.$parent.$parent.$parent.clickHandler(router, submitData);
+      },
     }
   }
 </script>

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -554,10 +554,14 @@
                 h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;
               }
               var h3 = 0;
-              if (this.$parent.$parent.$refs.contact) {
+              if (this.$parent.$parent.$refs.title) {
                 h3 = this.$parent.$parent.$refs.title.offsetHeight | 0;
               }
-              let tableHeight = h1 - h2 - h3 - 270;
+              var h4 = 0;
+              if (this.$parent.$parent.$refs.shortcutFollow) {
+                h4 = this.$parent.$parent.$refs.shortcutFollow.offsetHeight | 0;
+              }
+              let tableHeight = h1 - h2 - h3-h4 - 290;
               if (h2 == 0) {
                 tableHeight = tableHeight + 15;
               }
@@ -753,6 +757,35 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice && false) {//看视频
+              var dialogOption = {
+                title: field.pageTitle,
+                pane: self.$common.getParentPane(self),
+                content: [{
+                  component: 'ct-form',
+                  attrs: {
+                    //ssource: data.content,
+                    api: field.action,
+                    apiParam: field.getActionPara(submitData).para,
+                    showTitle: false,
+                    width: field.dialogWidth + 'px',
+                    height: field.dialogHeight + 'px'
+                  },
+                  on: {
+                    submit(ev) {
+                      self.model.updateFields(ev, () => {
+                        self.$refs.Fields.forEach((fd) => {
+                          fd.$forceUpdate();
+                        });
+                      });
+                      self.$common.closeDialog(dialogOption.dialog);
+                    }
+                  }
+                }]
+              };
+              self.$common.openDialog(dialogOption);
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else {
               //self.operationLoading = true;
 

package/src/centaline/loader/src/ctl/Compound.js

@@ -6,7 +6,7 @@ import Router from './Router';
 import Enum from './lib/Enum';
 import Vue from 'vue';
 
-const Compound = function (source, dateType) {
+const Compound = function (source, sourceParent) {
   var rtn = {
     get label() {
       let l = '';
@@ -18,9 +18,63 @@ const Compound = function (source, dateType) {
       }
       return l;
     },
+    isChanged: false,
     set label(v) {
       source.controlLabel = v;
     },
+    _buttons: null,
+    get buttons() {
+      if (rtn._buttons !== null) {
+        return rtn._buttons;
+      }
+      else {
+        rtn._buttons = [];
+        if (sourceParent.buttons) {
+          sourceParent.buttons.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            rtn._buttons.push(button);
+          });
+        }
+        return rtn._buttons;
+      }
+    },
+    _links: null,
+    get links() {
+      if (rtn._links !== null) {
+        return rtn._links;
+      }
+      else {
+        rtn._links = [];
+        if (sourceParent.links) {
+          sourceParent.links.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            if (button.show) {
+              rtn._links.push(button);
+            }
+          });
+        }
+        return rtn._links;
+      }
+    },
+    _actionRouters: null,
+    get actionRouters() {
+      if (rtn._actionRouters !== null) {
+        return rtn._actionRouters;
+      }
+      else {
+        rtn._actionRouters = [];
+        if (sourceParent.actionRouters) {
+          sourceParent.actionRouters.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            rtn._actionRouters.push(button);
+          });
+        }
+        return rtn._actionRouters;
+      }
+    },
     getFormObj() {
       var rtnFormObj = {};
       rtn.fields.forEach((f) => {
@@ -30,6 +84,20 @@ const Compound = function (source, dateType) {
       });
       return rtnFormObj;
     },
+    _compoundfieldsDic: null,//字典，方便取值
+    get compoundfieldsDic() {
+      if (rtn._compoundfieldsDic !== null) {
+        return rtn._compoundfieldsDic;
+      }
+      rtn._compoundfieldsDic = {};
+      if (source.compoundFields) {
+        source.compoundFields.forEach((f) => {
+          let item = LibFunction.GetControl(f, sourceParent, false, false);
+          rtn._compoundfieldsDic[item.id] = item;
+        });
+      }
+      return rtn._compoundfieldsDic;
+    },
     _fields: null,//数组，方便遍历 
     get fields() {
       if (rtn._fields !== null) {
@@ -37,21 +105,104 @@ const Compound = function (source, dateType) {
       }
       let Index = 0;
       rtn._fields = [];
-      for (var key in source.compoundFields) {
-        let value = source.compoundFields[key];
+      source.compoundFields.forEach((v) => {
         Index++;
         let showLabel = true;
-        let item = LibFunction.GetControl(value, source, showLabel, false);
+        let item = LibFunction.GetControl(v, sourceParent, showLabel, false);
         if (item instanceof Object) {
+          item.width = v.width;
           item.form = rtn;
           if (Index == 1 && item.label == "") {
             item.label = rtn.label;
           }
+          rtn.hiddenHandle(item);//是否隐藏关联组件
           rtn._fields.push(item);
         }
-      }
+      });
+      rtn.allRequiredHandle();//必填关联组件
       return rtn._fields;
     },
+    //隐藏关联组件
+    hiddenHandle(item, update) {
+      if (item.id) {
+        let sign = false;
+        let field = null;
+
+        for (var i in source.compoundFields) {
+          if (source.compoundFields[i].hiddenRelationField === item.id) {
+            field = source.compoundFields[i];
+            if (field) {
+              let hiddenValueArr = field.hiddenRelationFieldValue.split(',');
+              if (hiddenValueArr.indexOf(item.code1) > -1) {
+                field.show = false;
+              }
+              else {
+                field.show = true;
+              }
+              sign = true;
+
+              if (update && rtn.self && sign) {
+                rtn.self.$forceUpdate();
+              }
+            }
+          }
+        }
+
+      }
+    },
+    //验证必填关联组件
+    validMrf(item) {
+      let field = rtn.fields[item.mrf];
+
+      if (field && field.self) {
+        if (field.type === Enum.ControlType.List) {
+          //f.required = '0';
+        }
+        else {
+          field.self.validExcute();
+        }
+      }
+    },
+    allRequiredHandle() {
+      rtn.fields.forEach(v => {
+        rtn.requiredHandle(v, null, false);
+      });
+    },
+    //处理必填关联组件
+    requiredHandle(item, update, doMrf) {
+      if (item.id) {
+        let field = null;
+        for (var i in source.compoundFields) {
+          if (source.compoundFields[i].requiredRelationField === item.id) {
+            field = source.compoundFields[i];
+            let f = rtn.compoundfieldsDic[field.fieldName1];
+
+            if (field) {
+              let hiddenValueArr = field.requiredRelationFieldValue.split(',');
+              if (hiddenValueArr.indexOf(item.value) > -1) {
+                field.required = true;
+              }
+              else {
+                field.required = false;
+              }
+
+              if (f && f.self && f.self.$forceUpdate) {
+                f.self.$forceUpdate();
+              }
+
+              if (update && rtn.self) {
+                rtn.self.$forceUpdate();
+              }
+            }
+          }
+        }
+
+        if (doMrf !== false) {
+          rtn.validMrf(item);
+        }
+      }
+    },
+   
   };
   rtn = base.copy(Base(source), rtn);
   return rtn;

package/src/centaline/loader/src/ctl/Form.js

@@ -42,6 +42,13 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         rtn._fieldsDic = {};
         if (rtn.fields) {
           rtn.fields.forEach((f) => {
+            if (f.type == Enum.ControlType.Compound) {
+              if (f.fields) {
+                f.fields.forEach((v) => {
+                  rtn._fieldsDic[v.id] = v;
+                });
+              }
+            }
             rtn._fieldsDic[f.id] = f;
           });
         }
@@ -196,7 +203,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //设置Field的属性attrKey的值
         setValueByFieldName(id, attrKey, attrValue) {
-            attrKey = this.common.initialsToLowerCase(attrKey);
+          attrKey = this.common.initialsToLowerCase(attrKey);
             var rtn1 = this.fieldsDic[id];
             if (rtn1) {
                 rtn1.source[attrKey] = attrValue;
@@ -211,22 +218,22 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //设置Field的v1、v2的值
         setV1AndV2ByField1(id, code1, code2) {
-            var rtn1 = this.fieldsDic[id];
-            if (rtn1) {
-                if (typeof rtn1.value !== 'undefined') {
-                    rtn1.value = code1;
+          var rtn1 = this.fieldsDic[id];
+          if (rtn1) {
+            if (typeof rtn1.value !== 'undefined') {
+              rtn1.value = code1;
 
-                    this.form.validMrf(rtn1);//验证必填关联组件
-                    this.form.hiddenHandle(rtn1, true);//隐藏关联的
-                }
-                if (typeof rtn1.value1 !== 'undefined') {
-                    rtn1.value1 = code2;
-                }
+              this.form.validMrf(rtn1);//验证必填关联组件
+              this.form.hiddenHandle(rtn1, true);//隐藏关联的
+            }
+            if (typeof rtn1.value1 !== 'undefined') {
+              rtn1.value1 = code2;
+            }
 
-                if (rtn1.self.$forceUpdate) {
-                    rtn1.self.$forceUpdate();
-                }
+            if (rtn1.self.$forceUpdate) {
+              rtn1.self.$forceUpdate();
             }
+          }
         },
 
         //获取列表数据

package/src/centaline/loader/src/ctl/Router.js

@@ -104,6 +104,9 @@ const Router = function (source) {
     get isListenVoice() {
       return source.actionType === Enum.ActionType.ListenVoice;
     },
+    get isSeeVoice() {
+      return source.actionType === Enum.ActionType.SeeVoice;
+    },
     //打开页面（1Form,2SearchList（弹在tab）,3Tab,4执行客户端脚本,5SearchList(弹出)）
     get navToNewPage() {
       return source.navToNewPage;

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -221,7 +221,7 @@ const LibFunction = {
         item.is = 'ct-repeat';
         break;
       case Enum.ControlType.Compound://复合
-        item = Compound(field);
+        item = Compound(field,source);
         item.is = 'ct-compound';
         break;
       case Enum.ControlType.Hidden://隐藏控件