centaline-data-driven 1.1.44 → 1.1.48

package/package.json

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

package/src/Form.vue

@@ -7,8 +7,8 @@
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
-    <!-- <ct-form :api="'/PropertyTrust/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -22,16 +22,16 @@
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {SN: "13557_132", UserID: "wuhan3"},
         // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
-        // apiParam: {chanceID: "1", actionType: 2} ,
-        apiParam: {
-          actionType: 2,
-          agentId: "1450283160825425922",
-          estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
-          pageOnly: true,
-          pageStyle: 2,
-          propertyId: "14102015-0736-9265-205A-451687BF7062",
-          relProId: "1475708315466829833",
-        }
+        apiParam: {chanceID: "1", actionType: 2} ,
+        // apiParam: {
+        //   actionType: 2,
+        //   agentId: "1450283160825425922",
+        //   estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
+        //   pageOnly: true,
+        //   pageStyle: 2,
+        //   propertyId: "14102015-0736-9265-205A-451687BF7062",
+        //   relProId: "1475708315466829833",
+        // }
       }
     },
     methods: {

package/src/centaline/css/common.css

@@ -431,7 +431,11 @@ html {
   color: #fff;
 
 } */
+.el-button--mini, .el-button--mini.is-round{
+  padding: 0px 19px;
+}
  .el-button--primary {
+   height: 26px;
    background-color: #EE6B6B ;
    border-color: #EE6B6B ;
  }
@@ -713,8 +717,9 @@ html {
 .ct-table-content{
   padding: 0 15px;
 }
-.el-card.is-always-shadow{
-  box-shadow: none!important;
+.el-card.is-always-shadow {
+  border: none;
+  box-shadow: none !important;
 }
 
 .domDisabled {
@@ -723,4 +728,18 @@ html {
 }
 .el-radio__label{
   padding-left: 5px!important;
-}
+}
+.el-input--mini .el-input__inner{
+  height: 26px!important;
+  line-height: 26px!important;
+ }
+ .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
+  min-height: 26px!important;
+  line-height: 26px;
+}
+.ct-rich-text {
+  min-height: 26px!important;
+}
+.ct-dialog_body .el-card__body{
+  padding-top: 0px!important;
+}

package/src/centaline/dialogList/src/dialog.vue

@@ -112,7 +112,7 @@
                                   class: ['el-icon', 'el-icon-close'],
                                   style: {
                                     'position': 'absolute',
-                                    'right': '20px',
+                                    'right': '8px',
                                     'top':'7px',
                                     'font-size':'22px'
                                   },

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

@@ -223,7 +223,7 @@
         var self = this;
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
-
+        
         var clickAcion = function (field) {  
           if (field.isSubmit) {
             let verified = true;
@@ -391,8 +391,10 @@
       },
       changeCallBackHandler(field, callBackFunName, callBackPara) {
         var self = this;
-        this.model.scripts.$fd = field.id;
-        this.$common.excuteFunStr.call(this.model.scripts, callBackFunName, callBackPara);
+        if(callBackFunName){
+          this.model.scripts.$fd = field.id;
+          this.$common.excuteFunStr.call(this.model.scripts, callBackFunName, callBackPara);
+        }
         self.$forceUpdate();
       },
       inputHandler(field) {
@@ -444,7 +446,7 @@
             },
             on: {
               submit(option) {
-                if (typeof callBack === "function") {
+                if (typeof callBack === "function" && !router.callBackFunName) {
                   callBack(option);
                 }
 
@@ -515,8 +517,7 @@
           }
         });
       },
-      getFormObj()
-      {
+      getFormObj(){
         let formData=this.model.getFormObj();
         if(this.$route && this.$route.query && this.$route.query.pageStyle)
         {
@@ -528,3 +529,8 @@
     }
   }
 </script>
+<style scoped>
+.el-collapse{
+  border-top: none;
+}
+</style>

package/src/centaline/dynamicMo/src/dynamicMo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div class="ct-mo" style="width:100%;display:flex">
-      <div style="flex:1;display:flex" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-mo-'+model.attrs.size:''
+      <div style="flex:1;display:flex;margin-right: 5px;" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-mo-'+model.attrs.size:''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div style="flex:1;position: relative;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
@@ -17,7 +17,7 @@
             </span>
           </div>
           <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']"
-                      :trigger="'click'" :disabled="model.lock">
+                      :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
             <div>
               <ct-select-option :model="model" :optionRowCount="optionRowCount" @click="selectOption($event)"></ct-select-option>
             </div>
@@ -180,20 +180,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {
@@ -271,9 +269,9 @@
       selectOptionArr(optionArr) {
         var self = this;
         optionArr.forEach((s) => {
-          if (!self.model.value.find((v) => { return v === s.Code })) {
+          if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
             self.model.options.push(s);
-            self.model.value.push(s.Code);
+            self.model.value.push(s[self.model.optionAttrs.value]);
           }
         });
 

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" style="width:100%">
     <div v-if="model !== null && !loading" class="ct-form">
-      <div class="ct-ptb5">
+      <div class="ct-ptb5 max-flex">
         <template v-for="(col, index) in model.fields" v-if="col.show !== false">
           <br v-if="col.is === 'ct-linefeed'" />
           <component ref="Fields" :is="col.is" v-bind="col.listBind" :vmodel="col" :api="model.optionApi" @click="getClickHandler(col.action)"></component>
@@ -107,12 +107,21 @@
       searchData() {
         this.$refs.table.searchComplate(this.model);
       },
+      reset() {
+        this.model.fields.forEach((v) => {
+          v.reset();
+        });
+      },
       getClickHandler(action) {
         var fun = {};
         switch (action) {
           case 'search':
             this.searchData();
             break;
+          case 'reset':
+            this.reset();
+            this.searchData();
+            break;
           default:
             break;
         }
@@ -138,4 +147,11 @@
   }
 </script>
 <style>
+.max-flex{
+  display: flex;
+
+}
+.max-flex .field-top{
+  margin-right: 10px;
+}
 </style>

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -23,7 +23,7 @@
         <el-input v-if="jumpBtnName" size="mini" v-model="jumpStr" placeholder="定位" style="width:150px"></el-input>
         <el-button v-if="jumpBtnName" size="mini" @click="jumpClickHandler()">{{jumpBtnName}}</el-button>
         <el-button v-if="filterBtnName" size="mini" @click="filterClickHandler()" style="margin-left: 0px;">{{filterBtnName}}</el-button>
-        <el-button size="mini" @click="confirmClickHandler()" style="float:right;" type="primary">确认</el-button>
+        <el-button size="mini" @click="confirmClickHandler()" class="max-search-btn" style="float:right;" type="primary">确认</el-button>
       </div>
     </div>
     <div style="min-height:250px" v-loading="loading" v-if="loading"></div>
@@ -231,4 +231,7 @@
   .el-table {
     font-size: 12px !important;
   }
+  .el-table .el-table__header th {
+    background-color: #f4f7fa!important;
+  }
 </style>

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

@@ -10,7 +10,7 @@
       <div class="ct-radios" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
         <el-radio-group v-model="model.value" @change="changeHandler1($event)">
           <el-radio-button v-bind="model.attrs" v-for="(value, index) in model.segmentValue" :key="index" v-model="model.value"
-                    :label="value[model.optionAttrs.value]" :disabled="model.lock">
+                    :label="value[model.optionAttrs.value]" :displayLabel="value[model.optionAttrs.displayLabel]" :disabled="model.lock">
             {{value[model.optionAttrs.label]}}
           </el-radio-button >
         </el-radio-group>
@@ -61,6 +61,12 @@
         this.changeHandler(this.model.value);
       },
       changeHandler1: function (event) {
+        var self=this;
+        this.model.segmentValue.forEach((v, i) => {
+          if(v[self.model.optionAttrs.value]==event && v[self.model.optionAttrs.displayLabel]){
+            self.model.label=v[self.model.optionAttrs.displayLabel];
+          }
+        });
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
         let parm={};

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

@@ -192,7 +192,7 @@
             self.colHasWidth[vi] = 'nowidth';
           }
         });
-        debugger;
+        
         self.isLoading = false;
         self.$forceUpdate();
         this.model.scripts.formData = this.model.formData;

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="field-top">
-    <div style="width:100%;display:flex">
-      <div style="flex:1" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+    <div style="width:100%;display:flex;">
+      <div style="flex:1;margin-right:5px" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
             {{model.label}}
           </div>
-          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'">
             <div>
               <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
             </div>
@@ -165,20 +165,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)){
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)){
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {
@@ -186,10 +184,7 @@
         self.$emit('popupSearchList', true, self.model, self.model.moreActionRouter, (option) => {
           self.model.value = option[self.model.optionAttrs.value];
           self.model.text = option[self.model.optionAttrs.label];
-          self.model.options.push({
-            code: self.model.value,
-            name: self.model.text
-          });
+          self.model.options.push(option);
 
           self.soChange();
         });

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="field-top">
     <div style="width:100%;display:flex">
-      <div style="flex:1" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+      <div style="flex:1;margin-right:5px" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
             {{model.label}}
           </div>
-          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
+          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock)? 'manual' : 'click'">
             <div>
               <div>
                 <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -170,23 +170,18 @@
         if (this.model.lock) {
           return false;
         }
-        if (this.model.popupSearchListType === 1) {
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
+        }
+        else if (this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        //else if (this.model.popupSearchListType === 1) {
-        //  //todo 以后可加上即可选单搜索 又可高级搜索
-        //}
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {
@@ -196,10 +191,7 @@
           if (option) {
             self.model.value = option[self.model.optionAttrs.value];
             self.model.text = option[self.model.optionAttrs.label];
-            self.model.options.push({
-              Code: self.model.value,
-              Name: self.model.text
-            });
+            self.model.options.push(option);
 
             self.soChange();
           }

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

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div class="ct-tags" style="width:100%;display:flex">
-      <div style="flex:1;display:flex" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
+      <div style="flex:1;display:flex;margin-right: 5px;" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
     ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div style="flex:1;position: relative;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
@@ -17,7 +17,7 @@
                 </span>
               </span>
             </div>
-            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType === 2 || model.lock) ? 'manual' : 'click'">
+            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'">
               <div>
                 <div>
                   <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -186,26 +186,24 @@
       clickHandle: function () {
         if (this.model.lock) {
           return false;
+        }        
+        if (this.model.paramName) {
+          this.$set(this, 'showDrop', !this.showDrop);
+          if (this.showDrop) {
+            this.getOptions();
+          }
+          this.focusHandle();
         }
-        if (this.model.popupSearchListType === 1) {
+        else if(this.model.popupSearchListType === 1) {
           this.popupSearchListHandle();
         }
-        else {
-          if (this.model.paramName) {
-            this.$set(this, 'showDrop', !this.showDrop);
-            if (this.showDrop) {
-              this.getOptions();
-            }
-            this.focusHandle();
-          }
-          else if ((this.model.popupSearchListType === 0)) {
-            this.$message.warning("请配置参数paramName1");
-          }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message.warning("请配置参数paramName1");
         }
       },
       popupSearchListHandle: function () {
         var self = this;
-
+        self.showDrop=false;
         self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
           self.selectOptionArr(optionArr);
         });
@@ -280,9 +278,14 @@
       selectOptionArr(optionArr) {
         var self = this;
         optionArr.forEach((s) => {
-          if (!self.model.value.find((v) => { return v === s.Code })) {
-            self.model.options.push(s);
-            self.model.value.push(s.Code);
+          if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
+            let op={};
+            op[self.model.optionAttrs.value]=s[self.model.optionAttrs.value];
+            op[self.model.optionAttrs.label]=s[self.model.optionAttrs.label];
+            op[self.model.optionAttrs.rowid]='';
+            op[self.model.optionAttrs.flagDeleted]=false;
+            self.model.options.push(op);
+            self.model.value.push(s[self.model.optionAttrs.value]);
           }
         });
 

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

@@ -10,7 +10,10 @@ const SearchCategory = function (source, callBack) {
       showLabel:true,
       get value() {
         if(!data.code1){
-            return rtn.segmentValue[0].code;
+            if(rtn.segmentValue[0][rtn.optionAttrs.displayLabel]){
+              rtn.label=rtn.segmentValue[0][rtn.optionAttrs.displayLabel];
+            }
+            return rtn.segmentValue[0][rtn.optionAttrs.value];
         }
         return data.code1;
       },
@@ -24,7 +27,8 @@ const SearchCategory = function (source, callBack) {
         value: 'code',
         label: 'name',
         actionType: 'actionType',
-        flagDeleted: 'flagDeleted'
+        flagDeleted: 'flagDeleted',        
+        displayLabel: 'displayName',
       }
     };
     rtn = base.copy(Base(data), rtn);

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

@@ -9,6 +9,7 @@ const Tags = function (source, moreActionRouter) {
   var rtn = {
     options: source.code1 === '' ? [] : [].concat(JSON.parse(source.code1)),
     optionAttrs: {
+      rowid: 'rowID',
       value: 'code',
       label: 'name',
       displayLabel:'displayName',

package/src/main.js

@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {