centaline-data-driven 1.3.11 → 1.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "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/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/dynamicForm/src/dynamicForm.vue

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

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 {

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

@@ -1,284 +1,354 @@
 <template>
   <div class="ct-table-Statistics" ref="tableStatistics">
-
     <!--计算占用宽度-->
-    <div style="position:relative" v-if="FlagStatistics">
-      <div style="position:absolute;left:-10000px" class="tab-list">
-        <label v-for="(item, index) in data" class="btnTab" :ref="'StatisticsItem'+index">
-          {{item.controlLabel}}
+    <div style="position: relative" v-if="FlagStatistics">
+      <div style="position: absolute; left: -10000px" class="tab-list">
+        <label
+          v-for="(item, index) in data"
+          class="btnTab"
+          :ref="'StatisticsItem' + index"
+        >
+          {{ item.controlLabel }}
         </label>
       </div>
     </div>
     <!--展示-->
     <div v-if="FlagStatistics" class="tab-list">
-      <template v-if="showData.length===1">
-        <div v-for="(item, index) in showData[0]" @click="handleClick($event,item)">
+      <template v-if="showData.length === 1">
+        <div
+          v-for="(item, index) in showData[0]"
+          @click="handleClick($event, item)"
+        >
           <ul class="btnTab">
-            <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
+            <li
+              :class="[
+                selectStats == item.code1 + '*' + item.controlLabel
+                  ? 'activecolor'
+                  : '',
+              ]"
+            >
+              {{ item.controlLabel }}
+            </li>
             <li class="tdcenter">
-              <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
+              <span
+                :class="[
+                  selectStats == item.code1 + '*' + item.controlLabel
+                    ? 'active'
+                    : '',
+                ]"
+              ></span>
             </li>
           </ul>
         </div>
       </template>
-      <template v-else-if="showData.length>1">
-        <div v-for="(item, index) in showData[0]" @click="handleClick($event,item)">
+      <template v-else-if="showData.length > 1">
+        <div
+          v-for="(item, index) in showData[0]"
+          @click="handleClick($event, item)"
+        >
           <ul class="btnTab">
-            <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
+            <li
+              :class="[
+                selectStats == item.code1 + '*' + item.controlLabel
+                  ? 'activecolor'
+                  : '',
+              ]"
+            >
+              {{ item.controlLabel }}
+            </li>
             <li class="tdcenter">
-              <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
+              <span
+                :class="[
+                  selectStats == item.code1 + '*' + item.controlLabel
+                    ? 'active'
+                    : '',
+                ]"
+              ></span>
             </li>
           </ul>
         </div>
-        <el-popover :append-to-table="option.appendId?option.appendId:''" class="Stats-popover" popper-class="el-popover1"
-                    :placement="option.placement?option.placement:'left'"
-                    :trigger="option.trigger?option.trigger:''">
-          <div v-if="FlagStatistics" class="tab-list" style="border-bottom:none">
-            <div class="popovertablf" v-for="(item, index) in showData[1]" @click="handleClick($event,item)">
-              <ul class="popoverbtnTab" style="padding:0px">
-                <li :class="[selectStats==item.code1+'*'+item.controlLabel?'activecolor':'']">{{item.controlLabel}}</li>
+        <el-popover
+          :append-to-table="option.appendId ? option.appendId : ''"
+          class="Stats-popover"
+          popper-class="el-popover1"
+          :placement="option.placement ? option.placement : 'left'"
+          :trigger="option.trigger ? option.trigger : ''"
+        >
+          <div
+            v-if="FlagStatistics"
+            class="tab-list"
+            style="border-bottom: none"
+          >
+            <div
+              class="popovertablf"
+              v-for="(item, index) in showData[1]"
+              @click="handleClick($event, item)"
+            >
+              <ul class="popoverbtnTab" style="padding: 0px">
+                <li
+                  :class="[
+                    selectStats == item.code1 + '*' + item.controlLabel
+                      ? 'activecolor'
+                      : '',
+                  ]"
+                >
+                  {{ item.controlLabel }}
+                </li>
                 <li class="tdcenter">
-                  <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
+                  <span
+                    :class="[
+                      selectStats == item.code1 + '*' + item.controlLabel
+                        ? 'active'
+                        : '',
+                    ]"
+                  ></span>
                 </li>
               </ul>
               <br />
             </div>
           </div>
           <span slot="reference" class="icon-more"></span>
-
         </el-popover>
       </template>
     </div>
   </div>
 </template>
 <script>
-  import dynamicElement from '../../mixins/dynamicElement';
+import dynamicElement from "../../mixins/dynamicElement";
 
-  export default {
-    name: 'ct-tableStatistics',
-    mixins: [dynamicElement],
-    props: {
-      api: String,
-      searchModel: Object,
-    },
-    data() {
-      return {
-        FlagStatistics: false,
-        showWidth: 0,
-        selectStats: [],
-        data: [],
-        showData: [],
-        option: {
-          isHidden: true,//是否开启操作栏隐藏设置，默认开启
-          showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
-          appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
-          trigger: 'hover',//触发方式，传值可查看Popper UI组件trigger属性
-          placement: 'bottom-start'//方向，传值可查看Popper UI组件placement属性
-        },
+export default {
+  name: "ct-tableStatistics",
+  mixins: [dynamicElement],
+  props: {
+    api: String,
+    searchModel: Object,
+  },
+  data() {
+    return {
+      FlagStatistics: false,
+      showWidth: 0,
+      selectStats: [],
+      data: [],
+      showData: [],
+      option: {
+        isHidden: true, //是否开启操作栏隐藏设置，默认开启
+        showNum: 3, //如果isHidden为true时，个数大于3就会隐藏，默认是3
+        appendId: "", //将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+        trigger: "hover", //触发方式，传值可查看Popper UI组件trigger属性
+        placement: "bottom-start", //方向，传值可查看Popper UI组件placement属性
+      },
+    };
+  },
+  mounted() {
+    var self = this;
+    self.showWidth =
+      self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
+    window.onresize = () => {
+      self.showWidth =
+        self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
+    };
+  },
+  methods: {
+    load(data) {
+      var self = this;
+      self.model = data;
+      self.FlagStatistics = false;
+      self.data = data.source.content;
+      self.selectVa = "";
+      if (self.data.length > 0) {
+        let i = self.data.findIndex(
+          (v) => self.selectStats === v.code1 + "*" + v.controlLabel
+        );
+
+        if (i == -1 || self.selectStats == []) {
+          self.selectStats =
+            self.data[0].code1 + "*" + self.data[0].controlLabel;
+        }
+        self.FlagStatistics = true;
+        self.showStats();
       }
     },
-    mounted() {
+    showStats() {
       var self = this;
-      self.showWidth = self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
-      window.onresize = () => {
-        self.showWidth = self.$refs.tableStatistics.offsetWidth || document.body.clientWidth;
-      };
-    },
-    methods: {
-      load(data) {
-        var self = this;
-        self.model = data;
-        self.FlagStatistics = false;
-        self.data = data.source.content;
-        self.selectVa = "";
+      this.$nextTick(function () {
         if (self.data.length > 0) {
-          let i = self.data.findIndex(v => self.selectStats === (v.code1 + "*" + v.controlLabel));
-
-          if (i == -1 || self.selectStats == []) {
-            self.selectStats = self.data[0].code1 + "*" + self.data[0].controlLabel;
-          }
-          self.FlagStatistics = true;
-          self.showStats();
-        }
-      },
-      showStats() {
-        var self = this;
-        this.$nextTick(function () {
-          if (self.data.length > 0) {
-            var showIndex = 0;
-            var sumWidth = 0;
-            for (var i = 0; i < self.data.length; i++) {
-              var moreWidth = 20;
-              sumWidth = sumWidth + self.$refs["StatisticsItem" + i][0].offsetWidth;
-              var nextWidth = 0;
-              if (i + 1 < self.data.length) {
-                try {
-                  nextWidth = self.$refs["StatisticsItem" + (i + 1)][0].offsetWidth;
-                } catch (e) {
-
-                }
-              }
-              else {
-                moreWidth = 0;
-              }
-              if (self.showWidth < (sumWidth + moreWidth)) {
-                showIndex = i;
-                break;
-              }
-              else if (self.showWidth < (nextWidth + moreWidth)) {
-                showIndex = i + 1;
-                break;
-              }
-            }
-            if (showIndex > 0) {
-              self.showData = [self.data.slice(0, showIndex), self.data.slice(showIndex)];
+          var showIndex = 0;
+          var sumWidth = 0;
+          for (var i = 0; i < self.data.length; i++) {
+            var moreWidth = 20;
+            sumWidth =
+              sumWidth + self.$refs["StatisticsItem" + i][0].offsetWidth;
+            var nextWidth = 0;
+            if (i + 1 < self.data.length) {
+              try {
+                nextWidth =
+                  self.$refs["StatisticsItem" + (i + 1)][0].offsetWidth;
+              } catch (e) {}
             } else {
-              self.showData = [self.data];
+              moreWidth = 0;
+            }
+            if (self.showWidth < sumWidth + moreWidth) {
+              showIndex = i;
+              break;
+            } else if (self.showWidth < nextWidth + moreWidth) {
+              showIndex = i + 1;
+              break;
             }
-
-          }
-
-          self.$emit('setTableHeight');
-        });
-      },
-      handleClick(ev, obj) {
-        var self = this;
-        self.selectStats = obj.code1 + "*" + obj.controlLabel;
-        var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.searchOperation, obj.searchDataType);
-        var model = {
-          "searchData": fields
-        };
-        self.$emit('searchStats', model);
-      },
-      searchStatsComplate(selectItem) {
-        var self = this;
-        this.$nextTick(function () {
-          if (typeof self.api !== 'undefined') {
-            self.loaderObj.SearchStats(self.api, self.load, this.searchModel);
-          }
-          if (typeof self.source !== 'undefined') {
-            self.load(self.loaderObj.SearchStats(self.source));
           }
-          if (self.vmodel) {
-            self.load(self.vmodel);
+          if (showIndex > 0) {
+            self.showData = [
+              self.data.slice(0, showIndex),
+              self.data.slice(showIndex),
+            ];
+          } else {
+            self.showData = [self.data];
           }
-        });
-      }
+        }
+
+        self.$emit("setTableHeight");
+      });
     },
-    watch: {
-      showWidth: function (newVal, oldVal) {
-        this.showStats();
-      }
-    }
-  }
+    handleClick(ev, obj) {
+      var self = this;
+      self.selectStats = obj.code1 + "*" + obj.controlLabel;
+      var fields = self.model.searchData(
+        obj.fieldName1,
+        obj.code1,
+        obj.searchOperation,
+        obj.searchDataType
+      );
+      var model = {
+        searchData: fields,
+      };
+      self.$emit("searchStats", model);
+    },
+    searchStatsComplate(selectItem) {
+      var self = this;
+      this.$nextTick(function () {
+        if (typeof self.api !== "undefined") {
+          self.loaderObj.SearchStats(self.api, self.load, this.searchModel);
+        }
+        if (typeof self.source !== "undefined") {
+          self.load(self.loaderObj.SearchStats(self.source));
+        }
+        if (self.vmodel) {
+          self.load(self.vmodel);
+        }
+      });
+    },
+  },
+  watch: {
+    showWidth: function (newVal, oldVal) {
+      this.showStats();
+    },
+  },
+};
 </script>
 <style>
 </style>
 
 <style>
-.ct-table-Statistics{
+.ct-table-Statistics {
   height: 20px;
   margin-bottom: 10px;
 }
-  .tab-list {
-    position: relative;
-    margin-bottom: 10px;
-    height: 30px;
-  }
-
-    .tab-list .btnTab {
-      font-size: 14px !important;
-      font-weight: bold;
-      padding: 0px 20px 0px 20px;
-      cursor: pointer;
-      float: left;
-      list-style-type: none;
-    }
-
-      .tab-list .btnTab:hover, .tab-list .tablf:hover {
-        color: #ee5d56;
-      }
-
-    .tab-list .popoverbtnTab:hover, .tab-list .popovertablf:hover {
-      color: #ee5d56;
-    }
-
-    .tab-list .tabl-el {
-      max-width: 150px;
-      box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
-    }
-
-    .tab-list .tablf {
-      font-size: 14px !important;
-      font-weight: bold;
-      text-align: center;
-      padding: 15px 10px;
-      display: block;
-    }
+.tab-list {
+  position: relative;
+  margin-bottom: 10px;
+  height: 30px;
+}
 
-    .tab-list .popovertablf {
-      font-size: 14px !important;
-      font-weight: bold;
-      text-align: center;
-      display: block;
-      padding: 5px 8px;
-    }
+.tab-list .btnTab {
+  font-size: 14px !important;
+  font-weight: bold;
+  padding: 0px 20px 0px 20px;
+  cursor: pointer;
+  float: left;
+  list-style-type: none;
+}
 
-    .tab-list .popoverbtnTab {
-      font-size: 14px !important;
-      font-weight: bold;
-      cursor: pointer;
-      float: left;
-      list-style-type: none;
-      padding: 0px 20px 0px 20px;
-    }
+.tab-list .btnTab:hover,
+.tab-list .tablf:hover {
+  color: #ee5d56;
+}
 
-    .tab-list .tdcenter {
-      line-height: 1px;
-      height: 1px;
-      text-align: center;
-    }
+.tab-list .popoverbtnTab:hover,
+.tab-list .popovertablf:hover {
+  color: #ee5d56;
+}
 
-    .tab-list .active {
-      color: #ee5d56 !important;
-      /* border-bottom-right-radius: 12px !important; */
-      /* border-top-right-radius: 11px; */
-      width: 20px;
-      border-bottom: #ee5d56 solid 3px;
-    }
+.tab-list .tabl-el {
+  max-width: 150px;
+  box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
+}
 
+.tab-list .tablf {
+  font-size: 14px !important;
+  font-weight: bold;
+  text-align: center;
+  padding: 15px 10px;
+  display: block;
+}
 
+.tab-list .popovertablf {
+  font-size: 14px !important;
+  font-weight: bold;
+  text-align: center;
+  display: block;
+  padding: 5px 8px;
+}
 
-    .tab-list .activecolor {
-      color: #ee5d56 !important;
-    }
+.tab-list .popoverbtnTab {
+  font-size: 14px !important;
+  font-weight: bold;
+  cursor: pointer;
+  float: left;
+  list-style-type: none;
+  padding: 0px 20px 0px 20px;
+}
 
-    .tab-list .btnTab span, .tab-list .popovertablf span {
-      display: inline-block;
-    }
+.tab-list .tdcenter {
+  line-height: 1px;
+  height: 1px;
+  text-align: center;
+}
 
+.tab-list .active {
+  color: #ee5d56 !important;
+  /* border-bottom-right-radius: 12px !important; */
+  /* border-top-right-radius: 11px; */
+  width: 20px;
+  border-bottom: #ee5d56 solid 3px;
+}
 
+.tab-list .activecolor {
+  color: #ee5d56 !important;
+}
 
-    .tab-list .icon-more {
-      color: #ee5d56;
-      font-size: 20px;
-      font-weight: 900;
-      display: inline-block;
-      vertical-align: 0.5em;
-      margin-top: -3px;
-      cursor: pointer;
-    }
+.tab-list .btnTab span,
+.tab-list .popovertablf span {
+  display: inline-block;
+}
 
-   .Stats-popover {
-    float: left;
-    margin-top: 4px;
-    margin-left: 4px;
-    height: 16px;
-  }
+.tab-list .icon-more {
+  color: #ee5d56;
+  font-size: 20px;
+  font-weight: 900;
+  display: inline-block;
+  vertical-align: 0.5em;
+  margin-top: -3px;
+  cursor: pointer;
+}
 
+ .Stats-popover {
+  /* float: left; */
+  /* margin-top: 4px; */
+  margin-left: 4px;
+  height: 16px;
+}
 </style>
 <style>
-  .el-popover1 {
-    min-width: inherit !important;
-  }
+.el-popover1 {
+  min-width: inherit !important;
+}
 </style>

package/src/centaline/loader/src/ctl/SearchTable.js

@@ -571,7 +571,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       },
       getCurrentRowApiData(callback, rtnData, router,cellindex) {
         var self = this;
-        var searchFields = this.searchModel ? this.searchModel.searchData : { fields: [] };
+        var searchFields = { fields: [] };//this.searchModel ? this.searchModel.searchData : { fields: [] };
         var searchValue1 = router.flagAddRowAfterAction ? rtnData.responseData.content : rtn.listData[rtn.selectIndex][self.primaryKey];
         if (self.primaryKey) {
           searchFields.fields.push({