centaline-data-driven 1.3.28 → 1.3.29

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="form-app" 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/finance/account-flow/task'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,11 +14,11 @@
     data() {
       return {
         apiParam:{
-actionType: 1,
-businessId: "1547837545432465409",
+actionType: 3,
+originalTraId: "1547488795469586434",
 pageOnly: true,
 pageStyle: 2,
-stepId: "1547838255872065538"
+pageTitle: "成交报告"
           }
       }
     },

package/src/SearchList.vue

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

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

@@ -594,7 +594,7 @@
         var rtnBool = true;
         var jump = false;
         var i=0;
-        debugger
+        
         self.$refs.Fields.forEach((f) => {
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
@@ -620,7 +620,7 @@
 
               if (!jump) {
                 if (this.model.isHorizontalLayout) {//水平布局
-                  this.activeName = f.model.collapseName.toString();
+                  this.activeName = f.model.collapseName.toString()==='-1'?self.activeName:f.model.collapseName.toString();
                   jump = true;
                 }
                 else {//垂直布局

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

@@ -1,7 +1,9 @@
 <template>
   <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
-    <ul>
-      <li v-for="btn in buttons" class="ct-ToolbarButton max-ToolbarButton">
+  
+<div v-if="buttonsLeft&&buttonsLeft.length>0" class="bool_btn_l">
+  <ul>
+   <li v-for="btn in buttonsLeft" class="ct-ToolbarButton max-ToolbarButton"  :class="{btn_r:btn.isRight}">
         <component :is="btn.is" :vmodel="btn"
                    @click="clickHandler(btn,$event)"
                    @importComplete="importComplete"
@@ -9,53 +11,86 @@
                   :optionApi="optionApi"
                    :fileData="getFileData(btn)"></component>
       </li>
-    </ul>
+   </ul>
+</div>
+     <div v-if="buttonsright&&buttonsright.length>0" class="bool_btn_r">
+  <ul>
+   <li v-for="btn in buttonsright" class="ct-ToolbarButton max-ToolbarButton"  :class="{btn_r:btn.isRight}">
+        <component :is="btn.is" :vmodel="btn"
+                   @click="clickHandler(btn,$event)"
+                   @importComplete="importComplete"
+                   v-if="btn.show"
+                  :optionApi="optionApi"
+                   :fileData="getFileData(btn)"></component>
+      </li>
+   </ul>
+</div>
+
+   
   </div>
 </template>
 <script>
-  export default {
-    name: 'ctTableToolbar',
-    props: {
-      buttons: Array,
-      searchModel: Object,
-      optionApi:String
-    },
-    data() {
-      return {};
+export default {
+  name: "ctTableToolbar",
+  props: {
+    buttons: Array,
+    searchModel: Object,
+    optionApi: String
+  },
+  data() {
+    return {
+      buttonsLeft: [],
+      buttonsright: []
+    };
+  },
+  created() {
+    this.buttons.forEach(v => {
+      if (v.isRight) {
+        this.buttonsright.push(v);
+      } else {
+        this.buttonsLeft.push(v);
+      }
+    });
+  },
+  methods: {
+    clickHandler(btn, ev) {
+      this.$emit("click", btn);
     },
-    methods: {
-      clickHandler(btn, ev) {
-        this.$emit('click', btn);
-      },
-      getFileData(btn) {
-        if (btn.flagAttachSearchCondition) {
-          return this.searchModel ? this.searchModel.searchData : {};
-        }
+    getFileData(btn) {
+      if (btn.flagAttachSearchCondition) {
         return this.searchModel ? this.searchModel.searchData : {};
-      },
-      importComplete(res) {
-        this.$emit('importComplete', res);
       }
+      return this.searchModel ? this.searchModel.searchData : {};
+    },
+    importComplete(res) {
+      this.$emit("importComplete", res);
     }
   }
+};
 </script>
 <style>
-  .ct-tableToolbar {
-    width:100%;
-    position:relative;
-    float:left;
-    padding:0 5px 10px 0px;
-    background-color:#fff;
-    border-radius: 6px;
-  }
-    .ct-tableToolbar ul {
-      list-style: none; /* 去掉ul前面的符号 */
-      margin: 0px; /* 与外界元素的距离为0 */
-      padding: 0px; /* 与内部元素的距离为0 */
-      width: auto; /* 宽度根据元素内容调整 */
-    }
-      .ct-tableToolbar ul li {
-        margin-right:5px;
-        float:left; /* 向左漂移，将竖排变为横排 */
-      }
+.ct-tableToolbar {
+  width: 100%;
+  position: relative;
+  float: left;
+  padding: 0 5px 10px 0px;
+  background-color: #fff;
+  border-radius: 6px;
+}
+.ct-tableToolbar ul {
+  list-style: none; /* 去掉ul前面的符号 */
+  margin: 0px; /* 与外界元素的距离为0 */
+  padding: 0px; /* 与内部元素的距离为0 */
+  width: auto; /* 宽度根据元素内容调整 */
+}
+.ct-tableToolbar ul li {
+  margin-right: 5px;
+  float: left; /* 向左漂移，将竖排变为横排 */
+}
+.bool_btn_l {
+  float: left !important;
+}
+.bool_btn_r {
+  float: right !important;
+}
 </style>

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

@@ -295,8 +295,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 }
                 //正在编辑的行
                 else if (rowNum === null && listData.currentRowIndex === 0) {
-                    let fields = listData.currentRow.data;
-                    field = fields[fiedlId];
+                  let fields = listData.currentRow.data;
+                  field = fields[fiedlId];
                 }
                 //源数据
                 else {
@@ -306,17 +306,18 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
 
                     if (rowNum === 0 || (rowNum && fiedlId)) {
                     try {
-                        let fields = listData.rows[rowNum].field;
+                      let fields = listData.rows[rowNum].field;
                         field = fields.find((v) => {
                         return v.id === fiedlId;
-                        });
-                    } catch (e) {
-                        if (listData.rows.length <= rowNum) {
+                      });
+                    } 
+                    catch (e) {
+                      if (listData.rows.length <= rowNum) {
                         var checkMsg = "获取列表行索引超出界限";
                         this.message(checkMsg);
-                        }
-                    }
+                      }
                     }
+                  }
                 }
 
                 return { listData: listData, field: field };
@@ -350,13 +351,19 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             //若该行正在编辑，则取编辑状态的。
             if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
             && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
-                return data.listData.currentRow.data[fiedlId].source[attrName];
+              if(fiedlId=='deleted' || fiedlId=='flagDeleted'){
+                return data.listData.currentRow.data.deleted || false;
+              }
+              return data.listData.currentRow.data[fiedlId].source[attrName];
             }
             else if (data && data.field) {
-                if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
-                    return defaultValue;
-                }
-                return data.field.source[attrName];
+              if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
+                  return defaultValue;
+              }
+              return data.field.source[attrName];
+            }
+            else if (data && (fiedlId=='deleted' || fiedlId=='flagDeleted')) {
+              return data.listData.rows[rowNum].deleted || false;
             }
         },
         getListFieldValueFromParent(tableName, rowNum, fiedlId, attrName, defaultValue) {

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

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

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://tjcptest.centaline.com.cn/", 
-  flagRouterSelf: true,
+  // baseUrl: "http://10.88.22.69:8080/", 
+  // flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'e8f14c4d-5197-427e-9ef5-db1fdac7ae31',
+        oldToken: '0e5e2554-abe0-4538-8520-e024f82389b3',
         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',