centaline-data-driven 1.2.33 → 1.2.36

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "2"} ,
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,10 +1,8 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
-    <!-- <ct-form :api="'/PropertyPublish/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
+    <!-- <ct-form :api="'/api/third-dept-tran/profit-return/applyUI'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/PropertyRET/getLayoutOfNewStepOne'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <!--:api="'FormSample/formdata'"-->
-    <!--<ct-form :source="formdata.content"></ct-form>-->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
@@ -16,10 +14,10 @@
     name: 'App',
     data() {
       return {
-        // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
-        apiParam: {originalTraId: "1475658732246241281", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
+        // apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
-        // apiParam: {SN: "13557_132", UserID: "wuhan3"},
+        // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
+        apiParam: {actionType: "2", pageStyle: "2", pageTitle: "新增盘源", pageOnly: "true"},
       }
     },
     methods: {

package/src/centaline/css/common.css

@@ -308,6 +308,7 @@ html {
  }
  
  .errorMessage {
+   height: 26px;
    font-size: 12px;
    color: #ff5b5b !important;
    padding: 3px 5px;

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -71,6 +71,7 @@
                     //row.flagRow && row.columnShow===column.id?'ct-td3':null,
                     rowBorderLeftColumns.includes(column.id)?'ct-td4':null,
                     rowBorderRightColumns.includes(column.id)?'ct-td5':null,
+                    rowMergedTopColumns.includes(column.id)?'ct-tdTop':null,
                     model.rowHiddenKeyData.indexOf(row[model.rowHiddenKey])%2?'ct-tdDouble':'ct-tdSingle',
                     selectKey===row[model.rowHiddenKey]?'select':null,
                     colIndex === leftShadow?'shadowLeft':null,
@@ -134,6 +135,7 @@
         rowMergedColumns:['contactNameDesc','propertyIdentityTypeID','operation'],
         rowBorderLeftColumns:['contactNameDesc','operation'],
         rowBorderRightColumns:['propertyIdentityTypeID','operation'],
+        rowMergedTopColumns:['contactNameDesc','propertyIdentityTypeID'],
         selectKey:'',
       }
     },
@@ -544,6 +546,9 @@
   .ct-searchtable .ct-tr > .ct-tdDouble {
     background-color: rgb(239 255 239);
   }
+  .ct-searchtable .ct-tr > .ct-tdTop {
+    vertical-align: top;
+  }
   .shadowLeft {
     border-right: 1px solid #e7e8eb;
     box-shadow: 2px 0 3px -1px rgba(0,0,0,0.1);

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

@@ -6,16 +6,18 @@
         <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
           <span style="font-weight:bold">{{model.title}}</span>
         </div>
+
         <!--头部元素-->
         <el-row v-if="collapseFieldsRow.length > 0">
           <el-col v-for="(col, index) in collapseFieldsRow[0]" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :from="'form'"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
                        @input="inputHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
           </el-col>
         </el-row>
+
         <!--tabs-->
         <el-tabs v-if="model.isHorizontalLayout" v-model="activeName">
           <el-tab-pane :label="item.label" :name="index.toString()"
@@ -31,6 +33,7 @@
             </el-row>
           </el-tab-pane>
         </el-tabs>
+
         <!--分组-->
         <el-collapse v-else v-model="collapseActiveNames" @change="collapseHandleChange">
           <el-collapse-item v-for="(item, index) in collapse" v-if="item.show !== false" :key="index" :title="item.label" :name="index" :disabled="item.lock" :class="item.lock?'ct-collapse-item-title':''">
@@ -40,7 +43,7 @@
             </template>
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :from="'form'"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
                            @input="inputHandler(col,$event)"
                            @popupSearchList="popupSearchListHandler"
@@ -49,6 +52,7 @@
             </el-row>
           </el-collapse-item>
         </el-collapse>
+
         <!--尾部元素-->
         <el-row v-if="independentItem.length > 0" style="margin-top: 20px;">
           <el-col v-for="(col, index) in independentItem" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
@@ -240,7 +244,7 @@
         var self = this;
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
-        
+                   
         var clickAcion = function (field) {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
@@ -258,6 +262,9 @@
                     self.model.pageDisabled= true;
                     field.doAction(self.getFormObj(), (data) => {
                       if (data.rtnCode === 200) {
+                        if(data.notification===17){
+                          self.clickHandler(self.model.getRtnRouter(data.content),null)
+                        }
                         if (self.model.flagAlertClose) {
                           self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
                             confirmButtonText: '确定',
@@ -294,6 +301,11 @@
               }
             }
             else {
+              if(field.flagAttachSearchCondition){
+                if (!self.validExcute()){
+                  return;
+                }
+              }
               if (typeof field.onClick !== 'undefined') {
                 verified = self.$common.excute.call(self.model.scripts, field.onClick);
               }
@@ -301,9 +313,14 @@
               if (!submitData) {
                 submitData = {};
                 var tempFormData = self.model.getFormObj();
-                field.submitFormField.forEach((v) => {
-                  submitData[v] = tempFormData[v];
-                });
+                if(field.flagAttachSearchCondition){
+                  submitData.jsonData=tempFormData;
+                }
+                else{
+                  field.submitFormField.forEach((v) => {
+                    submitData[v] = tempFormData[v];
+                  });
+                }
               }
 
               if (field.isOpenForm) {
@@ -383,7 +400,7 @@
             }
             submitData = field.getActionPara(submitData).para;
             let title=field.pageTitle==undefined ?field.label:field.pageTitle;
-            submitData.actionType=field.actionType;
+            submitData.actionType=field.actionType; 
             var fun =self.$common.getDataDrivenOpts().handler[field.action];
             fun(submitData,title,self.model);
           }
@@ -558,8 +575,7 @@
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }
         return formData;
-      },
-     
+      },     
     }
   }
 </script>

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

