centaline-data-driven 1.2.23 → 1.2.26

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -189,6 +189,17 @@
                   <div>该房源共<span class="red-text">{{model.fields1Dic.LookCustomerCount.value}}</span>位客户看房</div>
                   <div>最近7天带看<span class="red-text">{{model.fields1Dic.CustomerLookCount7.value}}</span>次,总带看<span class="red-text">{{model.fields1Dic.CustomerLookCountAll.value}}</span>次。</div>
               </div>
+              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
+                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
+                  <div class="t-item">
+                    <span class="i">{{col.operationName}}</span>
+                  </div>
+                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
+                  <div class="t-item" style="height: 50px;">
+                    <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
+                  </div>
+                </div>                  
+              </div>
               <div class="staff-info base-box">
                 <el-tabs :value="model.activeIndex2" @tab-click="handleClick">
                   <el-tab-pane v-for="(col, index) in model.tags2" :key="col.appID" 
@@ -221,17 +232,6 @@
                   </el-tab-pane>
                 </el-tabs>
               </div>
-              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
-                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
-                  <div class="t-item">
-                    <span class="i">{{col.operationName}}</span>
-                  </div>
-                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
-                  <div class="t-item" style="height: 50px;">
-                    <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
-                  </div>
-                </div>                  
-              </div>
               <div class="customer">
                   <div class="customer-title">
                       匹配客户

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -248,11 +248,33 @@
             return false;
           }
         }
-
+        if(eventName=='valid'&&!this.validFileClass())
+        {
+          this.validMessage="请选择附件分类";
+          this.valid = false;
+          return false;
+        }
         this.valid = true;
         return this.valid;
       },
-
+      //验证附件分类是否必填
+      validFileClass()
+      {
+        if(this.model.paramName)
+        {
+          if(this.model.sourceList&&this.model.sourceList.length>0)
+          {
+            let notClass= this.model.sourceList.filter(item=>{
+              return item.mediaLabelID==undefined||item.mediaLabelID=="";
+            })
+            if(notClass.length>0)
+            {
+              return false
+            }
+          }
+        }
+        return true;
+      },
       classifyClickHandle: function () {
         var self = this;
         this.model.getOptions(() => {
@@ -263,12 +285,28 @@
         classify.file.mediaLabelName = classify.option[this.model.optionModel.optionAttrs.label];
         classify.file.mediaLabelID = classify.option[this.model.optionModel.optionAttrs.value];
         this.model.setClassify(classify);
+        if(!this.validFileClass())
+        {
+          this.validMessage="请选择附件分类";
+          this.valid = false;
+        }else
+        {
+           this.valid = true;
+        }
       },
       classifyFormClickHandle: function (file) {
         var self = this;
         this.model.updateClassify(file, () => {
           //self.$forceUpdate();
         });
+         if(!this.validFileClass())
+        {
+          this.validMessage="请选择附件分类";
+          this.valid = false;
+        }else
+        {
+           this.valid = true;
+        }
       },
     }
   }

package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -107,6 +107,7 @@
           });
           self.FlagPhoto = true;
           self.imageList = sourceRows;
+          //self.imageList=[{thumbnailUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg',mediaUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg'}];
         } catch (e) {
           self.$message.warning(e);
         }
@@ -139,7 +140,7 @@
         if (this.chooseList && this.chooseList.length > 0) {
           this.$emit('handlePhoto', this.chooseList);
         } else {
-          self.$message.warning("请选择至少一张图片");
+          this.$message.warning("请选择至少一张图片");
         }
         
       },

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

@@ -32,6 +32,24 @@ const cbwt = function (source) {
     set value3(v) {
       source.code4 = v;
     },
+    get max2() {
+      return source.maxValue2;
+    },
+    set max2(v) {
+      source.maxValue2 = v;
+    },
+    get max3() {
+      return source.maxValue3;
+    },
+    set max3(v) {
+      source.maxValue3 = v;
+    },
+    get max4() {
+      return source.maxValue4;
+    },
+    set max4(v) {
+      source.maxValue4 = v;
+    },
     get optionColCount() {
       return parseInt(source.optCount) || 5;
     },

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

@@ -4,11 +4,354 @@ import Enum from './lib/Enum';
 import common from '../../../common';
 import Router from './Router';
 import Vue from 'vue';
+import formData from '../../../formData';
 const ContactList = function (source,para ,callBack) {
   var init = function (data) {
     var rtn = {
-        $vue: null,
-        
+      $vue: null,        
+      _buttons: null,
+      _actionRouter: null,
+      _rowRouter: null,
+      _columns: [],
+      _columnsArr: [],
+      _dataFieldcolumns: [],
+      _scripts: null,
+      isMergeTitle: false,//是否合并标题    
+      selectIndex: 0,
+      formData: formData,
+      attrs: {
+        size: 'mini'
+      },
+      get buttons() {
+        if (rtn._buttons !== null) {
+          return rtn._buttons;
+        }
+        else {
+          if (data.content.toolButtons) {
+            rtn._buttons = [];
+            data.content.toolButtons.forEach((v) => {
+              var button = Router(v);
+              button.is = "ct-btn";
+              button.attrs = { size: "mini", class: 'max-btn-gray' }
+              rtn._buttons.push(button);
+            });
+          }
+          return rtn._buttons;
+        }
+      },      
+      get actionRouter() {
+        if (rtn._actionRouter !== null) {
+          return rtn._actionRouter;
+        }
+        else {
+          rtn._actionRouter = [];
+          if (data.content.actionRouters) {
+            data.content.actionRouters.forEach((v) => {
+              var router = Router(v);
+              //router.is = "ct-btn";
+              //router.attrs = { size: "mini" }
+              rtn._actionRouter.push(router);
+            });
+          }
+          return rtn._actionRouter;
+        }
+      },
+      get rowRouter() {
+        if (rtn._rowRouter !== null) {
+          return rtn._rowRouter;
+        }
+        else {
+          rtn._rowRouter = [];
+          if (rtn.actionRouter) {
+            rtn.actionRouter.forEach((v) => {
+              if (v.show) {
+                rtn._rowRouter.push(v);
+              }
+            });
+          }
+          return rtn._rowRouter;
+        }
+      },      
+      get listData() {
+        if (!data.content.rows) {
+          data.content.rows = [];
+        }
+        return data.content.rows;
+      },
+      set listData(v) {
+        data.content.rows = v;
+      }, 
+      get columns() {
+        var self = this;
+        if (self._columns.length > 0) {
+          return self._columns;
+        }
+        else {
+          var lockLeft = true;
+
+          self.isMergeTitle = source.content.columns.some(v => {
+            return v.trOrder === 2;
+          });
+
+          source.content.columns.forEach((v) => {
+            v.columnWidth = v.columnWidth ? v.columnWidth : 'auto';
+            var col = {
+              fixedSize: 0,
+              get source() {
+                return v;
+              },
+              get id() {
+                return common.initialsToUpperCase(v.fieldName);
+              },
+              get name() {
+                return v.displayName;
+              },
+              get sort() {
+                return v.flagSort;
+              },
+              get sortName() {
+                return v.sortBy;
+              },
+              get sortAction() {
+                return v.sc;
+              },
+              set sortAction(v1) {
+                v.sc = v1;
+              },
+              get style() {
+                return v.columnStyle;
+              },
+              get show() {
+                return v.visible;
+              },
+              get rowspan() {
+                return v.rowSpan || 1;
+              },
+              get colspan() {
+                return v.colSpan || 1;
+              },
+              get trOrder() {
+                return v.trOrder || 1;
+              },
+              get isDataField() {
+                return v.isDataField;
+              },
+              get width() {
+                return v.columnWidth ? v.columnWidth : undefined;
+              },
+              set width(widthV) {
+                v.columnWidth = widthV;
+              },
+              get lock() {
+                return v.frozen;
+              },
+              get routerKey() {
+                return v.routerKey;
+              },
+              _router: null,
+              get router() {
+                if (col._router !== null) {
+                  return col._router;
+                }
+                //todo
+                if (typeof v.routerKey !== "undefined") {
+                  let router = rtn.actionRouter.find(b => {
+                    return b.id === v.routerKey;
+                  });
+                  return router;
+                }
+                return null;
+              },
+              //是否高度自适应
+              get autoRowHeight() {
+                return v.autoRowHeight;
+              },
+              attrs: {
+                get style() {
+                  let styleObj = v.cs ? JSON.parse(v.cs) : {};
+                  if (rtn.$vue !== null) {
+                    if (v.frozen) {
+                      if (col.fixed === 'right') {
+                        styleObj.right = col.fixedSize + 'px'
+                      }
+                      else if (col.fixed === 'left') {
+                        styleObj.left = col.fixedSize + 'px'
+                      }
+                    }
+                  }
+
+                  if (col.width) {
+                    styleObj["width"] = col.width + 'px';//列宽
+                    styleObj["min-width"] = col.width + 'px';//列宽
+                  }
+                  styleObj["text-align"] = col.align;//水平位置
+
+                  return styleObj;
+                  //  return ;
+                },
+                get align() {//水平位置
+                  if (v.align === Enum.HalignType.Left) {
+                    return 'left';
+                  }
+                  if (v.align === Enum.HalignType.Right) {
+                    return 'right';
+                  }
+                  return 'center';
+                },
+                get valign() {//垂直位置 TODO
+                  return v.valign || 'center';
+                },
+                get title() {
+                  return v.columnToolTip;
+                }
+              }
+            };
+            if (col.show) {
+              //合并表头时暂不支持固定列
+              if (col.lock && !self.isMergeTitle) {
+                if (lockLeft) {
+                  col.fixed = 'left';
+                }
+                else {
+                  col.fixed = 'right';
+                }
+              }
+              else {
+                lockLeft = false;
+              }
+            }
+            self._columns.push(col);
+          });
+        }
+        return self._columns;
+      },
+      set columns(v) {
+        this._columns = [];
+        source.content.columns = v;
+      },
+      get columnsArr() {
+        var self = this;
+        if (self._columnsArr.length > 0) {
+          return self._columnsArr;
+        }
+        else {
+          let i = 1;
+          for (; i <= 4; i++) {
+            var arr = self.columns.filter(v => {
+              return v.trOrder === i
+            });
+            if (arr.length === 0) {
+              break;
+            }
+
+            self._columnsArr.push(arr);
+          }
+          return self._columnsArr;
+        }
+      },
+      get dataFieldcolumns() {
+        var self = this;
+        if (self._dataFieldcolumns.length > 0) {
+          return self._dataFieldcolumns;
+        }
+        else {
+          var arr = self.columns.filter(v => {
+            return v.isDataField !== false
+          });
+
+          self._dataFieldcolumns = arr;
+          return self._dataFieldcolumns;
+        }
+      },
+      get rowMergedColumns() {
+        return source.content.rowMergedColumns || [];
+      },
+      doAction(response,field) {
+        if (response.responseData) {
+          response = response.responseData;
+        }
+        if(field.flagFreshCurrentRow || field.flagAddRowAfterAction){
+
+        }
+        else{
+          switch (response.notification) {
+            case Enum.ActionType.Delete://删除
+            case Enum.ActionType.CloseTabThenDelete://删除
+              var deleteRow = response.content.split(',');
+              if (deleteRow) {
+                deleteRow.forEach((r) => {
+                  const dataIndex = rtn.listData.indexOf(rtn.dataDictionary[r])
+                  if (dataIndex !== -1) {
+                    rtn.listData.splice(dataIndex, 1);
+                    delete rtn.dataDictionary[r];
+                  }
+                });
+              }
+              break;
+            case Enum.ActionType.New://新增
+            case Enum.ActionType.CloseTabThenNew://新增  
+              rtn.setStyleRow(response.content);
+              response.content.forEach((nr) => {
+                rtn.listData.unshift(nr);
+              });
+              rtn.dataDictionary = response.content;  
+              rtn.$vue.calculatingRowHeight()
+              break;
+            case Enum.ActionType.Update://修改
+            case Enum.ActionType.CloseTabThenUpdate://修改
+              response.content.forEach((row) => {
+                for (var vkey in row) {
+                  rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
+                }
+              });
+              break;
+            case Enum.ActionType.Export://导出
+              var fileName = response.content.fieldName1;
+              var fileContent = window.atob(response.content.code1);
+              common.saveFile(fileName, fileContent);
+              break;
+            case Enum.ActionType.Refersh://刷新
+              rtn.$vue.getPage(1);
+              break;
+            case Enum.ActionType.RefreshParent://刷新父页面
+              rtn.$vue.$emit('refreshParent');
+              break;
+            default:
+              break;
+          }
+        }
+        rtn.$vue.$forceUpdate();
+      },
+      get scripts() {
+        if (rtn._scripts !== null) {
+          return rtn._scripts;
+        }
+        else {
+          if (typeof source.scripts !== 'undefined') {
+            rtn._scripts = base.common.eval(source.scripts);
+            return rtn._scripts;
+          }
+          else {
+            rtn._scripts = {};
+            return rtn._scripts;
+          }
+        }
+      },
+      get tdClass() {
+        let c = '';
+        if (source.content.lineType !== undefined && source.content.lineType !== null) {
+          if (source.content.lineType === Enum.LineType.Vertical) {
+            c = 'ct-td1';
+          }
+          else if (source.content.lineType === Enum.LineType.Horizon) {
+            c = 'ct-td2';
+          }
+          else if (source.content.lineType === Enum.LineType.Both) {
+            c = 'ct-td3';
+          }
+        }
+        return c;
+      },
     };
     return rtn;
   }
@@ -16,7 +359,7 @@ const ContactList = function (source,para ,callBack) {
     Vue.prototype.$api.postHandler(common.globalUri(), { action: source,para:para}).then(
       function (response) {
         if (response.rtnCode === Enum.ReturnCode.Successful) {
-          var rtn = init(response.content);
+          var rtn = init(response);
           if (callBack) {
             callBack(rtn);
           }
@@ -25,7 +368,10 @@ const ContactList = function (source,para ,callBack) {
     );
   }
   else {
-    return init(source);
+    var rtn = init(source);
+    if (callBack) {
+      callBack(rtn);
+    }
   }
 }
 export default ContactList;

package/src/main.js

@@ -13,7 +13,9 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
+  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",  
+  // baseUrl: "http://10.88.22.46:7070/", 
+  // flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {