centaline-data-driven 1.5.23 → 1.5.25

package/src/centaline/dynamicTimeSelect/src/dynamicTimeSelect.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="field-top">
-    <div style="width:100%" v-if="model !== null" class="ct-Dtd" :class="[model.attrs.size?'ct-Dtd-'+model.attrs.size:'']">
+    <div style="width:100%;display: flex;" v-if="model !== null" class="ct-Dtd" :class="[model.attrs.size?'ct-Dtd-'+model.attrs.size:'']" >
       <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']" style="flex:1">
-        <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
           {{model.label}}
         </div>
         <div class="ct-datepicker" style="width:100%" v-if="model !== null&&model.valueFormat=='HH:mm'" :class="[model.showLabel?'showLabel':'']">
@@ -10,11 +10,11 @@
                           v-bind="model.attrs"
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
-                          :placeholder="model.placeholder"
+                          :placeholder="model.attrs.placeholder1"
                           :disabled="model.lock"
                           :picker-options="{
                             start:  model.min,
-                              step: model.step,
+                            step: model.step,
                             end:  model.max
                            }">
           </el-time-select>
@@ -23,7 +23,7 @@
                           v-bind="model.attrs"
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
-                          :placeholder="model.placeholder1"
+                          :placeholder="model.attrs.placeholder2"
                           :disabled="model.lock"
                           :picker-options="{
                             start: model.min,
@@ -36,21 +36,21 @@
         <div class="ct-datepicker" style="width:100%" v-else-if="model !== null" :class="[model.showLabel?'showLabel':'']">
           <el-time-picker class="ct-date-picker-editor" v-model="model.value"
                           v-bind="model.attrs" value-format="HH:mm:ss"
-                          :placeholder="model.placeholder" :disabled="model.lock"
+                          :placeholder="model.attrs.placeholder1" :disabled="model.lock"
                           @change="changeModel($event)" @clear="changeModel($event)"      
                            >
           </el-time-picker>
           <span v-if="model.isRange" class="ct-date-picker-span">-</span>
           <el-time-picker v-if="model.isRange" class="ct-date-picker-editor" v-model="model.value1"
                           v-bind="model.attrs" value-format="HH:mm:ss"                          
-                          :placeholder="model.placeholder1" :disabled="model.lock"
+                          :placeholder="model.attrs.placeholder2" :disabled="model.lock"
                           @change="changeModel($event)" @clear="changeModel($event)"    
                           >
           </el-time-picker>
         </div>
       </div>
       <transition name="el-fade-in">
-        <span v-show="!valid" class="errorMessage">
+        <span v-show="!valid"  class="errorMessage">
           {{validMessage}}
         </span>
       </transition>
@@ -69,7 +69,7 @@
     },
     data() {
       return {
-
+        validMessage:""
       };
     },
     mounted() {
@@ -107,6 +107,17 @@
         this.inputHandler(event);
         this.changeHandler(event);
       },