@@ -11,7 +11,7 @@
     :categoryLoaded="loaded.categoryLoaded" @search="search()" 
     @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
-    <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" 
+    <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from"
     @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
     @showTitle="showTitleHandler"></ct-searchtable>
   </div>
@@ -42,6 +42,10 @@
         type: Object,
         default: () => { }
       },
+      from: {
+        String,
+        default:'searchlist'
+      },
     },
     created() {
       this.model = this.vmodel;

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

@@ -3,7 +3,7 @@
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
                    v-if="!isLoading&&searchStatsApi"
                    :api="searchStatsApi"
-                   @searchStats="searchStats"
+                   @searchStats="searchStats"  @setTableHeight="setTableHeight"
                    :searchModel="model.searchModel"></ct-tableStats>
     <ct-tabletoolbar ref="toolbar" v-if="!isLoading" :buttons="model.buttons"
                      @click="toolbarClickHandler($event)"
@@ -16,7 +16,7 @@
     <div v-loading="operationLoading">
     </div>
     <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading"
-         :style="{'height':model.tableHeight+'px'}"
+         :style="{'height':from=='form'?'100%':model.tableHeight+'px'}"
          @scroll="scrollHandle($event)" :v-focus="model.flagFocus"
          @keydown.up="rowKeyDownHandle($event,0)" @keydown.down="rowKeyDownHandle($event,1)"
          tabindex="-1">
@@ -143,7 +143,11 @@
       flagFocus:{
         Boolean,
         default:true
-      }
+      },
+      from: {
+        String,
+        default:'searchlist'
+      },
     },
     computed: {
 
@@ -501,7 +505,9 @@
             var h4 = this.$refs.footer.$el.offsetHeight | 0;
             var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
             var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - 22;
+              var h7 =  this.$refs.tableStats?(this.$refs.tableStats.$el.offsetHeight+7 | 0):0;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7-22;
+            console.log(tableHeight+"   "+h7);
             this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();

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

@@ -4,21 +4,25 @@
     <!--计算占用宽度-->
     <div style="position:relative" v-if="FlagStatistics">
       <div style="position:absolute;left:-10000px" class="tab-list">
-        <label v-for="(item, index) in data" class="btnTab" :class="[selectStats==item.code1?'active':'']" :ref="'StatisticsItem'+index">{{item.controlLabel}}</label>111
+        <label v-for="(item, index) in data" class="btnTab"  :ref="'StatisticsItem'+index">
+         <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>111
       </div>
     </div>
     <!--展示-->
     <div v-if="FlagStatistics" class="tab-list">
       <template v-if="showData.length===1">
-        <label class="btnTab" v-for="(item, index) in showData[0]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
+        <label class="btnTab" v-for="(item, index) in showData[0]"  @click="handleClick($event,item)">
+          <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
       </template>
       <template v-else-if="showData.length>1">
-        <label class="btnTab" v-for="(item, index) in showData[0]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
+        <label class="btnTab" v-for="(item, index) in showData[0]"  @click="handleClick($event,item)">
+         <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
         <el-popover :append-to-table="option.appendId?option.appendId:''"
                     :placement="option.placement?option.placement:'left'"
                     :trigger="option.trigger?option.trigger:''"
                     class="tabl-el">
-          <label class="tablf" v-for="(item, index) in showData[1]" :class="[selectStats==item.code1?'active':'']" @click="handleClick($event,item)">{{item.controlLabel}}</label>
+          <label class="tablf" v-for="(item, index) in showData[1]"  @click="handleClick($event,item)">
+          <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
           <i slot="reference" class="icon-more"></i>
 
         </el-popover>
@@ -68,7 +72,6 @@
         self.selectVa = "";
         if (self.data.length > 0) {
           if (self.selectStats == []) {
-            debugger
             self.selectStats = self.data[0].code1;
           }
           self.FlagStatistics = true;
@@ -111,12 +114,14 @@
             }
 
           }
