centaline-data-driven 1.3.41 → 1.3.44

package/package.json

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

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
+    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1524555083688316928"} ,
+        apiParam: {actionType: 1,chanceID: "1524955049590132736"} ,
       }
     },
     mounted() {

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -11,6 +11,9 @@
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
             <img :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
+            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter" class="max-default w93"
+              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" style="margin-left: 10px;"
+              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"></component>
           </div>
           <div class="title-other">
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
@@ -24,44 +27,23 @@
               {{ tag.label }}
             </div>
           </div>
-          <div
-            v-if="model.fields1Dic.PropertyDepict"
-            v-html="model.fields1Dic.PropertyDepict.value"
-            style="
-              font-weight: bold;
-              font-size: 13px;
-              margin-top: 10px;
-              background: rgb(236, 249, 255);
-              flex: 1;
-              align-items: center;
-              padding: 5px;
-              border-radius: 5px;
-            "
-          ></div>
+          <div v-if="model.fields1Dic.PropertyDepict" v-html="model.fields1Dic.PropertyDepict.value"
+            style=" font-weight: bold; font-size: 13px; margin-top: 10px; background: rgb(236, 249, 255);
+              flex: 1; align-items: center; padding: 5px; border-radius: 5px;">
+          </div>
         </div>
         <div class="head-but">
           <div>
-            <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 :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 class="max-report w93"
               v-if="model.actionRouters !== null && model.actionRouters[0] !== null"
               :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[0], $event)"
-            ></component>
+              @click="fieldClickHandler(model.actionRouters[0], $event)">
+            </component>
             <component class="max-report w93"
               v-if="model.actionRouters !== null && model.actionRouters[1] !== null"
               :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[1], $event)"
-            ></component>
-          </div>
-          <div class="mt5">
+              @click="fieldClickHandler(model.actionRouters[1], $event)">
+            </component>
             <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" />
@@ -76,6 +58,10 @@
               :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi"
               @click="fieldClickHandler(model.actionRouters[2], $event)">
             </component>
+            <img :class="{domDisabled:flagDisabledPrev,}" @click="clickPrevHandler"
+              src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;cursor: pointer;"/>
+            <img :class="{domDisabled:flagDisabledNext,}" @click="clickNextHandler"
+              src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;margin-right: 13px;cursor: pointer;"/>
           </div>
         </div>
       </div>

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

@@ -11,6 +11,10 @@
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
             <img :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
+            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter" class="max-default w93"
+              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" style="margin-left: 10px;"
+              @click="fieldClickHandler(model.otherTradeActionRouter, $event)">
+            </component>
           </div>
           <div class="title-other">
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
@@ -19,8 +23,7 @@
             <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location"/>
           </div>
           <div class="title-tags">
-            <div class="t-tag"
-              v-for="(tag, index) in model.actionRouterLabel"  :key="index"
+            <div class="t-tag" v-for="(tag, index) in model.actionRouterLabel"  :key="index"
               :style="{ color: tag.textColor, backgroundColor: tag.bgColor,borderColor: tag.borderColor,}">
               {{ tag.label }}
             </div>
@@ -31,65 +34,33 @@
         </div>
         <div class="head-but">
           <div>
-            <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 :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
-              class="max-report w93"
+            <component class="max-report w93"
               v-if=" model.actionRouters !== null && model.actionRouters[0] !== null"
-              :is="model.actionRouters[0].is"
-              :vmodel="model.actionRouters[0]"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[0], $event)"
-            ></component>
-            <component
-              class="max-report w93"
-              v-if="
-                model.actionRouters !== null && model.actionRouters[1] !== null
-              "
-              :is="model.actionRouters[1].is"
-              :vmodel="model.actionRouters[1]"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[1], $event)"
-            ></component>
-          </div>
-          <div class="mt5">
-            <button type="button"
-              class="el-button el-button--info el-button--mini max-report rel w93"
+              :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi"
+              @click="fieldClickHandler(model.actionRouters[0], $event)"></component>
+            <component class="max-report w93"
+              v-if="model.actionRouters !== null && model.actionRouters[1] !== null"
+              :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi"
+              @click="fieldClickHandler(model.actionRouters[1], $event)"></component>
+            <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 v-for="(col, index) in model.actionRoutersMoreList"
-                  :key="index"
-                  v-if="col.show !== false">
-                  <component
-                    class="max-report w93"
-                    :is="col.is"
-                    :vmodel="col"
-                    :api="model.optionApi"
-                    @click="fieldClickHandler(col, $event)"
-                  ></component>
+                <li v-for="(col, index) in model.actionRoutersMoreList" :key="index" v-if="col.show !== false">
+                  <component class="max-report w93" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col, $event)"></component>
                 </li>
               </ul>
             </button>
-            <component
-              v-else-if=" model.actionRouters !== null && model.actionRouters.length === 3 "
-              class="max-report w93"
-              :is="model.actionRouters[2].is"
-              :vmodel="model.actionRouters[2]"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[2], $event)"
-            >
+            <component v-else-if=" model.actionRouters !== null && model.actionRouters.length === 3 " class="max-report w93"
+              :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi"
+              @click="fieldClickHandler(model.actionRouters[2], $event)">
             </component>