+      //不能共用的数据校验   单独每一个时间框的非空校验
+      selfValidExcute: function (eventName) {
+        if (eventName === "input"||eventName === "valid") {
+          if (this.model.value1 == "" || this.model.value== ""|| this.model.value== null || this.model.value1== null) {
+            this.valid = false;
+            this.validMessage = "必填"
+            return false;
+          }
+        }
+        return true;
+      }, 
     }
   }
 </script>

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -301,7 +301,7 @@ export default {
                     attrs: {
                       searchConditionApi: field.actionForSearchLayout,
                       searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
+                      apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                     },
@@ -330,7 +330,7 @@ export default {
                     attrs: {
                       searchConditionApi: field.actionForSearchLayout,
                       searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
+                      apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                     },

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

@@ -48,20 +48,18 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         rtn._fieldsDic = {};
         if (rtn.fields) {
           rtn.fields.forEach((f) => {
-            if (f.type == Enum.ControlType.Compound) {
+            if (f.type == Enum.ControlType.Compound || f.type == Enum.ControlType.ContainerControl) {
               if (f.fields) {
                 f.fields.forEach((v) => {
                   rtn._fieldsDic[v.id] = v;
                 });
               }
             }
-            // else if (f.type == Enum.ControlType.ContainerControl) {
-            //   if (f.compoundFields) {
-            //     f.compoundFields.forEach((v) => {
-            //       rtn._fieldsDic[v.id] = v;
-            //     });
-            //   }
-            // }
+            rtn._fieldsDic[f.id] = f;
+          });
+        }
+        if(rtn.buttons){
+          rtn.buttons.forEach((f) => {            
             rtn._fieldsDic[f.id] = f;
           });
         }
@@ -212,11 +210,14 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //获取Field的属性attrKey的值
         getValueByFieldName(id, attrKey) {
-            attrKey = this.common.initialsToLowerCase(attrKey);
-            var rtn1 = this.fieldsDic[id];
-            if (rtn1) {
-                return rtn1.source[attrKey];
+          attrKey = this.common.initialsToLowerCase(attrKey);
+          var rtn1 = this.fieldsDic[id];
+          if (rtn1) {
+            if(rtn1.is && rtn1.is=='ct-btn'){
+              return rtn1[attrKey];
             }
+            return rtn1.source[attrKey];
+          }
         },
         getValueByFieldNameFromParent(id, attrKey) {
           if(this.form && this.form.self && this.form.self.$parent){
@@ -227,22 +228,22 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         //设置Field的属性attrKey的值
         setValueByFieldName(id, attrKey, attrValue) {
           attrKey = this.common.initialsToLowerCase(attrKey);
-            var rtn1 = this.fieldsDic[id];
-            if (rtn1) {
-              if(attrKey=='code1' && rtn1.source.controlType===4 
-              && attrValue!=undefined && attrValue!=null && attrValue!=''){
-                if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null && rtn1.source.decimals1>-1){
-                  attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
-                }
+          var rtn1 = this.fieldsDic[id];
+          if (rtn1) {
+            if(attrKey=='code1' && rtn1.source.controlType===4 
+            && attrValue!=undefined && attrValue!=null && attrValue!=''){
+              if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null && rtn1.source.decimals1>-1){
+                attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
               }
-              rtn1.source[attrKey] = attrValue;
-              this.form.hatchHandle(id, attrKey, attrValue, rtn1);
+            }
+            rtn1.source[attrKey] = attrValue;
+            this.form.hatchHandle(id, attrKey, attrValue, rtn1);
 
-              //用于处理源数据改动,强制更新视图数据 todo
-              if (rtn1.self.$forceUpdate) {
-                  rtn1.self.$forceUpdate();
-              }
+            //用于处理源数据改动,强制更新视图数据 todo
+            if (rtn1.self.$forceUpdate) {
+                rtn1.self.$forceUpdate();
             }
+          }
         },
         setValueByFieldNameFromParent(id, attrKey, attrValue) {
           if(this.form && this.form.self && this.form.self.$parent){
@@ -494,7 +495,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             }
             );
         },
-        //消息提示 type主题:success/warning/info/error。 duration 显示时间, 毫秒。设为 0 则不会自动关闭。 showClose 是否显示关闭按钮。
+        //消息提示 type主题:success/warning/info/error。 center是否居中true/flase。  duration 显示时间, 毫秒。设为 0 则不会自动关闭。 
+        //showClose 是否显示关闭按钮。dangerouslyUseHtmlString 属性设置为 true ,message 就会被当做 HTML 片段处理。
         message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
           if (typeof center === 'undefined') {
             center = true;

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

@@ -126,14 +126,14 @@ const Mo = function (source, moreActionRouter) {
     },
     get defaultValue() {
       var rtnArr = [];
-      if (this.defaultText !== '') {
+      if (this.defaultText) {
         [].concat(JSON.parse(this.defaultText)).forEach((v) => {
           rtnArr.push(v[this.optionAttrs.value]);
         });
       }
       return rtnArr;
     },
-    defaultText: source.code1,
+    defaultText: source.defaultCode1||'',
     get clearable() {
       if (typeof source.clear === 'undefined') {
         return true;

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

@@ -4,6 +4,7 @@ import Enum from './lib/Enum';
 const Router = function (source) {
   var rtn = {
     disabled: source.selectedMode && source.selectedMode === Enum.ListSelectMode.Multiple ? true : false,
+    code1:'',
     get id() {
       return source.key;
     },
@@ -32,6 +33,7 @@ const Router = function (source) {
     get onClick() {
       return source.onChanged;
     },
+
     get isSubmit() {
       return source.buttonType === Enum.ButtonType.Submit;
     },
@@ -41,6 +43,10 @@ const Router = function (source) {
     get isDropdown() {
       return source.buttonType === Enum.ButtonType.Dropdown;
     },
+    get isCheckbox() {
+      return source.buttonType === Enum.ButtonType.Checkbox;
+    },
+
     get alert() {
       return source.flagAlert === true;
     },
@@ -379,10 +385,29 @@ const Router = function (source) {
     },
     get align() {
       return source.align;
+    },    
+    get alignCss() {
+      let css='';
+      if(Enum.HalignType.Right == source.align){
+        css='right';
+      }
+      else if(Enum.HalignType.Left == source.align){
+        css='left';
+      }
+      else if(Enum.HalignType.Center == source.align){
+        css='center';
+      }
+      return css;
     },
     get isRight() {
       return Enum.HalignType.Right == source.align;
     },
+    get isLeft() {
+      return Enum.HalignType.Left == source.align;
+    },
+    get isCenter() {
+      return Enum.HalignType.Center == source.align;
+    },
     get flagAsync() {
       return source.flagAsync;
     },

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

@@ -608,6 +608,12 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         return newSearchModel;
       },
       getCurrentRowApiData(callback, rtnData, router, cellindex) {
+        if(router.flagAddRowAfterAction){
+          if(!rtnData || !rtnData.responseData){
+            return;
+          }
+        }
+
         var self = this;
         var searchFields = {
           fields: []
@@ -896,7 +902,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             break;
 
           case Enum.ActionType.Refersh: //刷新
-            rtn.$vue.getPage(1);
+            rtn.$vue.getPage(1,true);
             break;
 
           case Enum.ActionType.RefreshParent: //刷新父页面

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

@@ -59,7 +59,7 @@ const TimeSelect = function (source, isRange, dateType) {
         var rtnFormObj = {};
         Object.defineProperty(rtnFormObj, source.fieldName1, {
           get: function () {
-            if(source.code1){
+            if(source.code1 && source.format != "HH:mm" && Object.prototype.toString.call(source.code1) === "[object Date]"){
               return common.formatDate(source.code1, rtn.valueFormat);
             }
             return source.code1;
@@ -69,7 +69,7 @@ const TimeSelect = function (source, isRange, dateType) {
         });
         Object.defineProperty(rtnFormObj, source.fieldName2, {
           get: function () {
-            if(source.code2){
+            if(source.code2 && source.format != "HH:mm" && Object.prototype.toString.call(source.code2) === "[object Date]"){
               return common.formatDate(source.code2, rtn.valueFormat);
             }
             return source.code2;
@@ -79,8 +79,23 @@ const TimeSelect = function (source, isRange, dateType) {
         });
         return rtnFormObj;
       },
-      get attrs() {
-        return {}
+      attrs: {
+        style: {
+          width: '100%'
+        },
+        class: 'ct-date-picker-editor',
+        get placeholder1() {
+          return source.placeholder1;
+        },
+        set placeholder1(v) {
+          source.placeholder1 = v;
+        },
+        get placeholder2() {
+          return source.placeholder2;
+        },
+        set placeholder2(v) {
+          source.placeholder2 = v;
+        }
       }
     };
     rtn = base.copy(Base(data), rtn);

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

@@ -524,7 +524,12 @@ const Enum = {
     /// <summary>
     /// 下拉
     /// </summary>
-    Dropdown: 3
+    Dropdown: 3,
+
+    /// <summary>
+    /// Checkbox
+    /// </summary>
+    Checkbox: 4
   },
 
   /// <summary>

package/src/main.js

@@ -53,9 +53,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'c4ca2b41-a50c-4727-9154-a8cf0d4e47cb',
+        oldToken: '11c12506-253c-4995-83fb-84cf51cb23a0',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAQBP_iOif54vP5nC62k4ZHRLbiIlSIJBII8XdAQEfPFFtMM3tT615Up5L0muJoIA6tBUrOQj86gRBFdGidoSCT_wA_5suESN4hD9B7F4GYDAhGgUgcaUyDiSGpRtXLSXXIwoyiW2zUkre3sAb5Jfa1ng_1-o9zx215ZjOLSPYWtKMWqMwZCvsMmXUpc6W5VFT3BwAAAP__.7YpCSX-0-868bPUSiaNCErO_7JxtgS210pSEmnTyaWs"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf_lzbyE1772tWy0hcWPIBQ64GQEEo3x39Wom7tnuMNZzr3BumdoILm25thrjJ0yyEkMtr04DNG5OijRHNzgP-CP-TIQsReyHbZeIrJljY6iw8g2cp86HUOCCsrlBA1ZJ0oZ41UFy7i9BWlPL7Gv5Xwo13-cO27LM2tyzhOPBUdfBFmE0Os8YR7nmayiqc4z3B8AAAD__w.o16g-7JqWN22AE4FlElSYeKTamxgcbezCPVyH2Jhydk"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',