centaline-data-driven 1.2.71 → 1.2.74

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

@@ -33,150 +33,155 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       set source(v) {
         source = v;
       },
+      get cellLayout() {
+        return source.content.cellLayout;
+      },
       _columns: [],
       get columns() {
         var self = this;
-        if (self._columns.length > 0) {
-          return self._columns;
-        }
-        else {
-          var lockLeft = true;
+        if (typeof source.content.columns !== 'undefined') {
+          if (self._columns.length > 0) {
+            return self._columns;
+          }
+          else {
+            var lockLeft = true;
 
-          self.isMergeTitle = source.content.columns.some(v => {
-            return v.trOrder === 2;
-          });
+            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;
-                }
-                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: {
+            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() {
-                  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'
+                  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;
+                  }
+                  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;//水平位置
+                    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 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;
                   }
-                  return 'center';
                 },
-                get valign() {//垂直位置 TODO
-                  return v.valign || 'center';
+                get flagHtml() {
+                  return v.flagHtml;
                 },
-                get title() {
-                  return v.columnToolTip;
-                }
-              },              
-              get flagHtml() {
-                return v.flagHtml;
-              },
-            };
-            if (col.show) {
-              //合并表头时暂不支持固定列
-              if (col.lock && !self.isMergeTitle) {
-                if (lockLeft) {
-                  col.fixed = 'left';
+              };
+              if (col.show) {
+                //合并表头时暂不支持固定列
+                if (col.lock && !self.isMergeTitle) {
+                  if (lockLeft) {
+                    col.fixed = 'left';
+                  }
+                  else {
+                    col.fixed = 'right';
+                  }
                 }
                 else {
-                  col.fixed = 'right';
+                  lockLeft = false;
                 }
               }
-              else {
-                lockLeft = false;
-              }
-            }
-            self._columns.push(col);
-          });
+              self._columns.push(col);
+            });
+          }
         }
         return self._columns;
       },

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

@@ -41,6 +41,7 @@ const loader = {
   Repeat: require("./ctl/Repeat.js").default,
   Compound: require("./ctl/Compound.js").default,
   Contact: require("./ctl/Contact.js").default,
+  CellLayout: require("./ctl/CellLayout.js").default,
 };
 
 export default loader;

package/src/centaline/selectOption/src/selectOptionVertical.vue

@@ -49,6 +49,10 @@
   }
 </script>
 <style>
+.ct-input_inner .el-popover__reference span{
+  margin-left: 0!important;
+}
+
   .ct-selectOptionVertical {
     width: 100%;
     max-height: 250px;
@@ -77,4 +81,8 @@
           -webkit-font-smoothing: antialiased;
           -moz-osx-font-smoothing: grayscale;
         }
+        .ct-selectOptionVertical li div img{
+              vertical-align: -8px;
+        }
 </style>
+

package/src/main.js

@@ -12,9 +12,9 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.13: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.13:7070/v1/form/router",
+  baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  // baseUrl: "http://10.1.245.111:38028/api", 
   // flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
@@ -36,10 +36,10 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '1c37d6b7-9259-4835-88f6-a389900244f7',
+        oldToken: '6613f67c-ba83-4065-9570-175c2f74e6d5',
         originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjgyZjdlZWUzLTY1ODctNDk4NS1hMTE3LTE3ODQxNDUxYzY5MCJ9.d8lc203lFjHqjJ6mboxSD7Eo2nJBYyynY9MtH5L0N3L9fYVedUhhvscnaxw08fITffWLxH4Mc7kP7qvHbJ3I8A',
+        EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI2ZjYwZTBjLWFhYzEtNDgxYy1hYTBkLWMxNjZlNzdjOWZhYyJ9.56V1V4HOhrAdO58i-bg5XG5ZKSSJ-rN1trTEjs0lZCCID0CM8LLBswqrt4_wsbApIdT1QaTA4TtmWmlR3UvxXQ',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作