centaline-data-driven 1.2.36 → 1.2.39

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

@@ -4,26 +4,47 @@
     <!--计算占用宽度-->
     <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">
-         <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>111
+        <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">
-        <label class="btnTab" v-for="(item, index) in showData[0]"  @click="handleClick($event,item)">
-          <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
+        <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="tdcenter">
+              <span :class="[selectStats==item.code1+'*'+item.controlLabel?'active':'']"></span>
+            </li>
+          </ul>
+        </div>
       </template>
       <template v-else-if="showData.length>1">
-        <label class="btnTab" v-for="(item, index) in showData[0]"  @click="handleClick($event,item)">
-         <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
-        <el-popover :append-to-table="option.appendId?option.appendId:''"
+        <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="tdcenter">
+              <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:''"
-                    class="tabl-el">
-          <label class="tablf" v-for="(item, index) in showData[1]"  @click="handleClick($event,item)">
-          <span :class="[selectStats==item.code1?'active':'']">{{item.controlLabel}}</span></label>
-          <i slot="reference" class="icon-more"></i>
+                    :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>
+                </li>
+              </ul>
+              <br />
+            </div>
+          </div>
+          <sapn slot="reference" class="icon-more">⋮</sapn>
 
         </el-popover>
       </template>
@@ -50,7 +71,7 @@
         option: {
           isHidden: true,//是否开启操作栏隐藏设置，默认开启
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
-          appendId: '.s-table',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+          appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'hover',//触发方式，传值可查看Popper UI组件trigger属性
           placement: 'bottom-start'//方向，传值可查看Popper UI组件placement属性
         },
