centaline-data-driven 1.3.24 → 1.3.25

package/package.json

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

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

@@ -166,7 +166,9 @@ const Base = function (source) {
       return bind;
     },
     reset() {
-      if(this.type!==Enum.ControlType.Hidden){
+      if(this.type!==Enum.ControlType.Hidden 
+        && this.type!==Enum.ControlType.Label 
+        && this.type!==Enum.ControlType.MultiLineLabel){
         this.value = this.defaultValue;
       }
     },

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

@@ -4,7 +4,7 @@ const Enum = {
   //组件类型
   ControlType: {
     /// <summary>
-    /// 文本标签
+    /// 单行文本标签
     /// </summary>
     Label: 1,
 
@@ -24,7 +24,7 @@ const Enum = {
     NumericTextBox: 4,
 
     /// <summary>
-    /// 
+    /// 文本框+高级搜索
     /// </summary>
     TextBoxWithButton: 5,
 
@@ -38,7 +38,6 @@ const Enum = {
     /// </summary>
     EmailText: 7,
 
-
     /// <summary>
     /// 下拉框
     /// </summary>
@@ -144,7 +143,6 @@ const Enum = {
     /// </summary>
     MultiSelectNoSearch: 28,
 
-
     /// <summary>
     /// 分组间的分隔线
     /// </summary>
@@ -209,32 +207,44 @@ const Enum = {
     /// 敏感数据小眼睛控件
     /// </summary>
     SensitiveEye: 41,
+
     /// <summary>
     /// 复选
     /// </summary>
     CheckBox: 43,
+
     /*带标签的超链接列表*/
     HyperlinkListWithLabel: 44,
+
     /// <summary>
     /// 图片选择
     /// </summary>
     PhotoSelect: 45,
+
     /// <summary>
     /// 年份-月份控件
     /// </summary>
     DateYearMonth: 46,
+
     /// <summary>
     /// 重复控件
     /// </summary>
     Repeat: 47,
+
     /// <summary>
     /// 复合控件
     /// </summary>
     Compound: 48,
+
     /// <summary>
     /// 表单
     /// </summary>
     From: 49,
+    /// <summary>
+    ///  列表的的自定义列
+    /// </summary>
+    CustomizeColumns: 50,
+
   },
 
   //返回状态码

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

@@ -35,10 +35,12 @@ import PhotoSelect from '../PhotoSelect';
 import Repeat from '../Repeat';
 import Compound from '../Compound';
 import RichText from '../RichText';
+import DragSort from '../DragSort';
+
+
 
 const LibFunction = {
-  install(Vue) {
-  },
+  install(Vue) {},
   GetControl(field, source, showLabel, isList) {
 
     let item;
@@ -62,32 +64,25 @@ const LibFunction = {
     if (isList) {
       if (field.controlType === Enum.ControlType.Date) {
         field.width = field.width || 250;
-      }
-      else if (field.controlType === Enum.ControlType.DateTime) {
+      } else if (field.controlType === Enum.ControlType.DateTime) {
         field.width = field.width || 280;
-      }
-      else if (field.controlType === Enum.ControlType.DateRange) {
+      } else if (field.controlType === Enum.ControlType.DateRange) {
         field.width = field.width || 300;
-      }
-      else if (field.controlType === Enum.ControlType.DateTimeRange) {
+      } else if (field.controlType === Enum.ControlType.DateTimeRange) {
         field.width = field.width || 350;
-      }
-      else if (field.controlType === Enum.ControlType.ButtonSearch ||
+      } else if (field.controlType === Enum.ControlType.ButtonSearch ||
         field.controlType === Enum.ControlType.ButtonReset ||
         field.controlType === Enum.ControlType.ButtonAdvancedSearch) {
         field.width = '';
-      }
-      else if (field.controlType === Enum.ControlType.NumericRange) {
+      } else if (field.controlType === Enum.ControlType.NumericRange) {
         field.width = field.width || 280;
-      }
-      else if (field.controlType === Enum.ControlType.RadioButton) {
+      } else if (field.controlType === Enum.ControlType.RadioButton) {
         if (!field.displayLabelAfterSelected) {
           showLabel = false;
         }
         field.width = field.width || 300;
         field.placeholder1 = field.placeholder1 || field.controlLabel || '';
-      }
-      else {
+      } else {
         showLabel = false;
         field.width = field.width || 200;
         field.placeholder1 = field.placeholder1 || field.controlLabel || '';
@@ -96,24 +91,24 @@ const LibFunction = {
 
     let moreActionRouter;
     switch (field.controlType) {
-      case Enum.ControlType.Photo://图片
-      case Enum.ControlType.TextBoxWithButton://带按钮的文本框
-      case Enum.ControlType.EmailText://电子邮件编辑框
-      case Enum.ControlType.Time://时间控件
+      case Enum.ControlType.Photo: //图片
+      case Enum.ControlType.TextBoxWithButton: //带按钮的文本框
+      case Enum.ControlType.EmailText: //电子邮件编辑框
+      case Enum.ControlType.Time: //时间控件
         item = L(field);
         item.is = 'ct-labelText';
         item.value = "暂不支持该组件";
         break;
-      case Enum.ControlType.PhoneNumberText://电话号码编辑框
+      case Enum.ControlType.PhoneNumberText: //电话号码编辑框
         moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
         item = SosTt(field, moreActionRouter);
         item.is = 'ct-sosTt';
         break;
-      case Enum.ControlType.GroupSplitLine://分割线
+      case Enum.ControlType.GroupSplitLine: //分割线
         item = Gp(field);
         item.is = 'ct-group-line';
         break;
-      case Enum.ControlType.SearchListBox://搜索下拉框
+      case Enum.ControlType.SearchListBox: //搜索下拉框
         moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
         item = Sos(field, moreActionRouter);
         item.is = 'ct-sos';
@@ -122,80 +117,85 @@ const LibFunction = {
       //  item = Ttts(field);
       //  item.is = 'ct-iti';
       //  break;
-      case Enum.ControlType.NumericRange:
+      case Enum.ControlType.NumericRange://数字区间
+
         item = Iti(field);
         item.is = 'ct-iti';
         break;
-      case Enum.ControlType.ComboBox://下拉框
+      case Enum.ControlType.ComboBox: //下拉框
         moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
         item = So(field, moreActionRouter);
         item.is = 'ct-so';
         break;
-      case Enum.ControlType.TextBox://单行文本框
+      case Enum.ControlType.TextBox: //单行文本框
         item = T(field, "text");
         item.is = 'ct-text';
         break;
-      case Enum.ControlType.MultiLineText://多行文本框
+      case Enum.ControlType.MultiLineText: //多行文本框
         item = T(field, "textarea");
         item.is = 'ct-text';
         break;
-      case Enum.ControlType.MultiLineLabel://多行文本框（Label,不可编辑）
+      case Enum.ControlType.MultiLineLabel: //多行文本框（Label,不可编辑）
         item = T(field, "textarea", true);
         item.is = 'ct-text';
         break;
-      case Enum.ControlType.MultiSelectWithSearch://带搜索多选
+      case Enum.ControlType.MultiSelectWithSearch: //带搜索多选
         moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
         item = Tags(field, moreActionRouter);
         item = base.copy(item, {
-          attrs: { collapseTags: true }
+          attrs: {
+            collapseTags: true
+          }
         });
         item.is = 'ct-tags';
         break;
-      case Enum.ControlType.MultiSelectNoSearch://不带搜索多选
+      case Enum.ControlType.MultiSelectNoSearch: //不带搜索多选
         moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
         item = Mo(field, moreActionRouter);
         item = base.copy(item, {
-          attrs: { collapseTags: true }
+          attrs: {
+            collapseTags: true
+          }
         });
         item.is = 'ct-mo';
         break;
-      case Enum.ControlType.RadioButton://单选
+      case Enum.ControlType.RadioButton: //单选
         item = Seg(field);
         item.is = 'ct-seg';
         break;
-      case Enum.ControlType.Switch://开关
+      case Enum.ControlType.Switch: //开关
         item = Sw(field);
         item.is = 'ct-sw';
         break;
-      case Enum.ControlType.TimeRange://时间区间
+      case Enum.ControlType.TimeRange: //时间区间
         item = TimeSelect(field, true, 'time');
         item.is = 'ct-time-select';
         break;
-      case Enum.ControlType.Date://日期
+      case Enum.ControlType.Date: //日期
         item = D(field, 'date');
         item.is = 'ct-date';
         break;
-      case Enum.ControlType.DateYearMonth://年份-月份
+      case Enum.ControlType.DateYearMonth: //年份-月份
         item = D(field, 'month');
         item.is = 'ct-date';
         break;
-      case Enum.ControlType.DateTime://日期时间
+      case Enum.ControlType.DateTime: //日期时间
         item = D(field, 'datetime');
         item.is = 'ct-date';
         break;
-      case Enum.ControlType.DateRange://日期区间
+      case Enum.ControlType.DateRange: //日期区间
         item = Dtd(field);
         item.is = 'ct-dtd';
         break;
-      case Enum.ControlType.DateTimeRange://日期时间区间
+      case Enum.ControlType.DateTimeRange: //日期时间区间
         item = Dtd(field, 'datetime');
         item.is = 'ct-dtd';
         break;
-      //case 'mt':
-      //  item = Mt(field);
-      //  item.is = 'ct-mt';
-      //  break;
-      case Enum.ControlType.List://列表
+        //case 'mt':
+        //  item = Mt(field);
+        //  item.is = 'ct-mt';
+        //  break;
+      case Enum.ControlType.List: //列表
         var listobj = source.list.find((v1) => {
           return v1.name === field.fieldName1;
         });
@@ -209,7 +209,7 @@ const LibFunction = {
         //item.is = 'ct-form-list';
         item.is = 'ct-form-list-table';
         break;
-      case Enum.ControlType.Repeat://重复
+      case Enum.ControlType.Repeat: //重复
         var listobj = source.list.find((v1) => {
           return v1.name === field.fieldName1;
         });
@@ -220,53 +220,53 @@ const LibFunction = {
         item = Repeat(listobj, field);
         item.is = 'ct-repeat';
         break;
-      case Enum.ControlType.Compound://复合
-        item = Compound(field,source);
+      case Enum.ControlType.Compound: //复合
+        item = Compound(field, source);
         item.is = 'ct-compound';
         break;
-      case Enum.ControlType.Hidden://隐藏控件
+      case Enum.ControlType.Hidden: //隐藏控件
         item = Hd(field);
         break;
-      case Enum.ControlType.Group://分组
+      case Enum.ControlType.Group: //分组
         item = GM(field);
         item.is = 'ct-group';
         break;
-      case Enum.ControlType.IndependentGroup://独立分组 最后的分组
+      case Enum.ControlType.IndependentGroup: //独立分组 最后的分组
         item = GM(field);
         item.is = 'ct-independentGroup';
         break;
-      case Enum.ControlType.Label://文本
+      case Enum.ControlType.Label://单行文本标签
         item = L(field);
         item.is = 'ct-labelText';
         break;
-      case Enum.ControlType.CheckBoxList://复选列表
+      case Enum.ControlType.CheckBoxList: //复选列表
         item = Checkbox(field);
         item.is = 'ct-checkbox';
         break;
-      case Enum.ControlType.NumericTextBox://数字文本框
+      case Enum.ControlType.NumericTextBox: //数字文本框
         item = InputNumber(field);
         item.is = 'ct-inputNumber';
         break;
-      case Enum.ControlType.ButtonCommon://普通按钮
+      case Enum.ControlType.ButtonCommon: //普通按钮
         moreActionRouter = LibFunction.getRouter(source.actionRouters, field.fieldName1);
         item = Button(field, moreActionRouter);
         item.is = 'ct-btn';
         // item.attrs.class=item.attrs.class+' max-btn-gray ';
         break;
-      case Enum.ControlType.ButtonSearch://查询按钮
+      case Enum.ControlType.ButtonSearch: //查询按钮
         item = Button(field);
         item.is = 'ct-btn';
         item.action = 'search';
         item.attrs.class = item.attrs.class + ' max-search-btn ';
         break;
-      case Enum.ControlType.ButtonAdvancedSearch://高级查询按钮
+      case Enum.ControlType.ButtonAdvancedSearch: //高级查询按钮
         item = Button(field);
         item.is = 'ct-btn';
         item.action = 'showHigh';
         item.attrs.class = item.attrs.class + ' max-search-btn ';
         item.icon = 'max-open';
         break;
-      case Enum.ControlType.ButtonReset://重置查询按钮
+      case Enum.ControlType.ButtonReset: //重置查询按钮
         item = Button(field);
         item.is = 'ct-btn';
         item.action = 'reset';
@@ -274,7 +274,7 @@ const LibFunction = {
         item.borderColor = '#519DA6';
         item.attrs.class = item.attrs.class + ' max-reset-btn ';
         break;
-      case Enum.ControlType.File://文件
+      case Enum.ControlType.File: //文件
         var router = source.actionRouters.find((v1) => {
           return v1.key === field.fieldName1;
         });
@@ -284,15 +284,14 @@ const LibFunction = {
             if (v.GroupID == field.fieldName1) {
               files.push(v);
             }
-          }
-          else {
+          } else {
             files.push(v);
           }
         })
         item = File(field, files, router, source.parameterAction);
         item.is = 'ct-file';
         break;
-      case Enum.ControlType.PhotoSelect://图片选择
+      case Enum.ControlType.PhotoSelect: //图片选择
         var router = source.actionRouters.find((v1) => {
           return v1.key === field.fieldName1;
         });
@@ -302,21 +301,20 @@ const LibFunction = {
             if (v.GroupID == field.fieldName1) {
               files.push(v);
             }
-          }
-          else {
+          } else {
             files.push(v);
           }
         })
         item = PhotoSelect(field, files, router, source.parameterAction);
         item.is = 'ct-photoselect';
         break;
-      case Enum.ControlType.PasswordTextBox://密码
+      case Enum.ControlType.PasswordTextBox: //密码
         item = T(field, "text", false, true);
         item.is = 'ct-text';
         break;
-      case Enum.ControlType.RichText://富文本框
-        var router ={};
-        if(source.actionRouters){
+      case Enum.ControlType.RichText: //富文本框
+        var router = {};
+        if (source.actionRouters) {
           router = source.actionRouters.find((v1) => {
             return v1.key === field.fieldName1;
           });
@@ -324,11 +322,11 @@ const LibFunction = {
         item = RichText(field, router);
         item.is = 'ct-rich-text';
         break;
-      case Enum.ControlType.MultiComboBoxWithTextBox://多个下拉框后面带1个文本框，下拉框最多支持3个
+      case Enum.ControlType.MultiComboBoxWithTextBox: //多个下拉框后面带1个文本框，下拉框最多支持3个
         item = ComboBoxWithTextBox(field);
         item.is = 'ct-combobox-with-textbox';
         break;
-      case Enum.ControlType.SearchPage://搜索列表页面
+      case Enum.ControlType.SearchPage: //搜索列表页面
         item = {};
         item.is = 'ct-searchlist';
         item.bindPara = {
@@ -338,31 +336,35 @@ const LibFunction = {
           apiParam: field.code3 ? JSON.parse(field.code3) : {}
         };
         break;
-      case Enum.ControlType.LineFeed://分组
+      case Enum.ControlType.LineFeed: //分组
         item = Base(field);
         item.is = 'ct-linefeed';
         break;
-      case Enum.ControlType.HyperLinkWithLabel://带标签的超链接
+      case Enum.ControlType.HyperLinkWithLabel: //带标签的超链接
         moreActionRouter = LibFunction.getRouter(source.actionRouters, field.fieldName1);
         item = HyperLink(field, moreActionRouter);
         item.is = 'ct-hyperLink';
         break;
-      case Enum.ControlType.HyperlinkListWithLabel://带标签的超链接列表
+      case Enum.ControlType.HyperlinkListWithLabel: //带标签的超链接列表
         item = HyperLinkList(field);
         item.is = 'ct-hyperLinkList';
         break;
-      case Enum.ControlType.PlaceHolder://占位控件
+      case Enum.ControlType.PlaceHolder: //占位控件
         item = PlaceHolder(field);
         item.is = 'ct-ph';
         break;
-      case Enum.ControlType.SensitiveEye://敏感数据小眼睛控
+      case Enum.ControlType.SensitiveEye: //敏感数据小眼睛控
         item = SensitiveEye(field);
         item.is = 'ct-sensitiveeye';
         break;
-      case Enum.ControlType.CheckBox://复选框
+      case Enum.ControlType.CheckBox: //复选框
         item = Cb(field);
         item.is = 'ct-cb';
         break;
+      case Enum.ControlType.CustomizeColumns: //拖拽排序
+        item = DragSort(field);
+        item.is = 'ct-dragSort';
+        break;
       default:
         item = L(field);
         item.is = 'ct-labelText';
@@ -377,11 +379,9 @@ const LibFunction = {
           var colNum = source.colSpan ? source.colSpan : 3;
           if (item1.excLine) {
             num = 24;
-          }
-          else if (field.spanCols > 0) {
+          } else if (field.spanCols > 0) {
             num = field.spanCols * (24 / colNum);
-          }
-          else {
+          } else {
             num = 24 / colNum;
           }
           return num;
@@ -399,9 +399,9 @@ const LibFunction = {
           //size: 'mini'
         },
         get excLine() {
-          return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine
-            || field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File
-            || field.controlType === Enum.ControlType.SearchPage;
+          return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine ||
+            field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File ||
+            field.controlType === Enum.ControlType.SearchPage;
         },
         showLabel: showLabel
       };
@@ -425,4 +425,3 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(LibFunction);
 }
 export default LibFunction;
-