centaline-data-driven 1.3.37 → 1.3.40

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

@@ -5,10 +5,10 @@ import common from '../../../common';
 import Router from './Router';
 import Vue from 'vue';
 import formData from '../../../formData';
-const ContactList = function (source,para ,callBack) {
+const ContactList = function (source, para, callBack) {
   var init = function (data) {
     var rtn = {
-      $vue: null,        
+      $vue: null,
       _buttons: null,
       _actionRouter: null,
       _rowRouter: null,
@@ -21,10 +21,10 @@ const ContactList = function (source,para ,callBack) {
       isMergeTitle: false,//是否合并标题    
       selectIndex: 0,
       formData: formData,
-      rowHiddenKey:'contactID',
-      rowHiddenColumns:['contactNameDesc','propertyIdentityTypeID'],
-      columnShow:'contactNoTypeDesc',
-      rowHiddenKeyData:[],
+      rowHiddenKey: 'contactID',
+      rowHiddenColumns: ['contactNameDesc', 'propertyIdentityTypeID'],
+      columnShow: 'contactNoTypeDesc',
+      rowHiddenKeyData: [],
       attrs: {
         size: 'mini'
       },
@@ -43,6 +43,7 @@ const ContactList = function (source,para ,callBack) {
             rtn._buttons = [];
             data.content.toolButtons.forEach((v) => {
               var button = Router(v);
+              button.key = Math.random().toString();
               button.is = "ct-btn";
               button.attrs = { size: "mini", class: 'max-btn-gray' }
               rtn._buttons.push(button);
@@ -50,7 +51,7 @@ const ContactList = function (source,para ,callBack) {
           }
           return rtn._buttons;
         }
-      },      
+      },
       get actionRouter() {
         if (rtn._actionRouter !== null) {
           return rtn._actionRouter;
@@ -83,20 +84,20 @@ const ContactList = function (source,para ,callBack) {
           }
           return rtn._rowRouter;
         }
-      },      
+      },
       get listData() {
-        if (rtn._listData.length<=0) {
-          if(data.content.rows && data.content.rows.length>0){
-            data.content.rows.forEach((v,i) => {
+        if (rtn._listData.length <= 0) {
+          if (data.content.rows && data.content.rows.length > 0) {
+            data.content.rows.forEach((v, i) => {
               rtn._listData.push(v);
-              if(v.descNewRow){
-                  var newRow = {};
-                  newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                  newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
-                  newRow.columnShow=rtn.columnShow;
-                  newRow.flagRow=true;
-                  rtn._listData.push(newRow);
+              if (v.descNewRow) {
+                var newRow = {};
+                newRow[rtn.rowHiddenKey] = v[rtn.rowHiddenKey];
+                newRow.descNewRow = v.descNewRow;
+                newRow.colspan = rtn.dataFieldcolumnsShow.length - rtn.rowMergedColumns.length;
+                newRow.columnShow = rtn.columnShow;
+                newRow.flagRow = true;
+                rtn._listData.push(newRow);
               }
             });
           }
@@ -105,7 +106,7 @@ const ContactList = function (source,para ,callBack) {
       },
       set listData(v) {
         if (v) {
-          rtn._listData=v;
+          rtn._listData = v;
         }
       },
       get columns() {
@@ -180,7 +181,7 @@ const ContactList = function (source,para ,callBack) {
                 if (col._router !== null) {
                   return col._router;
                 }
-                if (typeof v.routerKey !== "undefined" && v.routerKey && v.routerKey.indexOf(',')===-1) {
+                if (typeof v.routerKey !== "undefined" && v.routerKey && v.routerKey.indexOf(',') === -1) {
                   let router = rtn.actionRouter.find(b => {
                     return b.id === v.routerKey;
                   });
@@ -194,8 +195,8 @@ const ContactList = function (source,para ,callBack) {
                   return col._routers;
                 }
                 if (typeof v.routerKey !== "undefined" && v.routerKey) {
-                  col._routers=[];
-                  v.routerKey.split(',').forEach((v) => {                    
+                  col._routers = [];
+                  v.routerKey.split(',').forEach((v) => {
                     let router = rtn.actionRouter.find(b => {
                       return b.id === v;
                     });
@@ -308,7 +309,7 @@ const ContactList = function (source,para ,callBack) {
           self._dataFieldcolumns = arr;
           return self._dataFieldcolumns;
         }
-      },      
+      },
       get dataFieldcolumnsShow() {
         var self = this;
         if (self._dataFieldcolumnsShow.length > 0) {
@@ -329,10 +330,10 @@ const ContactList = function (source,para ,callBack) {
       get apiRouter() {
         return source.apiRouter;
       },
-      getCurrentRowApiData(rtnData,router) {
+      getCurrentRowApiData(rtnData, router, callBack) {
         var self = this;
         var searchFields = self.apiRouter.getSearchPara();
-        var searchValue1=router.flagAddRowAfterAction? rtnData.content: rtn.listData[rtn.selectIndex][self.primaryKey];
+        var searchValue1 = router.flagAddRowAfterAction ? rtnData.content : rtn.listData[rtn.selectIndex][self.primaryKey];
         if (self.primaryKey) {
           searchFields.fields.push({
             fieldName1: self.primaryFieldMappingDBName ? self.primaryFieldMappingDBName : self.primaryKey,
@@ -350,41 +351,47 @@ const ContactList = function (source,para ,callBack) {
             flagSearch: true
           }
         })
-        .then(function (response) {
-          if (response.rtnCode === Enum.ReturnCode.Successful) {
-            if (response.content.rows.length > 0) {
-              if(router.flagAddRowAfterAction){
-                rtn.doNew(response.content.rows);   
+          .then(function (response) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {
+              if (response.notification == Enum.ActionType.Refersh) {
+                var rtn = init(response);
+                if (callBack) {
+                  callBack(rtn);
+                }
               }
-              else{
-                rtn.doUpdate(response.content.rows,searchValue1);
+              else if (response.content.rows.length > 0) {
+                if (router.flagAddRowAfterAction) {
+                  rtn.doNew(response.content.rows);
+                }
+                else {
+                  rtn.doUpdate(response.content.rows, searchValue1);
+                }
               }
             }
-          }
-        })
-        .catch((error) => {
-        });
+          })
+          .catch((error) => {
+          });
       },
-      doAction(response,field) {
+      doAction(response, field) {
         if (response.responseData) {
           response = response.responseData;
         }
-        if(field.flagFreshCurrentRow || field.flagAddRowAfterAction){
-          rtn.getCurrentRowApiData(response,field);
+        if (field.flagFreshCurrentRow || field.flagAddRowAfterAction) {
+          rtn.getCurrentRowApiData(response, field);
         }
-        else{
+        else {
           switch (response.notification) {
             case Enum.ActionType.Delete://删除
             case Enum.ActionType.CloseTabThenDelete://删除
               var deleteRow = response.content.split(',');
               if (deleteRow) {
                 deleteRow.forEach((r) => {
-                  let strat=-1;
-                  let count=0;
-                  rtn._listData.forEach((v,i) => {
-                    if(v[rtn.rowHiddenKey]===r){
-                      if(strat===-1)strat=i;
-                      count=count+1;
+                  let strat = -1;
+                  let count = 0;
+                  rtn._listData.forEach((v, i) => {
+                    if (v[rtn.rowHiddenKey] === r) {
+                      if (strat === -1) strat = i;
+                      count = count + 1;
                     }
                   });
                   rtn._listData.splice(strat, count);
@@ -393,12 +400,15 @@ const ContactList = function (source,para ,callBack) {
               break;
             case Enum.ActionType.New://新增
             case Enum.ActionType.CloseTabThenNew://新增  
-              rtn.doNew(response.content);              
+              rtn.doNew(response.content);
+              break;
+            case Enum.ActionType.Refersh: //刷新
+              rtn.getCurrentRowApiData(response, field, rtn.$vue.load);
               break;
             case Enum.ActionType.Update://修改
             case Enum.ActionType.CloseTabThenUpdate://修改
-              var searchValue1=rtn.listData[rtn.selectIndex][self.primaryKey];
-              rtn.doUpdate(response.content,searchValue1);
+              var searchValue1 = rtn.listData[rtn.selectIndex][self.primaryKey];
+              rtn.doUpdate(response.content, searchValue1);
               break;
             default:
               break;
@@ -406,60 +416,60 @@ const ContactList = function (source,para ,callBack) {
         }
         rtn.$vue.$forceUpdate();
       },
-      doNew(data){
+      doNew(data) {
         data.forEach((v) => {
-          if(v.descNewRow){
+          if (v.descNewRow) {
             var newRow = {};
-            newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+            newRow[rtn.rowHiddenKey] = v[rtn.rowHiddenKey];
             newRow.descNewRow = v.descNewRow;
-            newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
-            newRow.columnShow=rtn.columnShow;
-            newRow.flagRow=true;
+            newRow.colspan = rtn.dataFieldcolumnsShow.length - rtn.rowMergedColumns.length;
+            newRow.columnShow = rtn.columnShow;
+            newRow.flagRow = true;
             rtn._listData.unshift(newRow);
           }
           rtn._listData.unshift(v);
         });
         rtn.setHiddenRow();
       },
-      doUpdate(data,searchValue1){
-        let updateData=[];
+      doUpdate(data, searchValue1) {
+        let updateData = [];
         data.forEach((v) => {
           updateData.push(v);
-          if(v.descNewRow){
+          if (v.descNewRow) {
             var newRow = {};
-            newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+            newRow[rtn.rowHiddenKey] = v[rtn.rowHiddenKey];
             newRow.descNewRow = v.descNewRow;
-            newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
-            newRow.columnShow=rtn.columnShow;
-            newRow.flagRow=true;
+            newRow.colspan = rtn.dataFieldcolumnsShow.length - rtn.rowMergedColumns.length;
+            newRow.columnShow = rtn.columnShow;
+            newRow.flagRow = true;
             updateData.push(newRow);
           }
         });
-        let strat=-1;
-        let count=0;
-        rtn._listData.forEach((v,i) => {
-          if(v[rtn.rowHiddenKey]===searchValue1){
-            if(strat===-1)strat=i;
-            count=count+1;
+        let strat = -1;
+        let count = 0;
+        rtn._listData.forEach((v, i) => {
+          if (v[rtn.rowHiddenKey] === searchValue1) {
+            if (strat === -1) strat = i;
+            count = count + 1;
           }
         });
-        if(updateData.length===1){
-          rtn._listData.splice(strat, count,updateData[0]);
-        }        
-        else if(updateData.length===2){
-          rtn._listData.splice(strat, count,updateData[0],updateData[1]);
-        }       
-        else if(updateData.length===3){
-          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2]);
-        }       
-        else if(updateData.length===4){
-          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3]);
-        }       
-        else if(updateData.length===5){
-          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3],updateData[4]);
-        }       
-        else if(updateData.length===6){
-          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3],updateData[4],updateData[5]);
+        if (updateData.length === 1) {
+          rtn._listData.splice(strat, count, updateData[0]);
+        }
+        else if (updateData.length === 2) {
+          rtn._listData.splice(strat, count, updateData[0], updateData[1]);
+        }
+        else if (updateData.length === 3) {
+          rtn._listData.splice(strat, count, updateData[0], updateData[1], updateData[2]);
+        }
+        else if (updateData.length === 4) {
+          rtn._listData.splice(strat, count, updateData[0], updateData[1], updateData[2], updateData[3]);
+        }
+        else if (updateData.length === 5) {
+          rtn._listData.splice(strat, count, updateData[0], updateData[1], updateData[2], updateData[3], updateData[4]);
+        }
+        else if (updateData.length === 6) {
+          rtn._listData.splice(strat, count, updateData[0], updateData[1], updateData[2], updateData[3], updateData[4], updateData[5]);
         }
         rtn.setHiddenRow();
       },
@@ -494,39 +504,39 @@ const ContactList = function (source,para ,callBack) {
         return c;
       },
       setHiddenRow() {
-        if (rtn.rowHiddenColumns.length===0) {
+        if (rtn.rowHiddenColumns.length === 0) {
           return;
         }
-        let lastKey='';
-        let count=1;
-        let firstIndex=0;
-        rtn.rowHiddenKeyData=[];
+        let lastKey = '';
+        let count = 1;
+        let firstIndex = 0;
+        rtn.rowHiddenKeyData = [];
         for (let i = 0; i < rtn.listData.length; i++) {
-          if(!rtn.rowHiddenKeyData.includes(rtn.listData[i][rtn.rowHiddenKey])){
+          if (!rtn.rowHiddenKeyData.includes(rtn.listData[i][rtn.rowHiddenKey])) {
             rtn.rowHiddenKeyData.push(rtn.listData[i][rtn.rowHiddenKey])
           }
-          rtn.listData[i].$rowspan=0;
-          if(lastKey){
-            if(rtn.listData[i][rtn.rowHiddenKey]){
-              if(rtn.listData[i][rtn.rowHiddenKey]===lastKey){
-                rtn.listData[i].rowHiddenColumns=rtn.rowHiddenColumns;
+          rtn.listData[i].$rowspan = 0;
+          if (lastKey) {
+            if (rtn.listData[i][rtn.rowHiddenKey]) {
+              if (rtn.listData[i][rtn.rowHiddenKey] === lastKey) {
+                rtn.listData[i].rowHiddenColumns = rtn.rowHiddenColumns;
                 count++;
-                if(i===rtn.listData.length-1){
-                  rtn.listData[firstIndex].$rowspan=count;
+                if (i === rtn.listData.length - 1) {
+                  rtn.listData[firstIndex].$rowspan = count;
                 }
               }
-              else{
-                rtn.listData[firstIndex].$rowspan=count;
-                lastKey=rtn.listData[i][rtn.rowHiddenKey];
-                count=1;
-                firstIndex=i;
+              else {
+                rtn.listData[firstIndex].$rowspan = count;
+                lastKey = rtn.listData[i][rtn.rowHiddenKey];
+                count = 1;
+                firstIndex = i;
               }
             }
           }
-          else{
-            lastKey=rtn.listData[i][rtn.rowHiddenKey];
-            count=1;
-            firstIndex=i;
+          else {
+            lastKey = rtn.listData[i][rtn.rowHiddenKey];
+            count = 1;
+            firstIndex = i;
           }
         }
       },
@@ -534,7 +544,7 @@ const ContactList = function (source,para ,callBack) {
     return rtn;
   }
   if (typeof source === 'string') {
-    Vue.prototype.$api.postHandler(common.globalUri(), { action: source,para:para}).then(
+    Vue.prototype.$api.postHandler(common.globalUri(), { action: source, para: para }).then(
       function (response) {
         if (response.rtnCode === Enum.ReturnCode.Successful) {
           var rtn = init(response);

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

@@ -469,6 +469,25 @@ const Detail = function (source, para, callBack) {
       get shortcutFollowForm() {
         return data.shortcutFollowForm;
       },
+      getAction(api, submitData, callback) {
+        Vue.prototype.$api.postHandler(common.globalUri(), {
+          action: api,
+          para: submitData
+        })
+          .then(function (response) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {
+              if (typeof callback !== 'undefined') {
+                callback(response.content);
+              }
+            }
+          })
+          .catch((error) => {
+            console.error(error);
+            if (typeof callback !== 'undefined') {
+              callback();
+            }
+          });
+      },
       doAction(response, field) {
         if (response.responseData) {
           response = response.responseData;

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

@@ -349,7 +349,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             rowNum = rowNum !== null ? rowNum : data.listData.currentRowIndex;
 
             //若该行正在编辑，则取编辑状态的。
-            if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
+            if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && rowNum>-1
             && data.listData.currentRow.data.$sourceIndex ===  data.listData.source.rows[rowNum].$sourceIndex && data.listData.currentRow.isSet) {
               if(fiedlId=='deleted' || fiedlId=='flagDeleted'){
                 return data.listData.currentRow.data.deleted || false;
@@ -392,14 +392,18 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             if (data) {
                 if (data.field) {
                   data.field.source[attrName] = value;
-                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, rowNum, fiedlId);
+                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
                 }
 
                 //正在编辑的行
-              if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
+              if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && rowNum>-1
                 && data.listData.currentRow.data.$sourceIndex === data.listData.source.rows[rowNum].$sourceIndex) {
                     let currentField = data.listData.currentRow.data[fiedlId];
                     currentField.source[attrName] = value;
+                    // if (typeof currentField.self.$set === "function") {
+                    //   currentField.self.$set(currentField,attrName,value);
+                    // }
+                    data.listData.currentRow.data[fiedlId].rowKey=Math.random();
                     //校验自己
                     if (currentField.self && currentField.self.validExcute) {
                         currentField.self.validExcute();

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

@@ -168,6 +168,7 @@ const FormList = function (source, master) {
         }
         if (item instanceof Object) {
           item.form = rtn.form;
+          item.rowKey=Math.random();
           row.field.push(item);
         }
       });
@@ -227,6 +228,7 @@ const FormList = function (source, master) {
       let rowData = rtn.initRow(JSON.parse(JSON.stringify(sourceRow)));
       for (let j = 0; j < rowData.field.length; j++) {//遍历每一列
         row[rowData.field[j].id] = rowData.field[j];
+        row[rowData.field[j].id].rowKey=Math.random();
       }
       row.$sourceIndex =  sourceRow.$sourceIndex+"";
       return row;
@@ -257,6 +259,7 @@ const FormList = function (source, master) {
           }
         });
         if (ref) {
+          ref.vmodel.rowKey=Math.random(),
           ref.$forceUpdate();
         }
       }
@@ -328,7 +331,7 @@ const FormList = function (source, master) {
       self.currentRowIndex=index;
       var dialogOption = {
         title: '修改',
-        pane: common.getParentPane(self),
+        pane: common.getParentPane(self.$self),
         content: [{
           component: 'ct-form',
           attrs: {
@@ -336,7 +339,7 @@ const FormList = function (source, master) {
               scripts: source.scripts,
               parameterAction: self.OptApi,
               fields: JSON.parse(JSON.stringify(source.rows[index].columns)),
-              colSpan: 1,
+              colSpan: rtn.pageColumns,
               buttons: [
                 {
                   "key": "test1",
@@ -345,8 +348,8 @@ const FormList = function (source, master) {
                 }
               ]
             },
-            width:'500px',
-            height: '400px'
+            width: rtn.pageWidth+'px',
+            height: rtn.pageHeight+'px'
           },
           on: {
             submit: function (ev) {
@@ -618,7 +621,16 @@ const FormList = function (source, master) {
         return button;
       }
       return null;
-    }
+    },
+    get pageWidth() {
+      return source.pageWidth || 500;
+    },
+    get pageHeight() {
+      return source.pageHeight || 400;
+    },
+    get pageColumns() {
+      return source.pageColumns || 1;
+    },
   };
   return rtn;
 };

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

@@ -38,6 +38,13 @@ const Tags = function (source, moreActionRouter) {
       return source.code1;
     },
     set text(v) {
+     
+      //由于tags存的数据都是json对象 所以如果传进来的数据是string类型则 需要转成对象
+      if(typeof v=="string")
+      {
+        v=JSON.parse(v);
+      }
+
       if (source.code1 !== '') {
         var tempV1 = JSON.parse(source.code1);
         tempV1.forEach((v1) => {
@@ -68,6 +75,7 @@ const Tags = function (source, moreActionRouter) {
       return '';
     },
     get labelValue() {
+     
       if (source.code1) {
         var rtnLabelValue = '';
         JSON.parse(source.code1).forEach((op) => {

package/src/main.js

@@ -13,10 +13,10 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  // baseUrl: "http://10.88.22.69:8080/", 
-  // flagRouterSelf: true,
+  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://10.88.22.40:8080/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'a0c6a2be-f79e-47ea-8490-212d5f4f4ff4',
+        oldToken: '012d6b6a-db4b-47b1-b4ee-fea22af4f4fb',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE2OGI1YThjLThiZTUtNDQyZi04NTA4LWMyODY4N2NkYmEzMSJ9.Rk26QdZSUzDVdjdRxGxDApOt5W6KYjmyjmsXpWeZb5E5NwZjpXnHYwhYkKjNxIeyg--OV2UrzFa2SxGzZ-Wneg',