@@ -71,8 +92,10 @@
         self.data = data.source.content;
         self.selectVa = "";
         if (self.data.length > 0) {
-          if (self.selectStats == []) {
-            self.selectStats = self.data[0].code1;
+          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();
@@ -115,12 +138,12 @@
 
           }
 
- self.$emit('setTableHeight');
+          self.$emit('setTableHeight');
         });
       },
       handleClick(ev, obj) {
         var self = this;
-        self.selectStats = obj.code1;
+        self.selectStats = obj.code1 + "*" + obj.controlLabel;
         var fields = self.model.searchData(obj.fieldName1, obj.code1, obj.searchOperation, obj.searchDataType);
         var model = {
           "searchData": fields
@@ -152,51 +175,103 @@
 <style>
 </style>
 
-<style> 
+<style>
   .tab-list {
-    border-bottom: 2px solid #E0E0E0;
+    position: relative;
     margin-bottom: 10px;
-        padding-bottom: 5px;
+    height: 30px;
   }
 
-  .tab-list .btnTab {
-    font-size: 14px !important;
-    font-weight: bold;
-    padding: 0px 20px 0px 20px;
- 
+    .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 .btnTab:hover ,.tab-list .tablf:hover{
+    .tab-list .popoverbtnTab:hover, .tab-list .popovertablf:hover {
       color: #ee5d56;
     }
-    .tab-list .tabl-el{
+
+    .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: 5px 10px;
-    display: block;
-  }
- .tab-list .active {
-    color: #ee5d56 !important;
-    border-bottom: solid 3px #ee5d56 !important;
-    background: none; 
-    border-radius: 0 !important;
-  }
-  .tab-list .btnTab span{
- 
-  }
 
- .tab-list .icon-more {
-    background: url(../../../assets/vertical.png)no-repeat;
-    background-size: 80% 80%;
-    height: 20px;
-    width: 7px;
-    display: inline-block;
-    vertical-align: bottom;
+    .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 .popoverbtnTab {
+      font-size: 14px !important;
+      font-weight: bold;
+      cursor: pointer;
+      float: left;
+      list-style-type: none;
+      padding: 0px 20px 0px 20px;
+    }
+
+    .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 .btnTab span, .tab-list .popovertablf span {
+      display: inline-block;
+    }
+
+
+
+    .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 {
+    position: absolute;
+    right: 5px;
+  }
+</style>
+<style>
+  .el-popover1 {
+    min-width: inherit !important;
   }
 </style>

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

@@ -57,6 +57,7 @@
     methods: {
       load(data) {
         this.model = data;
+        this.model.self = this;
       },
       clearClickHandle: function (event) {
         this.model.value = '';

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="field-top">
-    <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
-         @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+    <div style="width:100%;display:flex;">
+    <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div"  style="flex:1;"
+    :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
+    @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
@@ -19,13 +21,14 @@
       </el-input>
 
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
-      <transition name="el-fade-in" class="ct-flex-div-span">
-        <span v-show="!valid" class="errorMessage ">
-          {{validMessage}}
-        </span>
-      </transition>
       <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @click="model.value=$event"></ctQuickInputSos>
     </div>
+    <transition name="el-fade-in" class="ct-flex-div-span">
+      <span v-show="!valid" class="errorMessage ">
+        {{validMessage}}
+      </span>
+    </transition>
+  </div>
   </div>
 </template>
 <script>
@@ -34,7 +37,7 @@
   export default {
     name: 'ct-text',
     mixins: [dynamicElement],
-     components: {
+    components: {
       'ctQuickInputSos': ctQuickInputSos,
     },
     props: {

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

@@ -0,0 +1,241 @@
+import base from '../../index';
+import LibFunction from './lib/LibFunction';
+import common from '../../../common/index';
+import Router from './Router';
+import Enum from './lib/Enum';
+import Vue from 'vue';
+
+const Repeat = function (source, master, isFormList) {
+  var rtn = {
+    form: null,
+    refField: Object,
+    refFieldsLabel: Object,
+    get id() {
+      return source.name;
+    },
+    get type() {
+      return master.controlType;
+    },
+    get label() {
+      return master.dn || '';
+    },
+    get source() {
+      return source;
+    },
+    get master() {
+      return master;
+    },
+    get title() {
+      return master.controlLabel || '';
+    },
+    get show() {
+      if (typeof master.show !== "undefined") {
+        return master.show;
+      }
+      return true;
+    },
+    get create() {
+      return source.rightNew === true;
+    },
+    get required() {
+      return master.required;
+    },
+    set required(v) {
+      master.required = false;
+    },
+    get primaryKeys() {
+      return source.primaryKeys;
+    },
+    //get rowEdit() {
+    //  return source.editMode !== true;
+    //},
+    get dialogEdit() {
+      return source.editMode === 1;
+    },
+    get showSummary() {
+      return source.totalCols.length > 0;
+    },
+    get totalColTitle() {
+      return source.totalColTitle;
+    },
+    get totalCols() {
+      return source.totalCols;
+    },
+    set tableDisabled(v) {
+      source.disabled = v;
+    },
+    get tableDisabled() {
+      return source.disabled || false;
+    },
+    getFormObj() {
+      let rtnFormArr = [];
+      for (let i = 0; i < rtn.tableData.length; i++) {
+        let rtnFormObj = {};
+        rtn.tableData[i].field.forEach((s) => {
+          Object.assign(rtnFormObj, s.getFormObj());
+        });
+        rtnFormObj.flagDeleted = rtn.tableData[i].deleted;
+        rtnFormObj.flagNew = rtn.tableData[i].isNewFlag;
+        rtnFormArr.push(rtnFormObj);
+      }
+
+      let rtnObj = {};
+      Object.defineProperty(rtnObj, master.fieldName1, {
+        get: function () {
+          return rtnFormArr;
+        },
+        enumerable: true,
+        configurable: true
+      });
+      console.log(rtnObj);
+      return rtnObj;
+    },
+    _buttons: null,
+    get buttons() {
+      if (rtn._buttons !== null) {
+        return rtn._buttons;
+      }
+      else {
+        rtn._buttons = [];
+        if (source.actionRouters) {
+          source.actionRouters.forEach((v) => {
+            var button = Router(v);
+            button.is = "ct-btn";
+            rtn._buttons.push(button);
+          });
+        }
+        return rtn._buttons;
+      }
+    },
+    _rows: null,
+    get rows() {
+
+      if (this._rows) {
+        return this._rows;
+      }
+      else {
+        this._rows = [];
+        //遍历每一行
+        source.rows.forEach((r) => {
+          var row = rtn.initRow(r);
+          this._rows.push(row);
+        });
+        return this._rows;
+      }
+    },
+    initRow(r) {
+      var row = {
+        field: [],
+        get delete() {//删除权限
+          return r.rightDelete === true;
+        },
+        get edit() {
+          return r.rightEdit === true;
+        },
+        get deleted() {//是否已删除
+          return r.flagDeleted === true;
+        },
+        set deleted(v) {
+          if (v) {
+            r.flagDeleted = true;
+          }
+          else {
+            r.flagDeleted = false;
+          }
+        },
+        get guid() {
+          return rtn.guid();
+        },
+        set guid(v) {
+          r.guid = v;
+        },
+      };
+      //遍历每一列
+      let rowIndex = 0;
+      //for (var key in source.fields) {
+      r.columns.forEach((value) => {
+        //let value = source.fields[key];
+        value.onChanged = value.onChange ? value.onChange : source.rows[0].columns[rowIndex].onChanged;//事件使用第一条的
+        value.onBlur = value.onBlur ? value.onBlur : source.rows[0].columns[rowIndex].onBlur;//事件使用第一条的
+        rowIndex++;
+        let showLabel = true;
+        if (isFormList) {
+          showLabel = false;
+        }
+        let item = LibFunction.GetControl(value, source, showLabel, false);
+        if (item instanceof Object) {
+          item.form = rtn.form;
+          row.field.push(item);
+        }
+      });
+      //}
+      return row;
+    },
+    _tableData: undefined,
+    get tableData() {
+      if (this._tableData) {
+        return this._tableData;
+      }
+      else {
+        this._tableData = [];
+        let rows = rtn.rows;
+        if (rows.length > 1) {
+          for (let i = 1; i < rows.length; i++) {//遍历每一行
+            this._tableData.push(rows[i]);
+          }
+        }
+        else {
+          let newRow = this.getCloneRowData(0)
+          this.tableData.push(newRow);
+          this.addSourceRow();
+        }
+        return this._tableData;
+      }
+    },
+    addSourceRow() {
+      let sourceRow = JSON.parse(JSON.stringify(source.rows[0]));
+      source.rows.push(sourceRow);
+      let iRow = this.initRow(sourceRow);
+      iRow.isNewFlag = true;
+      iRow.guid = this.guid();
+      rtn._rows.push(iRow);
+    },
+    getCloneRowData(index) {
+      let sourceRow = source.rows[index];
+      let rowData = rtn.initRow(JSON.parse(JSON.stringify(sourceRow)));
+      rowData.isNewFlag = true;
+      rowData.guid = this.guid();
+      return rowData;
+    },
+   
+    get formListChange() {
+      return master.onChanged;
+    },
+    deleteRow(index, callback) {
+      Vue.prototype.$common.confirm("确定删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+      }).then(() => {
+        if (rtn.rows[index].isNewFlag) {
+          rtn.rows.splice(index, 1);
+          source.rows.splice(index, 1);
+        }
+        else {
+          rtn.rows[index].deleted = true;
+        }
+        callback();
+      }).catch(() => {
+      });
+    },
+    guid() {
+      return (rtn.S4() + rtn.S4() + '-' + rtn.S4() + '-' + rtn.S4() + '-' + rtn.S4() + '-' + rtn.S4() + rtn.S4() + rtn.S4()
+      );
+    },
+    S4() {
+      return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+    }
+  
+  };
+  return rtn;
+};
+export default Repeat;

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

@@ -301,6 +301,12 @@ const Router = function (source) {
         }
       });
     },
+    get subText() {
+      return source.subText;
+    },
+    get locked() {
+      return source.locked;
+    },
   };
   return rtn;
 }

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

@@ -157,7 +157,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 get title() {
                   return v.columnToolTip;
                 }
-              }
+              },              
+              get flagHtml() {
+                return v.flagHtml;
+              },
             };
             if (col.show) {
               //合并表头时暂不支持固定列

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -224,7 +224,11 @@ const Enum = {
     /// <summary>
     /// 年份-月份控件
     /// </summary>
-    DateYearMonth:46,
+    DateYearMonth: 46,
+    /// <summary>
+    /// 重复控件
+    /// </summary>
+    Repeat: 47,
   },
 
   //返回状态码

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -32,6 +32,7 @@ import PlaceHolder from '../PlaceHolder';
 import SensitiveEye from '../SensitiveEye';
 import Cb from '../Cb';
 import PhotoSelect from '../PhotoSelect';
+import Repeat from '../Repeat';
 
 const LibFunction = {
   install(Vue) {
@@ -206,6 +207,17 @@ const LibFunction = {
         //item.is = 'ct-form-list';
         item.is = 'ct-form-list-table';
         break;
+      case Enum.ControlType.Repeat://重复
+        var listobj = source.list.find((v1) => {
+          return v1.name === field.fieldName1;
+        });
+        if (!listobj) {
+          console.error("找不到对应的list：" + field.fieldName1);
+        }
+        listobj.scripts = source.scripts;
+        item = Repeat(listobj, field);
+        item.is = 'ct-repeat';
+        break;
       case Enum.ControlType.Hidden://隐藏控件
         item = Hd(field);
         break;

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

@@ -38,6 +38,7 @@ const loader = {
   PhotoSelectList: require("./ctl/PhotoSelectList.js").default,
   QuickInputSos: require("./ctl/QuickInputSos.js").default,
   ContactList: require("./ctl/ContactList.js").default,
+  Repeat: require("./ctl/Repeat.js").default,
 };
 
 export default loader;

package/src/main.js

@@ -13,7 +13,7 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",  
+  // baseUrl: "http://10.1.245.111:38028/v1/form/router",  
   // baseUrl: "http://10.88.22.46:7070/", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -36,7 +36,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '4195d16c-9b1d-43b2-b6de-ef4a9f2b7d44',
+        oldToken: '5e730b63-1439-4850-9e88-4a83c8609525',
         estateId: '20210729104021C49F04B55C50F6AF58',
         originalRequestURL: 'http://10.88.22.67:8080',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',