centaline-data-driven 1.3.72 → 1.3.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.72",
+  "version": "1.3.74",
   "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: "1524927953715204096"} ,
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/CCAIWorklist/getLayoutOfAudit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/estatemanage/estate/getEstateInfo'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          worklistID: "14749_39", actionType: 2
+          
         },
         topHeight:10,
       }

package/src/centaline/common/index.js

@@ -258,7 +258,6 @@ const common = {
               self.closeDialog(dialogOption);
               reject()
             },
-
           }
         }]
       };

package/src/centaline/css/ccai.css

@@ -4,4 +4,5 @@
 }
 .ccai.button-absolute{
    bottom: 26px;
+   width: calc(100% - 47px);
 }

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

@@ -307,6 +307,8 @@
                     field.disabled = true;//提交按钮禁用
                     self.model.pageDisabled= true;
                     field.doAction(self.getFormObj(), (data) => {
+                      field.disabled = false;
+                      self.model.pageDisabled= false;
                       if (data.rtnCode === 200) {
                         if(data.notification===17){
                           self.clickHandler(self.model.getRtnRouter(data.content),null)
@@ -335,8 +337,6 @@
                           self.parentModel.$vue.closeTabThen(data);
                         }
                       }
-                      field.disabled = false;
-                      self.model.pageDisabled= false;
                     },self.model.scripts);
                   }
                   //无值，触发submit事件

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

@@ -1,12 +1,12 @@
 <template>
   <div v-if="model.routerKey&&model.visibility!='0'">
-    <div v-if="model.rightRouter&&model.value!=''" :style="model.styleObject">
+    <div v-if="model.rightRouter&&model.value!=''" class="wb" :style="model.styleObject">
       <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem">
         {{model.value}}
       </a>
     </div>
   </div>
-  <div v-else-if="model.value!=''&&model.visibility!='0'" :style="model.styleObject" v-html="model.value">
+  <div v-else-if="model.value!=''&&model.visibility!='0'" class="wb" :style="model.styleObject" v-html="model.value">
   </div>
 </template>
 
@@ -28,8 +28,8 @@
       }
     },
     created() {
-      this.model = this.loaderObj.CellLayout(this.vmodel, this.actionRouter, this.rowdata, this.forname, this.forrowindex); 
-     
+      this.model = this.loaderObj.CellLayout(this.vmodel, this.actionRouter, this.rowdata, this.forname, this.forrowindex);
+      console.log(this.model);
     },
    
     methods: {
@@ -62,4 +62,7 @@
     width: 24px;
     margin-top: 2px;
   }
+  .wb {
+    word-break: break-all;
+  }
 </style>

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

@@ -41,10 +41,10 @@
           self.load(self.vmodel);
         }
         else if (typeof self.source !== 'undefined') {
-          self.loaderObj.SearchCategory(self.source,self.load);
+          self.loaderObj.SearchCategory(self.source,self.load,self.loadError);
         }
         else if (typeof self.api !== 'undefined') {
-          self.loaderObj.SearchCategory(self.api, self.load);
+          self.loaderObj.SearchCategory(self.api, self.load,self.loadError);
         }
       });
     },
@@ -55,6 +55,9 @@
         parm[this.model.id]=this.model.value;
         this.$emit('loadedCategory',parm);
       },
+      loadError() {
+        this.$emit('loadedCategoryError');
+      },
       clearClickHandle: function (event) {
         this.model.value = '';
         this.inputHandler(this.model.value);

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

@@ -2,10 +2,10 @@
   <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}">
     <div class="ct-search-list" :style="{'height': pageHeight? pageHeight:'100%','width':searchWidth?searchWidth+'px':'100%'}" > 
       <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
-            <span style="font-weight:bold">{{title}}</span>
+        <span style="font-weight:bold">{{title}}</span>
       </div>
-      <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded"
-      @changeCategory="categorychange" ></ct-searchcategory>
+      <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded" 
+      @loadedCategoryError="categoryLoadedError" @changeCategory="categorychange" ></ct-searchcategory>
 
       <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
       @loaded="screenLoaded" :screenPara="screenPara" 
@@ -139,6 +139,10 @@
         if(param)this.screenPara=param;
         this.$refs.screen.searchComplate();
       },
+      categoryLoadedError() {
+        this.$refs.screen.isLoading=false;
+        this.$refs.table.isLoading=false;
+      },
       categorychange(param) {
         if(param)this.screenPara=param;
         this.reloadKey = this.reloadKey+1;

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

@@ -1,6 +1,6 @@
 <template>
   <div class="st-serach-screen">
-    <div v-bind="model.attrs" style="width:100%" v-if="!isLoading">
+    <div v-bind="model.attrs" style="width:100%" v-if="!isLoading && model">
       <div :class="isLayout === true ? 'ct-ptl0 max-ptb5' : 'ct-ptb5 max-ptb5'" v-if="showScreen">
         <template v-for="(col, index) in model.screen" v-if="col.show !== false">
           <br v-if="col.is === 'ct-linefeed'" />