centaline-data-driven 1.1.44 → 1.1.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.1.44",
+  "version": "1.1.45",
   "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

@@ -723,4 +723,8 @@ html {
 }
 .el-radio__label{
   padding-left: 5px!important;
-}
+}
+.el-input--mini .el-input__inner {
+  height: 26px!important;
+  line-height: 26px!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

@@ -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.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
             <div>
               <ct-select-option :model="model" :optionRowCount="optionRowCount" @click="selectOption($event)"></ct-select-option>
             </div>
@@ -271,9 +271,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

@@ -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;
         }

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

@@ -186,10 +186,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

@@ -196,10 +196,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

@@ -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.popupSearchListType > 0 || 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>
@@ -205,7 +205,7 @@
       },
       popupSearchListHandle: function () {
         var self = this;
-
+        self.showDrop=false;
         self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
           self.selectOptionArr(optionArr);
         });
@@ -280,9 +280,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/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: {