centaline-data-driven 1.2.24 → 1.2.25

package/package.json

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

package/src/centaline/api/index.js

@@ -127,6 +127,10 @@ Axios.defaults.withCredentials = true;//允许带上跨域cookies
 
 const api = {
   get(url, params, callback) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.get(url, params, {
       headers: {
         headers: common.getDataDrivenOpts().handler.getRequestHeaders()
@@ -138,6 +142,10 @@ const api = {
     );
   },
   post(url, params, callback) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.post(url, params, {
       headers: {
         headers: common.getDataDrivenOpts().handler.getRequestHeaders()
@@ -230,6 +238,10 @@ const api = {
     return Promise.resolve(response.data);
   },
   postHandler(url, params, formData) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.post(url, params, {
       headers: common.getDataDrivenOpts().handler.getRequestHeaders()
     }).then(this.postThenHandler).catch((ex) => {

package/src/centaline/common/index.js

@@ -487,6 +487,9 @@ const common = {
   globalUri() {
     return Vue.prototype.$dataDrivenOpts.baseUrl;
   },
+  flagRouterSelf() {
+    return Vue.prototype.$dataDrivenOpts.flagRouterSelf;
+  },
 
   /**
    * @method

package/src/centaline/dynamicComboBoxWithTextBox/src/dynamicComboBoxWithTextBox.vue

@@ -48,7 +48,7 @@
             <el-input v-if="model.id3" v-bind="model.attrs"
                       :placeholder="model.placeholder3" v-model="model.value3"
                       @input="inputHandler($event)" @change="changeHandler($event)"
-                      :disabled="model.lock" :maxlength="model.max"></el-input>
+                      :disabled="model.lock" :maxlength="maxlength4"></el-input>
           </div>
         </div>
       </div>
@@ -110,6 +110,15 @@
         set: function (v) {
 
         }
+      },
+      maxlength4()
+      {
+         if(this.model.max4)
+         {
+           return parseInt(this.model.max4)
+         }
+         return 99999
+
       }
     },
     mounted() {

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -7,9 +7,6 @@
                 v-if="apiRouter!==null && !flagLook" :is="apiRouter.is" :vmodel="apiRouter" 
                 @click="lookOwner(apiRouter,$event)"></component>
             <div class="contacts-tips" v-else>
-                <!-- <button class="el-button el-button--primary el-button--mini max-btn-add">新增联系人</button>
-                <button class="el-button el-button--primary el-button--mini max-btn-add">通话记录</button>
-                <button class="el-button el-button--primary el-button--mini max-btn-add">查看历史号码</button> -->
                 <component class="el-button el-button--primary el-button--mini max-btn-add" 
                 v-if="model && model.buttons!==null && model.buttons.length>0" 
                 v-for="(col, index) in model.buttons" :key="index"

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/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

@@ -16,9 +16,9 @@ const ContactList = function (source,para ,callBack) {
           return rtn._buttons;
         }
         else {
-          if (source.content.toolButtons) {
+          if (data.content.toolButtons) {
             rtn._buttons = [];
-            source.content.toolButtons.forEach((v) => {
+            data.content.toolButtons.forEach((v) => {
               var button = Router(v);
               button.is = "ct-btn";
               button.attrs = { size: "mini", class: 'max-btn-gray' }
@@ -34,8 +34,8 @@ const ContactList = function (source,para ,callBack) {
         }
         else {
           rtn._actionRouter = [];
-          if (source.content.actionRouters) {
-            source.content.actionRouters.forEach((v) => {
+          if (data.content.actionRouters) {
+            data.content.actionRouters.forEach((v) => {
               var router = Router(v);
               //router.is = "ct-btn";
               //router.attrs = { size: "mini" }
@@ -60,6 +60,71 @@ const ContactList = function (source,para ,callBack) {
           }
           return rtn._rowRouter;
         }
+      },      
+      get listData() {
+        if (!data.content.rows) {
+          data.content.rows = [];
+        }
+        return data.content.rows;
+      },
+      set listData(v) {
+        data.content.rows = v;
+      },
+      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();
       },
     };
     return rtn;
@@ -68,7 +133,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);
           }

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: {