centaline-data-driven 1.3.13 → 1.3.16

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

@@ -76,13 +76,7 @@
               @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,
-              }"
+              :class="{ domDisabled: flagDisabledPrev }"
               @click="clickPrevHandler"
               src="../../../assets/T.png"
               alt=""
@@ -95,15 +89,7 @@
               "
             />
             <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,
-              }"
+              :class="{ domDisabled: flagDisabledNext }"
               @click="clickNextHandler"
               src="../../../assets/B.png"
               alt=""
@@ -184,7 +170,10 @@
           </div>
         </div>
       </div>
-      <div ref="detail" class="details-mid y-auto" @scroll="scrollHandle($event)"
+      <div
+        ref="detail"
+        class="details-mid y-auto"
+        @scroll="scrollHandle($event)"
         :style="{
           height: model.detailHeight ? model.detailHeight + 'px' : '780px',
         }"
@@ -335,24 +324,93 @@
           </div>
           <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()"
+              <!--计算占用宽度-->
+              <div style="position: relative">
+                <div ref="tabsbox" style="position: absolute; left: -10000px">
+                  <el-tabs>
+                    <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"
+                        :ref="'StatisticsItem' + index"
+                      ></div>
+                    </el-tab-pane>
+                  </el-tabs>
+                </div>
+              </div>
+              <!--展示-->
+              <div>
+                <div v-if="showData.length === 1">
+                  <el-tabs
+                    :value="model.activeIndex1"
+                    @tab-click="handleSelect"
+                  >
+                    <el-tab-pane
+                      v-for="(col, index) in showData[0]"
+                      :key="col.appID"
+                      :index="index.toString()"
+                      :name="index.toString()"
+                    >
+                      <div slot="label" v-html="col.appName"></div>
+                    </el-tab-pane>
+                  </el-tabs>
+                </div>
+                <div v-if="showData.length > 1" style="position: relative">
+                  <el-tabs
+                    :value="model.activeIndex1"
+                    @tab-click="handleSelect"
+                  >
+                    <el-tab-pane
+                      v-for="(col, index) in showData[0]"
+                      :key="col.appID"
+                      :index="index.toString()"
+                      :name="index.toString()"
+                    >
+                      <div slot="label" v-html="col.appName"></div>
+                    </el-tab-pane>
+                  </el-tabs>
+                  <div class="more-dropdown">
+                    <el-dropdown trigger="click" placement="bottom">
+                      <span class="el-dropdown-link">
+                        <div class="my-icon-more"></div>
+                      </span>
+                      <el-dropdown-menu slot="dropdown" class="tabsMore">
+                        <el-dropdown-item
+                          v-for="(col, index) in showData[1]"
+                          :key="col.appID"
+                          :index="index.toString()"
+                          :name="index.toString()"
+                          :class="{
+                            'is-active':
+                              showData[0].length + index == model.activeIndex1,
+                          }"
+                        >
+                          <span
+                            @click="handleDropDown(col, index)"
+                            :value="model.activeIndex1"
+                            >{{ col.appName }}</span
+                          ></el-dropdown-item
+                        >
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </div>
+                </div>
+                <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"
                 >
-                  <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>
+              </div>
             </div>
           </div>
           <div
@@ -657,11 +715,48 @@ export default {
       allIn: false,
       refershKey: 0,
       listKey: 0,
+      flagDisabledPrev: false,
+      flagDisabledNext: false,
+      showData: [],
+      FlagStatistics: false,
+      dropDownSelected: false,
     };
   },
   mounted() {
     var self = this;
+    this.$watch(
+      "$refs.main.model.midlWidth",
+      function (newVal, oldVal) {
+        // 做点什么
+        if (oldVal != undefined) {
+          self.showStats();
+        }
+      },
+      {
+        deep: true,
+      }
+    );
     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") {
@@ -677,6 +772,47 @@ export default {
     });
   },
   methods: {
+    showStats() {
+      var self = this;
+      this.$nextTick(function () {
+        if (self.model.tags1.length > 0) {
+          var showIndex = 0;
+          var sumWidth = 0;
+          for (var i = 0; i < self.model.tags1.length; i++) {
+            var moreWidth = 22;
+
+            sumWidth =
+              sumWidth +
+              self.$refs["StatisticsItem" + i][0].offsetParent.offsetWidth;
+            var nextWidth = 0;
+            if (i + 1 < self.model.tags1.length) {
+              try {
+                nextWidth =
+                  self.$refs["StatisticsItem" + (i + 1)][0].offsetParent
+                    .offsetWidth;
+              } catch (e) {}
+            } else {
+              moreWidth = 0;
+            }
+            if (self.model.midlWidth - 42 < sumWidth + moreWidth) {
+              showIndex = i;
+              break;
+            } else if (self.model.midlWidth - 42 < nextWidth + moreWidth) {
+              showIndex = i + 1;
+              break;
+            }
+          }
+          if (showIndex > 0) {
+            self.showData = [
+              self.model.tags1.slice(0, showIndex),
+              self.model.tags1.slice(showIndex),
+            ];
+          } else {
+            self.showData = [self.model.tags1];
+          }
+        }
+      });
+    },
     load(data) {
       var self = this;
       this.model = data;
@@ -702,6 +838,7 @@ export default {
           }
         }
       }
+
       this.loadOperation();
       this.loadCommission();
       this.setDetailHeight();
@@ -779,6 +916,7 @@ export default {
           var w1 = this.$refs.detail.clientWidth | 0;
           var w2 = this.$refs.midr.clientWidth | 0;
           this.model.midlWidth = w1 - w2 - 10;
+          this.showStats();
         }
       });
     },
@@ -795,6 +933,21 @@ export default {
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
     },
+    handleDropDown(key, index) {
+      let i = index;
+      this.model.activeIndex1 = (this.showData[0].length + i).toString();
+      let dropDownData = this.showData[1];
+
+      this.dropDownSelected = true;
+      if (dropDownData && dropDownData[i]) {
+        this.listKey = this.listKey + 1;
+        this.model.searchConditionApiTags1 =
+          dropDownData[i].searchConditionApiUrl || "";
+        this.model.searchDataApiTags1 = dropDownData[i].searchDataApiUrl || "";
+        this.model.paramDataTags1 = dropDownData[i].paramData || "";
+        window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
+      }
+    },
     fieldClickHandler(field) {
       var self = this;
       var callBack = null;
@@ -981,37 +1134,58 @@ export default {
     clickNextHandler() {
       let key = "chanceID";
       if (this.parentModel && this.parentModel.$refs.table) {
-        let oldValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
+        let oldValue =
+          this.parentModel.$refs.table.model.listData[
+            this.parentModel.$refs.table.model.selectIndex
+          ][key];
         this.parentModel.$refs.table.rowKeyDownHandle(null, 1);
-        let newValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
+        let newValue =
+          this.parentModel.$refs.table.model.listData[
+            this.parentModel.$refs.table.model.selectIndex
+          ][key];
         if (oldValue !== newValue) {
           let parm = this.$common.cloneObject(this.apiParam);
           parm[key] = newValue;
           // this.loaderObj.Detail(this.api, parm, this.load);
-          this.$common.getDataDrivenOpts().handler.refreshPropertyDetailRET(parm,this.parentModel);
+          this.$common
+            .getDataDrivenOpts()
+            .handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
         }
       }
     },
     clickPrevHandler() {
       let key = "chanceID";
       if (this.parentModel && this.parentModel.$refs.table) {
-        let oldValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
+        let oldValue =
+          this.parentModel.$refs.table.model.listData[
+            this.parentModel.$refs.table.model.selectIndex
+          ][key];
         this.parentModel.$refs.table.rowKeyDownHandle(null, -1);
-        let newValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
+        let newValue =
+          this.parentModel.$refs.table.model.listData[
+            this.parentModel.$refs.table.model.selectIndex
+          ][key];
         if (oldValue !== newValue) {
           let parm = this.$common.cloneObject(this.apiParam);
           parm[key] = newValue;
           // this.loaderObj.Detail(this.api, parm, this.load);
-          this.$common.getDataDrivenOpts().handler.refreshPropertyDetailRET(parm,this.parentModel);
+          this.$common
+            .getDataDrivenOpts()
+            .handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
         }
       }
     },
-    scrollHandle(ev) {   
-      this.$emit('scrollHandle',this.$refs.detail.scrollTop,this.$refs.detail.scrollLeft)
+    scrollHandle(ev) {
+      this.$emit(
+        "scrollHandle",
+        this.$refs.detail.scrollTop,
+        this.$refs.detail.scrollLeft
+      );
       ev.cancelBubble = true;
       ev.stopPropagation();
     },
   },
+  watch: {},
 };
 </script>
 <style lang="scss" scoped>
@@ -1722,6 +1896,67 @@ export default {
 .r {
   float: right;
 }
+.my-icon-more {
+  width: 14px;
+  height: 15px;
+  border-top: 3px solid rgb(153, 153, 153);
+  border-bottom: 3px solid rgb(153, 153, 153);
+  background-color: rgb(153, 153, 153);
+  padding: 3px 0;
+  background-clip: content-box;
+}
+// .popovertablf span {
+//   display: inline-block;
+// }
+// .popoverbtnTab {
+//   font-size: 14px !important;
+//   font-weight: bold;
+//   cursor: pointer;
+//   float: left;
+//   list-style-type: none;
+//   padding: 0px 20px 0px 20px;
+// }
+// .popoverbtnTab:hover,
+// .popovertablf:hover {
+//   color: #ee5d56;
+// }
+>>> .el-tabs__nav-prev {
+  display: none;
+}
+>>> .el-tabs__nav-next {
+  display: none;
+}
+.more-dropdown {
+  position: absolute;
+  width: 16px;
+  height: 20px;
+  text-align: left;
+  top: 13px;
+  right: -2px;
+}
+.el-dropdown-menu--mini .el-dropdown-menu__item {
+  font-size: 14px;
+  font-weight: 700;
+  color: #303133;
+}
+.el-dropdown-menu__item:focus,
+.el-dropdown-menu__item:not(.is-disabled):hover {
+  background-color: #fff;
+  color: #ff503f;
+  border-bottom: 3px solid #ff503f;
+}
+.tabsMore .is-active {
+  cursor: pointer;
+  background-color: #fff;
+  color: #ff503f;
+  border-bottom: 3px solid #ff503f;
+}
+>>> .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+>>> .el-tabs--bottom .el-tabs__item.is-top:last-child,
+>>> .el-tabs--top .el-tabs__item.is-bottom:last-child,
+>>> .el-tabs--top .el-tabs__item.is-top:last-child {
+  padding-right: 15px;
+}
 </style>
 
 

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

@@ -10,7 +10,7 @@
         <!--头部元素-->
         <el-row v-if="collapseFieldsRow.length > 0">
           <el-col v-for="(col, index) in collapseFieldsRow[0]" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :from="'form'"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                        @input="inputHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler"
@@ -24,7 +24,7 @@
                        v-for="(item, index) in collapse" v-if="item.show !== false" :key="index">
             <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">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
@@ -35,7 +35,7 @@
         </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>
@@ -43,7 +43,7 @@
             </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">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
@@ -56,7 +56,7 @@
         <!--尾部元素-->
         <el-row v-if="independentItem.length > 0" style="margin-top: 20px;">
           <el-col v-for="(col, index) in independentItem" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
                        @input="inputHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler"
@@ -681,7 +681,7 @@
           }
         }
         return submitData;
