centaline-data-driven 1.3.25 → 1.3.28

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

@@ -180,13 +180,10 @@ const FormList = function (source, master) {
         for (let i = 1; i < rows.length; i++) {//遍历每一行
           if (!rows[i].deleted) {
             row = {};
-            //row['$sourceIndex'] = i;
             Vue.set(row, '$sourceIndex', i);
             for (let j = 0; j < rows[i].field.length; j++) {//遍历每一列
-              //row[field[j].id] = rows[i].field[j];
               Vue.set(row, field[j].id, rows[i].field[j]);
             }
-            //row.isSet = false;
             Vue.set(row, 'isSet', false);
             Vue.set(row, 'edit', rows[i].edit);
             Vue.set(row, 'delete', rows[i].delete);
@@ -372,8 +369,6 @@ const FormList = function (source, master) {
     addSourceRow(row) {
       let sourceRow = JSON.parse(JSON.stringify(source.rows[0]));
       for (let k in sourceRow.columns) {
-        //sourceRow.Row[k] = row.field[k].source;
-        sourceRow.columns[k] = row[sourceRow.columns[k].fieldName1].source;
         sourceRow.columns[k] = row[sourceRow.columns[k].fieldName1].source;
       };
       source.rows.push(sourceRow);
@@ -425,9 +420,7 @@ const FormList = function (source, master) {
                 source.rows.push(row);
                 rtn.rows.push(rowItem);
                 rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
-
-                rowData.$sourceIndex = source.rows.length - 1;
-                
+                rowData.$sourceIndex = source.rows.length - 1;                
                 rowData.edit = rowItem.edit;
                 rowData.delete = rowItem.delete;
                 rowItem.isNewFlag = true;
@@ -473,13 +466,14 @@ const FormList = function (source, master) {
     insertRow(rows) {
       if(rows && rows.length>0){
         rows.forEach((r) => {
-          source.rows.push(r);
-          let iRow = this.initRow(r);
+          let iRow = rtn.initRow(r);
           iRow.isNewFlag = true;
+          source.rows.push(r);
           rtn._rows.push(iRow);
           Vue.set(r, 'edit', iRow.edit);
           Vue.set(r, 'delete', iRow.delete);
           rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
+          r.$sourceIndex = rtn._rows.length - 1;
 
           let rowData = rtn.rowsItemToTableData(iRow)
           rowData.$sourceIndex = rtn._rows.length - 1;      
@@ -492,43 +486,52 @@ const FormList = function (source, master) {
     insertOrUpdateRow(row) {
       if(row){
         if(rtn.primaryKeys && rtn.primaryKeys.length>0){
-          let iRow = this.initRow(row);
+          let iRow = rtn.initRow(row);
           let flagAdd=true;
           rtn.rows.forEach((r,i) => {
-            let countKey=0;
-            rtn.primaryKeys.forEach((k) => {
-              let fieldOld=r.field.find((v) => {
-                return v.id === k;
-              });
-              let fieldNew=iRow.field.find((v) => {
-                return v.id === k;
-              });
-              if(fieldOld.code1===fieldNew.code1){
-                countKey++;
-              }
-            })
-            if(countKey===rtn.primaryKeys.length){
-              flagAdd=false;
-              if(iRow.deleted){
-                rtn.tableData.forEach((d,index) => {
-                  if(d.$sourceIndex===r.$sourceIndex){
-                    rtn.tableData.splice(index, 1);
+            if(i>0){
+              let countKey=0;
+              rtn.primaryKeys.forEach((k) => {
+                let fieldOld=r.field.find((v) => {
+                  return v.id === k;
+                });
+                let fieldNew=iRow.field.find((v) => {
+                  return v.id === k;
+                });
+                if(fieldOld.code1===fieldNew.code1){
+                  countKey++;
+                }
+              })
+              if(countKey===rtn.primaryKeys.length){
+                flagAdd=false;
+                if(iRow.deleted){
+                  rtn.tableData.forEach((d,index) => {
+                    if(d.$sourceIndex===r.$sourceIndex){
+                      rtn.tableData.splice(index, 1);
+                    }
+                  });                
+                  if (r.isNewFlag) {
+                    rtn.rows.splice(i, 1);
+                    source.rows.splice(i, 1);
+                  }
+                  else {
+                    rtn.rows[i].deleted = true;
                   }
-                });                
-                if (r.isNewFlag) {
-                  rtn.rows.splice(i, 1);
-                  source.rows.splice(i, 1);
                 }
-                else {
-                  rtn.rows[i].deleted = true;
+                else{
+                  let rowData = rtn.rowsItemToTableData(iRow)
+                  iRow.$sourceIndex=r.$sourceIndex;
+                  rowData.$sourceIndex=r.$sourceIndex;    
+                  rowData.edit = iRow.edit;
+                  rowData.delete = iRow.delete;
+                  source.rows.splice(i, 1,row);
+                  rtn._rows.splice(i, 1,iRow);
+                  rtn._tableData.splice(i-1, 1,rowData);
                 }
               }
-              else{
-                rtn.rows.splice(i, 1,iRow);
-              }
             }
           });
-          if(flagAdd){         
+          if(flagAdd){
             let rows=[];
             rows.push(row);
             rtn.insertRow(rows)

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

@@ -14,11 +14,10 @@ const QuickInput = function (source, moreActionRouter) {
       return source.name1;
     },
     set text(v) {
-      if(source.displayName1)
-      {
+      if(source.displayName1){
         source.displayName1 = v;
-      }else
-      {
+      }
+      else{
         source.name1 = v;
       }
     },

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

@@ -267,7 +267,8 @@ const Router = function (source) {
         }).catch((ex) => {
           callback(ex); //里面需要有data.rtnCode === 200的处理
         });
-      } else {
+      } 
+      else {
         callback({
           rtnCode: Enum.ReturnCode.Successful
         });
@@ -347,6 +348,9 @@ const Router = function (source) {
     get buttonHeight() {
       return source.buttonHeight || 24;
     },
+    get align() {
+      return source.align;
+    },
   };
   return rtn;
 }

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

@@ -400,10 +400,16 @@ const Enum = {
     ///  在浏览器中打开一个 relationField 执行的URL
     /// </summary>
     OpenUrlInBrowse: 22,
+
     /// <summary>
     /// 浏览附件
     /// </summary>
-    BrowseAttachment: 23
+    BrowseAttachment: 23,
+
+    /// <summary>
+    ///  更新表格的列
+    /// </summary>
+    UpdateColumns: 24,
   },
 
   /// <summary>

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

@@ -118,7 +118,6 @@ const LibFunction = {
       //  item.is = 'ct-iti';
       //  break;
       case Enum.ControlType.NumericRange://数字区间
-
         item = Iti(field);
         item.is = 'ct-iti';
         break;

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -8,19 +8,14 @@
 -->
 <template>
   <div class="ct-quickInput">
-    <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click" @show="searchInputHandle"
-      class="more-dropdown">
+    <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click" @show="searchInputHandle" class="more-dropdown">
       <div>
         <div>
-          <el-input ref="searchInput" size="mini" suffix-icon="el-icon-search" v-model="searchText"
-            @input="searchInputHandle"></el-input>
+          <el-input ref="searchInput" size="mini" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
         </div>
-        <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+        <ctSelectOptionVertical :model="model" @click="selectOption"></ctSelectOptionVertical>
       </div>
       <i slot="reference" class="el-icon-arrow-down"></i>
-      <!-- <span slot="reference" style="font-family: Comic Sans MS; font-size: 14px"
-        ><div class="my-icon-more"></div
-      ></span> -->
     </el-popover>
   </div>
 </template>
@@ -34,6 +29,10 @@ export default {
   props: {
     pn: String,
     action: String,
+    flagNew:{
+        type: Boolean,
+        default: false
+    }
   },
   components: {
     ctSelectOption: selectOption,
@@ -47,7 +46,8 @@ export default {
         name1: "",
         paramName1: that.pn,
       });
-    } else {
+    } 
+    else {
       this.model = this.vmodel;
     }
   },
@@ -64,6 +64,9 @@ export default {
       this.model.getOptions(this.action, self.searchText);
     },
     searchInputHandle: function () {
+      if(this.flagNew){
+        this.model.value='';
+      }
       var currentSeatch = this.searchText;
       this.searchTickControl(currentSeatch);
     },
@@ -75,15 +78,16 @@ export default {
         }
       }, self.model.searchTick);
     },
-    selectOption(value) {
+    selectOption(value,label) {
       if (this.model.value === value) {
         this.$set(this, "showDrop", false);
         return;
-      } else {
+      } 
+      else {
         this.model.value = value;
       }
       this.$set(this, "showDrop", false);
-      this.$emit("click", value);
+      this.$emit("click", value,label);
     },
   },
   mounted() { },

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

@@ -1,7 +1,8 @@
 <template>
   <div class="ct-selectOptionVertical" style="">
     <ul>
-      <li v-for="(op, index) in model.options" :key="index" :class="[getOptionSelect(op[model.optionAttrs.value])?'select':'']" @click="selectOption(op[model.optionAttrs.value])">
+      <li v-for="(op, index) in model.options" :key="index" :class="[getOptionSelect(op[model.optionAttrs.value])?'select':'']" 
+        @click="selectOption(op[model.optionAttrs.value],op[model.optionAttrs.label])">
         <div v-html="op[model.optionAttrs.displayLabel]||op[model.optionAttrs.label]"></div>
       </li>
     </ul>
@@ -42,8 +43,8 @@
           }
         }
       },
-      selectOption(value) {
-        this.$emit('click', value);
+      selectOption(value,label) {
+        this.$emit('click', value,label);
       }
     }
   }

package/src/centaline/validate/index.js

@@ -134,6 +134,14 @@ const actions = {
       return true;
     }
   },
+  validateLen(model) {
+    if (model.value && model.value.length>model.max) {
+      return false;
+    }
+    else {
+      return true;
+    }
+  },
 };
 
 const valid = {
@@ -195,6 +203,11 @@ const valid = {
     message: '请输入正确的联系电话',
     ticker: 'change'
   },
+  validateLen: {
+    action: actions.validateLen,
+    message: '输入文字不能超过最大长度',
+    ticker: 'input'
+  },
   Init(model) {
     return {
       //废弃 todo 删除
@@ -261,6 +274,12 @@ const valid = {
           case 'p':
             rtnValidate.push(valid.phone);
             break;
+          case Enum.ControlType.TextBox:
+          case Enum.ControlType.MultiLineText:
+            if(model.max){
+              rtnValidate.push(valid.validateLen);
+            }
+            break;
           default:
             break;
         }

package/src/main.js

@@ -14,9 +14,9 @@ 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://10.88.22.69:8080/", 
+  baseUrl: "http://10.88.22.69:8080/", 
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  // flagRouterSelf: true,
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'a9e42494-1e0b-4c46-834e-eea096ba2564',
+        oldToken: 'e8f14c4d-5197-427e-9ef5-db1fdac7ae31',
         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.eyJsb2dpbl91c2VyX2tleSI6IjYzMzZiMDJiLTZjOGEtNDIzNC05MGQ5LTliYWI2MTIyNTQzNyJ9.hOxMvGLm03QMPu9C4lgRzkEHC7ECqxJ_L6mfqQRqv39xJ42I8gzSRO-E68vWp-A99ewnxnqvTZ6H_6fOQ9DljQ',