centaline-data-driven 1.3.22 → 1.3.23

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <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="'/salemanage/adjust/point/readDetail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,7 +14,7 @@
     data() {
       return {
         apiParam:{
-originalTraId: "1542431606998347777", actionType: 3, pageStyle: 2, pageTitle: "成交报告", pageOnly: true
+adjustID:"220704140952A0156309F316436CAEBA",actionType:3
           }
       }
     },

package/src/SearchList.vue

@@ -8,7 +8,7 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyWashList/getLayoutOfSearch'" :searchDataApi="'/PropertyWashList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/PropertyDutyList/getLayoutOfSearch'" :searchDataApi="'/PropertyDutyList/getListOfSearchModel'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

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

@@ -28,7 +28,7 @@
                     @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
                 <span v-else-if="v.is=='ct-sensitiveeye'">
-                  <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
+                  <component ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
                 </span>
                 <!--可点击的列-->
                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">

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

@@ -17,6 +17,7 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
+      rowdata: Object,
       actionRouter: Array,
       rowindex: Number,
       forname: String,

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

@@ -9,8 +9,10 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
+      rowdata: Object,
+      actionRouter: Array,
       rowindex: Number,
-       forname: String,
+      forname: String,
       forrowindex: String
     },
     data() {

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

@@ -59,7 +59,7 @@ const Base = function (source) {
       source.code2 = v;
     },
     get labelValue() {
-      if (source.code1)
+      if (source.code1!=undefined && source.code1!=null)
         return source.code1;
       else
         return '';

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

@@ -608,6 +608,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                     for (var vkey in row) {
                       rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
                     }
+                    for (var vkey in rtn.dataDictionary[row[rtn.primaryKey]]) {
+                      rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey]||'';
+                    }
                   });
                   if (rtn.cellLayout) {
                     rtn.$vue.$set(rtn.listData, rtn.selectIndex, rtn.dataDictionary[searchValue1]);
@@ -631,7 +634,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
           })
           .catch((error) => {
-            console.error(error);
             if (typeof callback !== 'undefined') {
               callback();
             }

package/src/main.js

@@ -43,8 +43,8 @@ Vue.use(centaline, {
       return {
         oldToken: 'a9e42494-1e0b-4c46-834e-eea096ba2564',
         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.eyJsb2dpbl91c2VyX2tleSI6ImVjODhjOTI1LTU3OTktNDVmNy1iNDI3LWI3M2QwNGVkNWM2NSJ9.fyndFOEg4ThBHv4N2pi3pmPaWWlcD1CVPsYu0G5BKAB1hAgkL_GpOMpCZB5xdjMJLbBVomdoUjnRY7T6JSZb-g',
+        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',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作