-      },  
+      },
     }
   }
 </script>
@@ -689,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/dynamicForm/src/dynamicFormListTable.vue

@@ -94,7 +94,8 @@
     },
     props: {
       vmodel: Object,
-      api: String
+      api: String,
+      parentModel: Object,
     },
     data() {
       return {
@@ -107,6 +108,7 @@
       let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;
+      this.model.$self=self;
 
       this.$nextTick(function () {
         self.model.refField = this.$refs.Fields;

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

@@ -69,7 +69,7 @@
         </div>
         <el-popover
           :append-to-table="option.appendId ? option.appendId : ''"
-          class="Stats-popover"
+          class="Stats-popover more-dropdown"
           popper-class="el-popover1"
           :placement="option.placement ? option.placement : 'left'"
           :trigger="option.trigger ? option.trigger : ''"
@@ -107,7 +107,12 @@
               <br />
             </div>
           </div>
-          <span slot="reference" class="icon-more"></span>
+          <!-- <span slot="reference" class="icon-more"></span> -->
+          <span
+            slot="reference"
+            style="font-family: Comic Sans MS; font-size: 14px"
+            ><div class="my-icon-more"></div
+          ></span>
         </el-popover>
       </template>
     </div>
@@ -346,6 +351,20 @@ export default {
   margin-left: 4px;
   height: 16px;
 }
+.more-dropdown {
+  position: absolute;
+  top: 2px;
+}
+.my-icon-more {
+  width: 14px;
+  height: 15px;
+  border-top: 3px solid rgb(153, 153, 153);
+  border-bottom: 3px solid rgb(153, 153, 153);
+  background-color: rgb(153, 153, 153);
+  padding: 3px 0;
+  background-clip: content-box;
+  margin-left: 5px;
+}
 </style>
 <style>
 .el-popover1 {

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -23,8 +23,8 @@
                 <div
                   style="
                     padding: 0 10px !important;
-                    height: 30px;
-                    line-height: 30px;
+                    height: 30px !important;
+                    line-height: 30px !important;
                   "
                 >
                   {{ group.albumName }}
@@ -51,12 +51,12 @@
         >
           <!--VR-->
           <template v-if="itemFile.mediaTypeID == '1'">
-              <iframe 
-                :src="resultObject"
-                :height="displayAreaHeight - 80 + 'px'"
-                :width="displayAreaWidth + 'px'"
-              >
-              </iframe>
+            <iframe
+              :src="resultObject"
+              :height="displayAreaHeight - 80 + 'px'"
+              :width="displayAreaWidth + 'px'"
+            >
+            </iframe>
           </template>
           <!--Photo-->
           <template v-else-if="itemFile.mediaTypeID == '2'">
@@ -460,13 +460,13 @@ html {
 .magnify-btn-close:hover {
   color: #fff;
 }
-.viewerMenu{
+.viewerMenu {
   border-right: solid 2px #e6e6e6 !important;
 }
 .viewerMenu .el-submenu__title,
-.viewerMenu .el-submenu .el-menu-item {
-  height: 30px;
-  line-height: 30px;
+.viewerMenu .el-menu-item {
+  height: 30px !important;
+  line-height: 30px !important;
 }
 .viewerMenu .el-menu-item-group__title {
   line-height: 1px;