+
+ self.$emit('setTableHeight');
         });
       },
       handleClick(ev, obj) {
         var self = this;
         self.selectStats = obj.code1;
-        var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.controlType, obj.searchDataType);
+        var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.searchOperation, obj.searchDataType);
         var model = {
           "searchData": fields
         };
@@ -147,42 +152,46 @@
 <style>
 </style>
 
-<style>
-
+<style> 
   .tab-list {
-    height: 30px;
-    border-bottom: 1px solid #E0E0E0;
+    border-bottom: 2px solid #E0E0E0;
     margin-bottom: 10px;
+        padding-bottom: 5px;
   }
 
-  .btnTab {
+  .tab-list .btnTab {
     font-size: 14px !important;
     font-weight: bold;
-    padding: 5px 20px;
+    padding: 0px 20px 0px 20px;
+ 
+
   }
 
-    .btnTab:hover ,.tablf:hover{
+   .tab-list .btnTab:hover ,.tab-list .tablf:hover{
       color: #ee5d56;
     }
-    .tabl-el{
+    .tab-list .tabl-el{
       max-width: 150px;
       box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
     }
-  .tablf{
+  .tab-list  .tablf{
     font-size: 14px !important;
     font-weight: bold;
     text-align: center;
     padding: 5px 10px;
     display: block;
   }
-  .active {
+ .tab-list .active {
     color: #ee5d56 !important;
     border-bottom: solid 3px #ee5d56 !important;
-    background: none;
+    background: none; 
     border-radius: 0 !important;
   }
+  .tab-list .btnTab span{
+ 
+  }
 
-  .icon-more {
+ .tab-list .icon-more {
     background: url(../../../assets/vertical.png)no-repeat;
     background-size: 80% 80%;
     height: 20px;

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -11,9 +11,9 @@
             <div ref="cttags" class="el-select__tags" :style="{'max-width':tagsWidth + 'px'}" @click="clickHandle">
               <span>
                 <span class="ct-tags-value-label">{{model.valueLabel}}</span>
-                <span class="el-tag el-tag--info" :class="[model.attrs.size?'el-tag--'+model.attrs.size:'']" v-for="item in model.value">
+                <span class="el-tag el-tag--info" :class="[model.attrs.size?'el-tag--'+model.attrs.size:'']" v-for="(item, index) in model.value" :key="index">
                   <span class="el-select__tags-text">{{getOptionText(item)}}</span>
-                  <i v-if="!model.lock" class="el-tag__close el-icon-close" @click="deleteOption(item,$event)"></i>
+                  <i v-if="!model.lock && !getOptionLocked(item)" class="el-tag__close el-icon-close" @click="deleteOption(item,$event)"></i>
                 </span>
               </span>
             </div>
@@ -240,6 +240,16 @@
           return "";
         }
       },
+      getOptionLocked: function (value) {
+        var self = this;
+        var option = this.globalOptions.find((v) => { return v[self.model.optionAttrs.value] === value });
+        if (option) {
+          return option[self.model.optionAttrs.locked];
+        } 
+        else {
+          return "";
+        }
+      },
       deleteOption(value, event) {
         var self = this;
         this.model.value.splice(
@@ -303,7 +313,13 @@
         this.$set(this, 'showClear', false);
       },
       clearClickHandle: function (event) {
+        var self =this;
         this.model.value.splice(0);
+        if(this.model.lockedValue.length>0){
+          this.model.lockedValue.forEach((v) => {
+            self.model.value.push(v);
+          });          
+        }
         this.resize();
         this.tagsChange();
         this.$emit('input', this.model.value);

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

@@ -348,7 +348,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           rtn = true;
         }
         return rtn;
-      }
+      },
+      getRtnRouter(v){
+        var button = Router(v);
+        button.is = "ct-btn";
+        return button;
+      },
     };
     valid.InitForm(rtn);
     return rtn;

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

@@ -14,8 +14,10 @@ const Tags = function (source, moreActionRouter) {
       label: 'name',
       displayLabel:'displayName',
       actionType: 'actionType',
-      flagDeleted: 'flagDeleted'
+      flagDeleted: 'flagDeleted',
+      locked: 'locked'
     },
+    _lockedValue: null,
     _value: null,
     get value() {
       if (this._value !== null) {
@@ -102,6 +104,11 @@ const Tags = function (source, moreActionRouter) {
     //},
     reset() {
       this.value.splice(0);
+      if(this.model.lockedValue.length>0){
+        this.model.lockedValue.forEach((v) => {
+          this.model.value.push(v);
+        });          
+      }
       this.defaultValue.forEach((v1) => {
         this.value.push(v1);
       });
@@ -183,6 +190,20 @@ const Tags = function (source, moreActionRouter) {
 
       return null;
     },
+    get lockedValue() {
+      if (this._lockedValue !== null) {
+        return this._lockedValue;
+      }
+      else {
+        this._lockedValue = [];
+        this.options.forEach((v) => {
+          if(v[this.optionAttrs.locked]){
+            this._lockedValue.push(v[this.optionAttrs.value]);
+          }
+        });
+        return this._lockedValue;
+      }
+    },
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -356,9 +356,14 @@ const Enum = {
     CloseTabThenUpdate: 16,
 
     /// <summary>
-    ///  指示前端列表刷新当前行数据
+    ///  路由
     /// </summary>
-    RefreshCurrentRow: 17,
+    Router: 17,
+
+    /// <summary>
+    ///  替换当前表单内容
+    /// </summary>
+    Replace: 18,
   },
 
   /// <summary>

package/src/main.js

@@ -36,7 +36,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'e922a9d1-2dbe-4e39-91ca-aa77c4700aef',
+        oldToken: '4195d16c-9b1d-43b2-b6de-ef4a9f2b7d44',
         estateId: '20210729104021C49F04B55C50F6AF58',
         originalRequestURL: 'http://10.88.22.67:8080',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',