+            <img :class="{ domDisabled: flagDisabledPrev }" @click="clickPrevHandler"
+              src="../../../assets/T.png" alt=""
+              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 10px;cursor: pointer;"/>
+            <img :class="{ domDisabled: flagDisabledNext }" @click="clickNextHandler"
+              src="../../../assets/B.png" alt=""
+              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 10px; margin-right: 13px; cursor: pointer;"/>
           </div>
         </div>
       </div>
@@ -971,8 +942,7 @@ export default {
             };
             self.$common.openDialog(dialogOption);
           } 
-          else if (field.isFormPageInTab) {
-            // 外部框架tab页打开
+          else if (field.isFormPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
@@ -984,23 +954,19 @@ export default {
                 field.dialogWidth
               );
           } 
-          else if (field.isSearchPageInTab) {
-            // 外部框架tab页打开
+          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 {

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

@@ -63,7 +63,7 @@
                        @tableButtonClick="clickHandler"></component>
           </el-col>
         </el-row>
-        <el-row v-if="model.links.length > -1" style="margin-top: 8px;">
+        <el-row v-if="model.links.findIndex((v)=>{return v.show}).length > -1" style="margin-top: 8px;">
           <el-col :span="24" style="text-align:left">
             <component v-for="(btn, index) in model.links" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -22,12 +22,27 @@
             <span class="el-select__tags-text">{{item}}</span>
           </span>
         </span>
-        <label v-else class="ct-lable" :class="{ isWidth: model.labelValue.length > 30 }">
-		   <el-tooltip :content="model.labelValue" placement="top" effect="light" v-if="model.labelValue.length > 30">
-               <span :class="{ isEllipsis: model.labelValue.length > 30 }"> {{ model.labelValue }}</span>
-		   </el-tooltip>
-          <span v-else> {{ model.labelValue }}</span>
-        </label>
+          <div v-else style="display:inline-block">
+          <!-- --计算占用宽度-- -->
+          <div style="position: relative" v-if="isShowComput">
+            <label class="ct-lable" style="position: absolute; left: -10000px">
+              <span :ref="'computLabel' + model.index"> {{ model.labelValue }}</span>
+            </label>
+          </div>
+          <!-- 展示 -->
+          <label class="ct-lable" :style="{ display: (model.labelValue ? 'inline-flex' : '') }">
+            <el-tooltip placement="top" effect="light" :disabled="isShowTooltip">
+              <div slot="content" :style="{ 'width': (model.labelValue.length > 66 ? '400px' : 'auto') }">{{
+                  model.labelValue
+              }}</div>
+              <div class="isEllipsis" :style="{ display: (model.labelValue ? '-webkit-box' : 'none') }"
+                @mouseover="onMouseOver('refLabelValue' + model.index, model.index)">
+                <span :ref="'refLabelValue' + model.index">{{ model.labelValue
+                }}</span>
+              </div>
+            </el-tooltip>
+          </label>
+        </div>
         <span slot="suffix" v-if="model.unitName" class="ct-unitnameLable">{{model.unitName}}</span>
         <span v-if="model.sufLabel" style="width:auto" class="spanMessage">{{model.sufLabel}}</span>
       </div>
@@ -44,7 +59,9 @@
     },
     data() {
       return {
-      }
+	    isShowTooltip: true,// 是否需要禁止提示
+        isShowComput: false
+	  }
     },
     created() {
       if (typeof this.vmodel === 'undefined') {
@@ -54,19 +71,34 @@
         this.model = this.vmodel;
       }
       this.model.self=this;
+    },
+	 methods: {
+	 // 移入事件: 判断内容的宽度contentWidth是否大于父级的宽度
+     onMouseOver(str, index) {
+      this.isShowComput = true
+      this.$nextTick(function () {
+        if (this.model.labelValue.length > 0) {
+          let sumLabelItem = 'computLabel' + index;
+          let contentWidth = this.$refs[sumLabelItem].offsetWidth;
+          let parentWidth = this.$refs[str].parentNode.offsetWidth;
+          // 判断是否禁用tooltip功能
+          this.isShowTooltip = contentWidth <= parentWidth;
+		  this.isShowComput = false
+        }
+      });
     }
+	 }
 }
 </script>
 <style scoped>
 .isWidth {
-  width: 60%;
-  display: flex;
+  display: inline-flex;
 }
 .isEllipsis {
-  width: auto;
   overflow: hidden;
-  white-space: nowrap;
   text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
 }
 </style>

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

@@ -89,6 +89,9 @@
             this.$emit('search', this.model);
             break;
           default:
+            if (model.type === 15) {
+              this.$emit('clickHandler', model);
+            }
             break;
         }
 

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -36,14 +36,7 @@
       };
     },
     created() {
-      this.$watch('model.value', (n, o) => {
-        if (typeof this.model.child !== 'undefined') {
-          for (var item of this.model.child) {
-            item.value = item.defaultValue || '';
-            item.text = item.defaultText || '';
-          }
-        }
-      });
+     
     },
     mounted() {
       var self = this;
@@ -62,6 +55,14 @@
             self.load(data);
           });
         }
+        self.$watch('model.value', (n, o) => {
+          if (typeof self.model.child !== 'undefined') {
+            for (var item of self.model.child) {
+              item.value = item.defaultValue || '';
+              item.text = item.defaultText || '';
+            }
+          }
+        });
       });
     },
     methods: {