centaline-data-driven 1.3.11 → 1.3.14

package/package.json

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

package/src/SearchList.vue

@@ -4,15 +4,15 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
+    <!-- <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
-    :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist>
+    :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist> -->
+                   ></ct-searchlist>
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/css/common.css

@@ -812,5 +812,7 @@ html {
 .shortcutFollow .ct-form .el-card__body .el-col{
   padding:0px 5px 0 0 !important;
 }
-
+.shortcutFollow .el-collapse{
+  border-bottom: none;
+}
 

package/src/centaline/css/max.css

@@ -248,7 +248,6 @@
 .max.el-button.el-button--mini{
     height: 26px;
 }
-.ct-text .showLabel label{
-    display: inline-block;
+.ct-text .showLabel label{ 
     line-height: 27px!important;
   }

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -66,56 +66,14 @@
         </div>
         <div class="head-but">
           <div>
-            <component
-              v-if="model.otherTradeActionRouter !== null"
-              v-bind="model.otherTradeActionRouter"
+            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter"
               class="max-default w93"
-              :is="model.otherTradeActionRouter.is"
-              :vmodel="model.otherTradeActionRouter"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"
-            ></component>
-            <img
-              v-if="parentModel && parentModel.$refs && parentModel.$refs.table"
-              :class="{
-                domDisabled:
-                  parentModel &&
-                  parentModel.$refs.table &&
-                  parentModel.$refs.table.model.selectIndex <= 0,
-              }"
-              @click="clickPrevHandler"
-              src="../../../assets/T.png"
-              alt=""
-              style="
-                width: 26px;
-                height: 26px;
-                vertical-align: bottom;
-                margin-left: 20px;
-                cursor: pointer;
-              "
-            />
-            <img
-              v-if="parentModel && parentModel.$refs && parentModel.$refs.table"
-              :class="{
-                domDisabled:
-                  parentModel &&
-                  parentModel.$refs.table &&
-                  parentModel.$refs.table.model.listData &&
-                  parentModel.$refs.table.model.selectIndex ===
-                    parentModel.$refs.table.model.listData.length - 1,
-              }"
-              @click="clickNextHandler"
-              src="../../../assets/B.png"
-              alt=""
-              style="
-                width: 26px;
-                height: 26px;
-                vertical-align: bottom;
-                margin-left: 15px;
-                margin-right: 13px;
-                cursor: pointer;
-              "
-            />
+              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi"
+              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"></component>
+            <img :class="{domDisabled:flagDisabledPrev,}" @click="clickPrevHandler"
+              src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 20px;cursor: pointer;"/>
+            <img :class="{domDisabled:flagDisabledNext,}" @click="clickNextHandler"
+              src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 15px;margin-right: 13px;cursor: pointer;"/>
           </div>
           <div class="mt5">
             <component
@@ -140,19 +98,8 @@
             ></component>
           </div>
           <div class="mt5">
-            <button
-              type="button"
-              class="
-                el-button el-button--info el-button--mini
-                max-report
-                rel
-                w93
-              "
-              v-if="
-                model.actionRoutersMoreList !== null &&
-                model.actionRoutersMoreList.length > 0
-              "
-            >
+            <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
+              v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length > 0">
               <img src="../../../assets/dian.png" alt="" class="report" />
               <ul class="report-cont">
                 <li
@@ -336,23 +283,13 @@
           <div class="tablist-info base-box">
             <div class="details-tabs-box">
               <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
-                <el-tab-pane
-                  v-for="(col, index) in model.tags1"
-                  :key="col.appID"
-                  :index="index.toString()"
-                  :name="index.toString()"
-                >
+                <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()" :name="index.toString()">
                   <div slot="label" v-html="col.appName"></div>
                 </el-tab-pane>
               </el-tabs>
-              <ct-searchlist
-                v-if="model.searchConditionApiTags1"
-                :key="'list' + listKey.toString() + refershKey"
-                :apiParam="model.paramDataTags1"
-                :flagFocus="false"
-                :searchConditionApi="model.searchConditionApiTags1"
-                :searchDataApi="model.searchDataApiTags1"
-              ></ct-searchlist>
+              <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey" style="min-height: 420px;"
+                :apiParam="model.paramDataTags1" :flagFocus="false" :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
+              </ct-searchlist>
             </div>
           </div>
           <div
