centaline-data-driven 1.2.74 → 1.2.77

package/package.json

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

package/src/Form.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/salematter/squareupload/readDetail'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/salematter/squareupload/readDetail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/salematter/priceupload/readDetail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -18,7 +18,7 @@
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
-        apiParam:{"actionType":2,"jsonData":{}}
+        apiParam:{"actionType":2}
       }
     },
     methods: {

package/src/centaline/common/index.js

@@ -644,7 +644,7 @@ const common = {
    * @param {String} str 需要转换的字符串
    * @desc 首字母转小写。
    */
-  initialsToUpperCase(str) {
+  initialsToLowerCase(str) {
     if (typeof str === 'undefined') {
       return str;
     }
@@ -653,6 +653,15 @@ const common = {
     str = charUpper + str.slice(1);
     return str;
   },
+  initialsToUpperCase(str) {
+    if (typeof str === 'undefined') {
+      return str;
+    }
+    let char = str.charAt(0);
+    let charUpper = char.toUpperCase();
+    str = charUpper + str.slice(1);
+    return str;
+  },
 
   /**
    * @method

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -335,7 +335,12 @@
                 }
                 else{
                   field.submitFormField.forEach((v) => {
-                    submitData[v] = tempFormData[v];
+                    if(tempFormData[v]){
+                      submitData[v] = tempFormData[v];
+                    }
+                    else{
+                      submitData[v] = tempFormData[self.$common.initialsToUpperCase(v)];
+                    }
                   });
                 }
               }

package/src/centaline/dynamicForm/src/dynamicFormListTable.vue

@@ -150,7 +150,6 @@
         if (!isCancel) {
           if (app.model.currentRow.isNew) app.model.tableData.splice(index, 1);
           return row.isSet = !row.isSet;
-          app.model.currentRow.isSet = false;
         }
         //提交数据
         if (row.isSet) {//保存

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -1,6 +1,6 @@
 <template>
     <div v-loading="loading" class="ct-Layout" v-if="Layout !== null && !loading">
-      <ct-layoutchildren  v-for="(item, index) in Layout.fields" :key="index":vmodel="item" :rowindex="index"  @click="rolRouterClickHandler"></ct-layoutchildren>
+      <ct-layoutchildren :rowindex="rowindex"  :vmodel="Layout" @click="rolRouterClickHandler"></ct-layoutchildren>
     </div>
 </template>
 <script>
@@ -17,6 +17,8 @@
       api: String,
       cellLayout: String,
       vmodel: Object,
+      rowindex: Number,
+      actionRouter: Array,
       listData: Array,
       apiParam: Object
     },
@@ -38,30 +40,23 @@
             self.loaderObj.CellLayout(self.api, self.load, this.apiParam, self.failLoad);
           }
           else if (typeof self.vmodel !== 'undefined') {
-            self.load(self.vmodel);
+            self.load(self.vmodel, self.cellLayout);
           }
-         
         });
-        
       },
       failLoad() {
         this.$emit('failLoad', this.model);
       },
-      load(data) {
-        this.model = data;
-        if (data.rows.length > 0) {
-          var str = '<Layout orientation="vertical">';
-          for (var i = 0; i < data.rows.length; i++) {
-            str += data.cellLayout.replace(/\{\{(.+?)\}\}/g, (...args) => {
-              return this.getValue(data.rows[i], args[1])
-            });
-          }
-          str += '</Layout>';
+      load(data, cellLayout) {
+        var str = '';
+        if (typeof data !== 'undefined') {
+          str = cellLayout.replace(/\{\{(.+?)\}\}/g, (...args) => {
+            return this.getValue(data, args[1])
+          });
         }
         var xmlDOM = this.loadXML(str);
         this.Layout = this.xmlToJson(xmlDOM.childNodes[0]);
         this.loading = false;
-        this.$emit('loaded', this.model);
       },
       getValue(data,val) {
         return val.split('.').reduce((data, currentVal) => {
@@ -82,7 +77,6 @@
       xmlToJson(xml) {
         // Create the return object
         var obj = {};
-        var buffer = [];
         if (xml.nodeType == 1) { // element
           // do attributes
           if (xml.attributes.length > 0) {
@@ -128,14 +122,9 @@
       rolRouterClickHandler(routerKey, rowindex) {
         var self = this;
         var submitData = {};
-        var rowData = self.model.rows[rowindex];
-        var actionRouter = [];
-        if (self.model.actionRouters) {
-          self.model.actionRouters.forEach((v) => {
-            var field = self.loaderObj.Router(v);
-            actionRouter.push(field);
-          });
-        }
+        var rowData = self.vmodel;
+        var actionRouter = self.actionRouter;
+        debugger
         let field = actionRouter.find(b => {
           return b.id === routerKey;
         });

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -17,7 +17,7 @@
       @rowClickHandle="rowClickHandle" 
       @showTitle="showTitleHandler"></ct-searchtable>
     </div>
-    <div v-if="flagSideBar && flagSideBarOfData" 
+    <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
     class="sidebar">
       <ct-Detail ref="detail" :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType" 
@@ -209,6 +209,7 @@
             }
           }
         }
+        this.$emit('tableLoaded', this.$refs.table.model);
       },
       rowClickHandle() {
         var self = this;

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width:100%;" class="ct-searchtable" ref="searchTable">
+  <div style="width:100%;" class="ct-searchtable" ref="searchTable" :style="{'margin-top':isLayout?'0':'','padding':isLayout?'0':''}">
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
                    v-if="!isLoading&&searchStatsApi"
                    :api="searchStatsApi"
@@ -16,7 +16,7 @@
     <div v-loading="operationLoading">
     </div>
     <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading"
-         :style="{'height':from=='form'?'100%':model.tableHeight+'px'}"
+         :style="{'height':from=='form'?'100%':model.tableHeight+'px','border-bottom':isLayout?'none':''}"
          @scroll="scrollHandle($event)" :v-focus="model.flagFocus"
          @keydown.up="rowKeyDownHandle($event,0)" @keydown.down="rowKeyDownHandle($event,1)"
          tabindex="-1">
@@ -134,7 +134,9 @@
         </table>
       </div>
       <div v-else>
-        <ct-layout ref="CellLayout" :vmodel="model.source.content"></ct-layout>
+        <div v-for="(row,rowindex) in model.listData" :key="rowindex">
+            <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex" :actionRouter="model.actionRouter"></ct-layout>
+        </div>
       </div>
     </div>
     <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading&&!isLayout"></ct-tabletip>
@@ -545,11 +547,14 @@
             });
           }
           else {
-            var h1 = document.body.offsetHeight | 0;
             if (this.$parent.$parent.$vnode.componentOptions.tag === 'ct-PropertySimpleDetailRET') {
+              var h1 = this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight | 0;
               var h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;
               var h3 = this.$parent.$parent.$refs.title.offsetHeight | 0;
-              let tableHeight = h1 - h2-h3 - 300;
+              let tableHeight = h1 - h2 - h3 - 270;
+              if (h2 == 0) {
+                tableHeight = tableHeight + 15;
+              }
               this.model.tableHeight = tableHeight;
               this.$nextTick(() => {
                 self.getScrollAttr();

package/src/centaline/formData/index.js

@@ -33,7 +33,7 @@ const formData = {
     },
     //获取Field的属性attrKey的值
     getValueByFieldName(id, attrKey) {
-        attrKey = this.common.initialsToUpperCase(attrKey);
+        attrKey = this.common.initialsToLowerCase(attrKey);
         var rtn1 = this.fieldsDic[id];
         if (rtn1) {
             return rtn1.source[attrKey];
@@ -41,7 +41,7 @@ const formData = {
     },
     //设置Field的属性attrKey的值
     setValueByFieldName(id, attrKey, attrValue) {
-        attrKey = this.common.initialsToUpperCase(attrKey);
+        attrKey = this.common.initialsToLowerCase(attrKey);
         var rtn1 = this.fieldsDic[id];
         if (rtn1) {
             rtn1.source[attrKey] = attrValue;
@@ -151,7 +151,7 @@ const formData = {
 
         let data = this.getListField(tableName, rowNum, fiedlId);
 
-        attrName = this.common.initialsToUpperCase(attrName);
+        attrName = this.common.initialsToLowerCase(attrName);
         attrName = attrName ? attrName : 'code1';
 
         if (!fiedlId) {
@@ -180,7 +180,7 @@ const formData = {
         tableName = tableName ? tableName : this.form.scripts.$fd;
         let data = this.getListField(tableName, rowNum, fiedlId);
 
-        attrName = this.common.initialsToUpperCase(attrName);
+        attrName = this.common.initialsToLowerCase(attrName);
         attrName = attrName ? attrName : 'code1';
 
         if (!fiedlId) {

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

@@ -33,7 +33,7 @@ const ContactList = function (source,para ,callBack) {
         return false;
       },
       get primaryKey() {
-        return common.initialsToUpperCase(data.content.primaryFieldName);
+        return common.initialsToLowerCase(data.content.primaryFieldName);
       },
       get primaryFieldMappingDBName() {
         return data.content.primaryFieldMappingDBName;
@@ -123,7 +123,7 @@ const ContactList = function (source,para ,callBack) {
                 return v;
               },
               get id() {
-                return common.initialsToUpperCase(v.fieldName);
+                return common.initialsToLowerCase(v.fieldName);
               },
               get name() {
                 return v.displayName;

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

@@ -29,7 +29,7 @@ const ContactList = function (source,para ,callBack) {
         size: 'mini'
       },
       get primaryKey() {
-        return common.initialsToUpperCase(source.content.primaryFieldName);
+        return common.initialsToLowerCase(source.content.primaryFieldName);
       },
       get primaryFieldMappingDBName() {
         return source.content.primaryFieldMappingDBName;
@@ -128,7 +128,7 @@ const ContactList = function (source,para ,callBack) {
                 return v;
               },
               get id() {
-                return common.initialsToUpperCase(v.fieldName);
+                return common.initialsToLowerCase(v.fieldName);
               },
               get name() {
                 return v.displayName;

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

@@ -188,7 +188,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //获取Field的属性attrKey的值
         getValueByFieldName(id, attrKey) {
-            attrKey = this.common.initialsToUpperCase(attrKey);
+            attrKey = this.common.initialsToLowerCase(attrKey);
             var rtn1 = this.fieldsDic[id];
             if (rtn1) {
                 return rtn1.source[attrKey];
@@ -196,7 +196,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //设置Field的属性attrKey的值
         setValueByFieldName(id, attrKey, attrValue) {
-            attrKey = this.common.initialsToUpperCase(attrKey);
+            attrKey = this.common.initialsToLowerCase(attrKey);
             var rtn1 = this.fieldsDic[id];
             if (rtn1) {
                 rtn1.source[attrKey] = attrValue;
@@ -306,7 +306,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
 
             let data = this.getListField(tableName, rowNum, fiedlId);
 
-            attrName = this.common.initialsToUpperCase(attrName);
+            attrName = this.common.initialsToLowerCase(attrName);
             attrName = attrName ? attrName : 'code1';
 
             if (!fiedlId) {
@@ -335,7 +335,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             tableName = tableName ? tableName : this.form.scripts.$fd;
             let data = this.getListField(tableName, rowNum, fiedlId);
 
-            attrName = this.common.initialsToUpperCase(attrName);
+            attrName = this.common.initialsToLowerCase(attrName);
             attrName = attrName ? attrName : 'code1';
 
             if (!fiedlId) {

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

@@ -118,6 +118,7 @@ const FormList = function (source, master) {
         source.rows.forEach((r) => {
           var row = rtn.initRow(r);
           this._rows.push(row);
+          rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
         });
         return this._rows;
       }
@@ -362,6 +363,7 @@ const FormList = function (source, master) {
       let iRow = this.initRow(sourceRow);
       iRow.isNewFlag = true;
       rtn._rows.push(iRow);
+      rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
       Vue.set(row, 'edit', iRow.edit);
       Vue.set(row, 'delete', iRow.delete);
       row.$sourceIndex = rtn._rows.length - 1;
@@ -405,6 +407,7 @@ const FormList = function (source, master) {
               if (!isRepeat) {
                 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;
                 

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

@@ -149,7 +149,7 @@ const Router = function (source) {
       return source.imgUrl;
     },
     get rightField() {
-      return common.initialsToUpperCase(source.rightField);
+      return common.initialsToLowerCase(source.rightField);
     },
     get submitFormField() {
      
@@ -158,7 +158,7 @@ const Router = function (source) {
       }
       var submitArr = [];
       source.refFieldName.split(',').forEach(v => {
-        submitArr.push(common.initialsToUpperCase(v));
+        submitArr.push(common.initialsToLowerCase(v));
       })
       return submitArr;
     },
@@ -168,7 +168,7 @@ const Router = function (source) {
       }
       var submitArr = [];
       source.refFieldName.split(',').forEach(v => {
-        submitArr.push(common.initialsToUpperCase(v));
+        submitArr.push(common.initialsToLowerCase(v));
       })
       return submitArr;
     },

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

@@ -17,10 +17,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       selectIndex: 0,
       selectAll: 0,
       get title() {
-        return source.title;
+        return source.content.title;
       },
       set title(v) {
-        source.title = v;
+        source.content.title = v;
       },
       get flagShowTitle() {
         let v = false;
@@ -58,7 +58,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   return v;
                 },
                 get id() {
-                  return common.initialsToUpperCase(v.fieldName);
+                  return common.initialsToLowerCase(v.fieldName);
                 },
                 get name() {
                   return v.displayName;
@@ -656,7 +656,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         return source.content.dataApi;
       },
       get primaryKey() {
-        return common.initialsToUpperCase(source.content.primaryFieldName);
+        return common.initialsToLowerCase(source.content.primaryFieldName);
       },
       get primaryFieldMappingDBName() {
         return source.content.primaryFieldMappingDBName;

package/src/main.js

@@ -14,7 +14,7 @@ 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://10.1.245.111:38028/api", 
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
@@ -36,10 +36,10 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '6613f67c-ba83-4065-9570-175c2f74e6d5',
+        oldToken: 'c72af00a-da9a-430a-b986-2935092b42f6',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI2ZjYwZTBjLWFhYzEtNDgxYy1hYTBkLWMxNjZlNzdjOWZhYyJ9.56V1V4HOhrAdO58i-bg5XG5ZKSSJ-rN1trTEjs0lZCCID0CM8LLBswqrt4_wsbApIdT1QaTA4TtmWmlR3UvxXQ',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk4NGM0ZjJlLTRhNTgtNDM4YS1iNjkxLWQyMTI4ZjdlYjNlMyJ9.nxO4kEXzIM2RJTXuX_AOoctKFvBiTZUEwHTu1YSFMn8JBjM9p-RK31ZB8ckJvlwgjiDGdbuGt1QOZRRP9KS3qQ',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作