centaline-data-driven 1.3.18 → 1.3.21

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

@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Enum from './lib/Enum';
 import common from '../../../common';
-const CellLayout = function (source) {
+const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex) {
   var rtn = {
     get fields() {
       return source.fields;
@@ -49,6 +49,18 @@ const CellLayout = function (source) {
       return source.forrowindex;
     },
     get rightRouter() {
+      if (forname) {
+        var forrightRouter = false;
+        let field = actionRouter.find(b => {
+          return b.id === source.routerKey;
+        });
+        if (typeof field !== "undefined") {
+          if (!field.rightField || rowdata[forname][forrowindex][field.rightField] == 1) {
+            forrightRouter=true;
+          }
+        }
+        return forrightRouter;
+      }
       return source.rightRouter;
     },
     _styleObject: {},

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

@@ -132,7 +132,7 @@ const ContactList = function (source,para ,callBack) {
                 return v.flagSort;
               },
               get sortName() {
-                return v.sortBy;
+                return v.sortBy || v.fieldName;
               },
               get sortAction() {
                 return v.sc;

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

@@ -137,7 +137,7 @@ const ContactList = function (source,para ,callBack) {
                 return v.flagSort;
               },
               get sortName() {
-                return v.sortBy;
+                return v.sortBy || v.fieldName;
               },
               get sortAction() {
                 return v.sc;

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

@@ -65,9 +65,15 @@ const Detail = function (source, para, callBack) {
       get fields1() {
         return data.fields1;
       },
+      set fields1(v) {
+        data.fields1=v;
+      },
       get fields2() {
         return data.fields2;
       },
+      set fields2(v) {
+        data.fields2=v;
+      },
       get labels() {
         return data.labels;
       },
@@ -245,6 +251,9 @@ const Detail = function (source, para, callBack) {
       get tags1() {
         return data.tags1;
       },
+      set tags1(v) {
+        data.tags1 = v;
+      },
       get searchConditionApiTags1() {
         if (rtn._searchConditionApiTags1 !== null) {
           return rtn._searchConditionApiTags1;
@@ -440,6 +449,19 @@ const Detail = function (source, para, callBack) {
         }
         return rtn;
       },
+      loadBaseInfo(){
+        Vue.prototype.$api.postHandler(common.globalUri(), { action: source, para: para }).then(
+          function (response) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {
+              rtn._fields1Dic=null;
+              rtn._fields2Dic=null;
+              rtn.fields1=response.content.fields1;
+              rtn.fields2=response.content.fields2;
+              rtn.$vue.loadFields();
+            }
+          }
+        );
+      },
     };
     return rtn;
   }

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

@@ -98,7 +98,7 @@ const Router = function (source) {
     get isSearchPageWithList() {
       return source.pageStyle === Enum.PageStyle.SearchPageWithList;
     },
-    get isUrlInLayer(){
+    get isUrlInLayer() {
       return source.pageStyle === Enum.PageStyle.UrlInLayer;
     },
     get isOpenUrlInBrowse() {
@@ -110,6 +110,9 @@ const Router = function (source) {
     get isSeeVoice() {
       return source.actionType === Enum.ActionType.SeeVoice;
     },
+    get isBrowseAttachment() {
+      return source.actionType === Enum.ActionType.BrowseAttachment;
+    },
     //打开页面（1Form,2SearchList（弹在tab）,3Tab,4执行客户端脚本,5SearchList(弹出)）
     get navToNewPage() {
       return source.navToNewPage;
@@ -136,7 +139,7 @@ const Router = function (source) {
       let pageName = "";
       if (source.pageStyle === Enum.PageStyle.FormPageInLayer)
         pageName = 'ct-form';
-      else if(source.pageStyle === Enum.PageStyle.SearchPageInLayer)
+      else if (source.pageStyle === Enum.PageStyle.SearchPageInLayer)
         pageName = 'ct-searchlist';
       //todo
       return pageName;
@@ -164,8 +167,8 @@ const Router = function (source) {
       return common.initialsToLowerCase(source.rightField);
     },
     get submitFormField() {
-     
-      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null|| source.refFieldName.trim() === '') {
+
+      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null || source.refFieldName.trim() === '') {
         return [];
       }
       var submitArr = [];
@@ -175,7 +178,7 @@ const Router = function (source) {
       return submitArr;
     },
     get submitListField() {
-      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null|| source.refFieldName.trim() === '') {
+      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null || source.refFieldName.trim() === '') {
         return [];
       }
       var submitArr = [];
@@ -202,14 +205,14 @@ const Router = function (source) {
       return source.flagFreshCurrentRow;
     },
     set flagFreshCurrentRow(v) {
-      source.flagFreshCurrentRow=v;
+      source.flagFreshCurrentRow = v;
     },
     //路由操作完成后是根据返回ID读取数据新增行
     get flagAddRowAfterAction() {
       return source.flagAddRowAfterAction;
     },
     set flagAddRowAfterAction(v) {
-      source.flagAddRowAfterAction=v;
+      source.flagAddRowAfterAction = v;
     },
     get textColor() {
       return source.textColor || '';
@@ -221,13 +224,12 @@ const Router = function (source) {
       return source.borderColor ? source.borderColor : (source.bgColor || '');
     },
     attrs: {
-      set class(v)
-      {
-        source.className=v
+      set class(v) {
+        source.className = v
       },
       get class() {
         var size = this.size ? this.size : "mini";
-        source.className=source.className||'ct-font-size-' + size;
+        source.className = source.className || 'ct-font-size-' + size;
         return source.className;
       }
     },
@@ -245,12 +247,11 @@ const Router = function (source) {
             jsonData: data
           }
         };
-      }
-      else {
+      } else {
         data.actionType = rtn.actionType;
         data = Object.assign(data, rtn.queryPara);
-        if(rtn.isDropdown && rtn.selectOptionCode){
-          data[rtn.paramName]=rtn.selectOptionCode;
+        if (rtn.isDropdown && rtn.selectOptionCode) {
+          data[rtn.paramName] = rtn.selectOptionCode;
         }
         params = {
           action: rtn.action,
@@ -259,20 +260,23 @@ const Router = function (source) {
       }
       return params;
     },
-    doAction(data, callback,scripts) {
+    doAction(data, callback, scripts) {
       if (rtn.action) {
-        Vue.prototype.$api.postHandler(common.globalUri(), rtn.getActionPara(data),scripts).then((response) => {
+        Vue.prototype.$api.postHandler(common.globalUri(), rtn.getActionPara(data), scripts).then((response) => {
           callback(response);
         }).catch((ex) => {
-          callback(ex);//里面需要有data.rtnCode === 200的处理
+          callback(ex); //里面需要有data.rtnCode === 200的处理
+        });
+      } else {
+        callback({
+          rtnCode: Enum.ReturnCode.Successful
         });
-      }
-      else {
-        callback({ rtnCode: Enum.ReturnCode.Successful });
       }
     },
     getSearchPara() {
-      let params = { fields: [] };
+      let params = {
+        fields: []
+      };
       if (source.queryString) {
         var arr = source.queryString.split("&");
         for (var i = 0; i < arr.length; i++) {
@@ -293,14 +297,15 @@ const Router = function (source) {
         Vue.prototype.$api.postHandler(common.globalUri(), data).then((response) => {
           callback(response);
         }).catch((ex) => {
-          callback(ex);//里面需要有data.rtnCode === 200的处理
+          callback(ex); //里面需要有data.rtnCode === 200的处理
+        });
+      } else {
+        callback({
+          rtnCode: Enum.ReturnCode.Successful
         });
-      }
-      else {
-        callback({ rtnCode: Enum.ReturnCode.Successful });
       }
     },
-    selectOptionCode:'',
+    selectOptionCode: '',
     _elementOptions: [],
     get elementOptions() {
       return this._elementOptions;
@@ -333,15 +338,14 @@ const Router = function (source) {
     },
     get flagVerifyData() {
       //提交表单时是否校验数据
-      if(source.flagVerifyData!=undefined){
+      if (source.flagVerifyData != undefined) {
         return source.flagVerifyData;
-      }
-      else{
+      } else {
         return true;
       }
     },
     get buttonHeight() {
-      return source.buttonHeight||24;
+      return source.buttonHeight || 24;
     },
   };
   return rtn;

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

@@ -67,7 +67,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   return v.flagSort;
                 },
                 get sortName() {
-                  return v.sortBy;
+                  return v.sortBy || v.fieldName;
                 },
                 get sortAction() {
                   return v.sc;