@@ -657,16 +594,33 @@ export default {
       allIn: false,
       refershKey: 0,
       listKey: 0,
+      flagDisabledPrev:false,
+      flagDisabledNext:false,
     };
   },
   mounted() {
     var self = this;
     this.$nextTick(function () {
+      if(self.parentModel && self.parentModel.$refs && self.parentModel.$refs.table){
+        if(self.parentModel.$refs.table.model.selectIndex <= 0){
+          self.flagDisabledPrev=true;
+        }
+        if(self.parentModel.$refs.table.model.listData && self.parentModel.$refs.table.model.selectIndex ===self.parentModel.$refs.table.model.listData.length - 1){
+          self.flagDisabledNext=true;
+        }
+      }
+      else{
+        self.flagDisabledPrev=true;
+        self.flagDisabledNext=true;
+      }
+
       if (self.vmodel) {
         self.load(self.vmodel);
-      } else if (typeof self.source !== "undefined") {
+      } 
+      else if (typeof self.source !== "undefined") {
         self.loaderObj.Detail(self.source, null, self.load);
-      } else if (typeof self.api !== "undefined") {
+      } 
+      else if (typeof self.api !== "undefined") {
         self.loaderObj.Detail(self.api, self.apiParam, self.load);
       }
     });
@@ -881,7 +835,8 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else if (field.isOpenList) {
+          } 
+          else if (field.isOpenList) {
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -909,7 +864,8 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else if (field.isFormPageInTab) {
+          } 
+          else if (field.isFormPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
@@ -921,24 +877,29 @@ export default {
                 self.model,
                 field.dialogWidth
               );
-          } else if (field.isSearchPageInTab) {
+          } 
+          else if (field.isSearchPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
               .handler.openTabSearch(field, submitData);
-          } else if (field.isBrowserNewTab) {
+          } 
+          else if (field.isBrowserNewTab) {
             // 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(field.action + query, "_blank");
-          } else if (field.isOpenUrlInBrowse) {
+          } 
+          else if (field.isOpenUrlInBrowse) {
             // 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
-          } else if (field.isSeeVoice) {
+          } 
+          else if (field.isSeeVoice) {
             //看视频
             self.$common.browseVideo(field, submitData);
-          } else {
+          } 
+          else {
             field.doAction(submitData, (data) => {
               self.model.doAction(data, field);
               if (callBack) {
@@ -950,8 +911,7 @@ export default {
         //执行客户端脚本
         else {
           submitData = field.getActionPara(submitData).para;
-          let title =
-            field.pageTitle == undefined ? field.label : field.pageTitle;
+          let title = field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData.actionType = field.actionType;
           var fun = self.$common.getDataDrivenOpts().handler[field.action];
           fun(submitData, title, null);
@@ -974,7 +934,8 @@ export default {
             clickAcion(field, submitData);
           })
           .catch(() => {});
-      } else {
+      } 
+      else {
         clickAcion(field, submitData);
       }
     },

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

@@ -35,11 +35,11 @@
         </el-tabs>
 
         <!--分组-->
-        <el-collapse v-else v-model="collapseActiveNames" @change="collapseHandleChange">
+        <el-collapse v-else v-model="collapseActiveNames" @change="collapseHandleChange" :class="model.flagHideSaveLine?'el-collapse-saveLine':''">
           <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':''">
             <template slot="title">
               <i class="sign"></i>
-              {{item.label}}
+              <span :class="[item.labelClass]">{{item.label}}</span>
             </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">
@@ -591,7 +591,12 @@
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
               if(i===0 && f.model.label){
-                self.$message.error('【'+f.model.label+'】不能为空！');
+                if(f.model.is=="ct-file"){
+                  self.$message.error(f.validMessage);
+                }
+                else{
+                  self.$message.error('【'+f.model.label+'】不能为空！');
+                }
               }
               i++;
 
@@ -684,8 +689,10 @@
 .el-collapse{
   border-top: none;
 }
-.ct-collapse-item-title .el-collapse-item__header
-{
+.ct-collapse-item-title .el-collapse-item__header{
   color:#303133 !important; 
 }
+.el-collapse-saveLine .ct-collapse-item-title:last-child .el-collapse-item__wrap{
+  border-bottom:none; 
+}
 </style>

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

@@ -1272,7 +1272,7 @@
     border-bottom: 1px solid #ebeef5;
     width: 100%;
     outline: 0;
-    border-top: 1px solid #fff;
+   border-top: 1px solid #ebeef5;
   }
 
   .ct-searchtable .ct-table {
@@ -1282,7 +1282,7 @@
 
     .ct-searchtable .ct-table th {
       background-color: #f4f7fa !important;
-      border-top: 1px solid #ebeef5;
+      
     }
 
   .ct-searchtable .ct-tr > .ct-td {