centaline-data-driven 1.4.75 → 1.4.77

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1602938585265344512"} ,
+        apiParam: {actionType: 1,chanceID: "1604775272433979392"} ,
       }
     },
     mounted() {

package/src/centaline/api/index.js

@@ -6,7 +6,7 @@ import common from '../common';
 //Axios.defaults.baseURL = 'https://localhost:44381/api'
 Axios.defaults.headers.post['Content-Type'] = 'application/json';
 Axios.defaults.maxContentLength = 400000;
-Axios.defaults.withCredentials = true;//允许带上跨域cookies
+// Axios.defaults.withCredentials = true;//允许带上跨域cookies
 
 // Axios.defaults = {
 //  // `url` 是用于请求的服务器 URL

package/src/centaline/css/common.css

@@ -713,6 +713,11 @@ html {
   background-color: #d6d6d6;
   border-color: #d6d6d6;
 }
+.el-button--success.is-disabled, .el-button--success.is-disabled:active, .el-button--success.is-disabled:focus, .el-button--success.is-disabled:hover {
+  color: #FFF;
+  background-color: #d6d6d6;
+  border-color: #d6d6d6;
+}
 .ct-tableToolbar .is-disabled {
   background: #b1b3bc !important;
 }

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

@@ -416,7 +416,13 @@
                 if(field.isRefersh){
                   data.apiRouter=self.model.apiRouter;            
                   data.rowMergedColumns=self.model.rowMergedColumns;
-                  self.loaderObj.ContactList(data,null,self.load);
+                  if(data.content.rows&&data.content.rows.length>0)
+                  {
+                   self.loaderObj.ContactList(data,null,self.load);
+                   }
+                  else{
+                   self.lookOwner(self.apiRouter); 
+                    }
                   self.$forceUpdate();
                 }
                 else if (field.isCallTel) {

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -890,7 +890,7 @@
             return;
           }
           submitData[v] = self.$common.getDataOfUpperLower(tempFormData, v);
-          if (typeof tempFormData[v] === "undefined") {
+          if (!submitData[v]) {
             if (self.model.fieldsDic[v]) {
               checkMsg = "请先录入" + self.model.fieldsDic[v].label;
             }
@@ -936,7 +936,7 @@
             },
             on: {
               submit(option) {
-                if (typeof callBack === "function" && !router.callBackFunName) {
+                if (typeof callBack === "function" && !router.changeCallBackFunName) {
                   callBack(option);
                 }
 

package/src/centaline/dynamicForm/src/dynamicFormListTable.vue

@@ -5,8 +5,8 @@
     </div>
     <div class="list-button">
       <component v-if="model.selectRouter!==null" :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
-      <el-button v-if="model.create" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
-        新增
+      <el-button v-if="model.create" :disabled="model.disabled" type="success" class="max-btn-add" style="width: auto;" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+        {{model.createText}}
       </el-button>
     </div>
 
@@ -66,6 +66,7 @@
       </el-row>
     </div>
 
+    <div v-if="model.description" v-html="model.description"></div>
   </div>
 </template>
 <script>

package/src/centaline/dynamicSosTt/src/dynamicSosTt.vue

@@ -263,6 +263,14 @@
           this.valid = false;
           return false;
         }
+        if(this.model.value || this.model.value1){
+          if(this.model.value && this.model.value1){
+            return true;
+          }
+          this.validMessage = "必填";
+          this.valid = false;
+          return false;
+        }
         return true;
       },
       clearClickHandle: function (event) {

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

@@ -25,9 +25,19 @@ const FormList = function (source, master) {
     get master() {
       return master;
     },
+    get disabled(){
+      let flag=false;
+      if(master.maxValue1 && this.tableData && Number(master.maxValue1)<=this.tableData.length){
+        flag=true;
+      }
+      return flag;
+    },
     get title() {
       return master.controlLabel || '';
     },
+    get description() {
+      return master.description || '';
+    },
     get show() {
       if (typeof master.show !== "undefined") {
         return master.show;
@@ -40,6 +50,18 @@ const FormList = function (source, master) {
     set create(v) {
       return source.rightNew = v;
     },
+    get createText() {
+      let t="新增";
+      if(rtn.disabled){
+        t=t+"（已达最大数量）";
+      }
+      else{
+        if(master.maxValue1){
+          t=t+"（"+this.tableData.length+"/"+master.maxValue1+"）";
+        }
+      }
+      return t;
+    },
     get required() {
       return master.required;
     },
@@ -286,7 +308,7 @@ const FormList = function (source, master) {
               for (let j = 0; j < srow.length; j++) {//遍历数据源每一列
                 for (let a = 0; a < rtn.primaryKeys.length; a++) {//遍历组合唯一的字段
                   let currentRow = row[rtn.primaryKeys[a]];
-                  if (srow[j].fieldName1 === rtn.primaryKeys[a] && srow[j].code1 === currentRow.value) {
+                  if (srow[j].fieldName1 === rtn.primaryKeys[a] && srow[j].code1 && srow[j].code1 === currentRow.value) {
                     temp = ++temp;
                     tempLabel = tempLabel + currentRow.label + ',';
                     break;
@@ -326,7 +348,7 @@ const FormList = function (source, master) {
             }
             else {
               rtn.rows[i].deleted = true;
-            }
+            }            
           }
         });
         callback();
@@ -369,7 +391,7 @@ const FormList = function (source, master) {
                 for (let findex = 0; findex < row.length; findex++) {//循环所在行的列
                   Vue.set(row[findex], 'code1', ev.formData.source.fields[findex].code1);
                   Vue.set(row[findex], 'name1', ev.formData.source.fields[findex].name1);
-                  if(ev.formData.source.fields[findex].code2){
+                  if(ev.formData.source.fields[findex].controlType===6){
                     Vue.set(row[findex], 'code2', ev.formData.source.fields[findex].code2);
                   }
                 }
@@ -439,7 +461,7 @@ const FormList = function (source, master) {
                 let field = row.columns[findex];
                 field.code1 = ev.formData.source.fields[findex].code1;
                 field.name1 = ev.formData.source.fields[findex].name1;
-                if(ev.formData.source.fields[findex].code2){
+                if(ev.formData.source.fields[findex].controlType===6){
                   field.code2=ev.formData.source.fields[findex].code2;
                 }
               }
@@ -496,8 +518,7 @@ const FormList = function (source, master) {
         rtn._tableData.splice(0,rtn._tableData.length);
         source.rows.splice(1, source.rows.length-1);
         rtn._rows.splice(1, rtn._rows.length-1);
-        if(newRows.length>0)
-        {
+        if(newRows.length>0){
           source.rows.push(newRows);
           rtn._rows.push(newRows);
         }
@@ -546,6 +567,14 @@ const FormList = function (source, master) {
               if(countKey===rtn.primaryKeys.length){
                 flagAdd=false;
                 if(iRow.deleted){
+                  if(rtn.disabled){
+                    Vue.prototype.$message({
+                      message: '已超过最大数量，不能新增！',
+                      type: 'error',
+                      showClose:true,
+                    });
+                    return;
+                  }
                   rtn.tableData.forEach((d,index) => {
                     if(d.$sourceIndex===r.$sourceIndex){
                       rtn.tableData.splice(index, 1);
@@ -584,12 +613,28 @@ const FormList = function (source, master) {
             }
           });
           if(flagAdd){
+            if(rtn.disabled){
+              Vue.prototype.$message({
+                message: '已超过最大数量，不能新增！',
+                type: 'error',
+                showClose:true,
+              });
+              return;
+            }
             let rows=[];
             rows.push(row);
             rtn.insertRow(rows)
           }
         }
         else{
+          if(rtn.disabled){
+            Vue.prototype.$message({
+              message: '已超过最大数量，不能新增！',
+              type: 'error',
+              showClose:true,
+            });
+            return;
+          }
           let rows=[];
           rows.push(row);
           rtn.insertRow(rows)

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

@@ -14,11 +14,10 @@ const SosTt = function (source, moreActionRouter) {
       return source.name1;
     },
     set text(v) {
-      if(source.displayName1)
-      {
+      if(source.displayName1){
         source.displayName1 = v;
-      }else
-      {
+      } 
+      else{
         source.name1 = v;
       }
     },

package/src/main.js

@@ -48,7 +48,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjFuwzAMRe-i2QQokiKpbLJlLz1EIDcOkExBnAAtgty9KnqILn94w3v_FfbnGg4hk6mLMEzzyCC1GIwaESbNJRUvpGM66pIqkRmwLQ5TRAaiUgG92sKVsxoeq-Ti1E0ddRPFGXzkApTEhZck2VIYwvZ1C4eojpHNXYZwaY8_gCnKL3ju2_1j-_6Pc9fHpWfZziatKWDjT5BTn3xODRRXkrY2ZDmF9w8AAAD__w.sUuy7HIYebv9o9r8-QfM3m-xy5W1OW6FNcq7Wyy0Hp0',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uM5I4_l5TOfEScMiUAJBggoRkECIvRPEImhPcd97heU-hU3IlMxFGLq-ZZBaErQWETrLRYsXslZ3NmglSgk4DQ5dRAaiUgG9poErZ0u4q5KL01paaS1R7MFbLkAqLjyo5KShCfPjEjbRHInEEZtwGm8_iOzyhfsyX7fz8x_nzrfTOjuKHYx0AjdGENQMeZoc9nhUjhzjqBjeHwAAAP__.IhtJ2XWmn0L1rSDetKc8BClKlOEBZl6GWM0s2TfbR1k',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',