centaline-data-driven 1.2.37 → 1.2.38

package/build/centaline/centaline.path.js

@@ -42,6 +42,7 @@ const paths = {
     "dynamicPhotoSelect": "./src/centaline/dynamicPhotoSelect/index.js",//图片
     "dynamicPhotoSelectList": "./src/centaline/dynamicPhotoSelectList/index.js",//图片选择列表
     "dynamicViewer": "./src/centaline/dynamicViewer/index.js",//图片选择列表
+    "dynamicRepeat": "./src/centaline/dynamicRepeat/index.js",//重复控件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js",//调用API插件

package/package.json

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

package/src/centaline/dynamicRepeat/index.js

@@ -0,0 +1,14 @@
+import dynamicRepeat from './src/dynamicRepeat'
+import api from '../api/index'
+
+dynamicRepeat.install = function (Vue) {
+  Vue.component(dynamicRepeat.name, dynamicRepeat);
+
+  Vue.use(api);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicRepeat);
+}
+
+export default dynamicRepeat;

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="ct-form-list" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
+    <div class="list-button">
+      <el-button v-if="model.create" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+        新增
+      </el-button>
+    </div>
+
+    <div class="el-col el-col-24" v-for="(v, i) in model.tableData" :key="v.guid" v-if="!v.deleted">
+      <div class="list-title">
+        <h5>{{model.title}}</h5>
+      </div>
+      <el-row v-if="v.field.length > 0">
+        <el-col v-for="(col, index) in v.field" :key="col.guid" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
+          <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
+                     @click="fieldClickHandler(col,index,i)" @change="changeHandler(col,index,i)"
+                     @input="inputHandler(col,index,i)"></component>
+        </el-col>
+      </el-row>
+      <div class="list-button" v-if="i>0">
+        <el-button v-if="v.delete" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="deleteRow(i)">
+          删除
+        </el-button>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  //Form内表格
+  var ctSpan = {//临时的span组件对象，用于vue双向绑定，强制更新
+    props: {
+      vmodel: Object,
+      rowNum: Number,
+    },
+    data: function () {
+      return {
+
+      }
+    },
+    methods: {
+      getClass() {
+        if (this.vmodel.is === "ct-inputNumber") {
+          return 'ct-table-inputnumber';
+        }
+      }
+    },
+    template: '<div :class="getClass()">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
+  }
+
+  export default {
+    name: 'ct-repeat',
+    components: {
+      'ct-span': ctSpan
+    },
+    props: {
+      vmodel: Object,
+      api: String
+    },
+    data() {
+      return {
+        model: null,
+        foucus: false,
+        itemKey: Math.random()
+      }
+    },
+    created() {
+      let self = this;
+      this.model = this.vmodel;
+      this.model.OptApi = this.api;
+
+      this.$nextTick(function () {
+        self.model.refField = this.$refs.Fields;
+        self.model.refFieldsLabel = this.$refs.FieldsLabel;
+      });
+    },
+    methods: {
+      //添加
+      addRow() {
+        var app = this;
+        if (app.fieldsValidExcute()) {
+          let newRow = app.model.getCloneRowData(0)
+          app.model.tableData.push(newRow);
+          app.model.addSourceRow();
+        }
+      },
+      //删除
+      deleteRow(index) {
+        var self = this;
+        this.model.deleteRow(index + 1, () => {
+          self.model.tableData[index].deleted = true;
+          self.$forceUpdate();
+          self.model.change = self.model.formListChange;
+          self.$emit('change');
+        });
+      },
+      fieldsValidExcute() {
+        var self = this;
+        var rtnBool = true;
+        debugger
+        if (typeof self.$refs.Fields !== 'undefined') {
+          self.$refs.Fields.forEach((f) => {
+            if (typeof f.validExcute !== 'undefined') {
+              if (!f.validExcute()) {
+                rtnBool = false;
+              }
+            }
+          });
+        }
+        return rtnBool;
+      },
+      validExcute() {
+        var self = this;
+        var rtnBool = true;
+        if (!self.fieldsValidExcute()) {
+          rtnBool = false;
+        } 
+        if (rtnBool && self.model.required && this.model.tableData.length === 0) {
+          self.$message.warning(this.model.label + " 表格不能为空");
+          rtnBool = false;
+        }
+        return rtnBool;
+      },
+      changeHandler(field, rowindex,index) {
+        var self = this;
+        this.model.change = field.change;
+        self.$emit('change');
+      },
+      inputHandler(field, rowindex, index) {
+        var self = this;
+        this.model.input = field.input;//当前小组件事件作为大组件事件
+        self.$emit('input');
+
+      },
+    }
+  }
+</script>
+<style>
+  .el-table-add-row {
+    margin-top: 10px;
+    width: 100%;
+    height: 34px;
+    border: 1px dashed #c1c1cd;
+    border-radius: 3px;
+    cursor: pointer;
+    justify-content: center;
+    display: flex;
+    line-height: 34px;
+  }
+
+  .ct-form-list .list-title {
+    padding-bottom: 5px;
+    text-align: left;
+    display: inline-table;
+    width: 45%;
+  }
+
+  .ct-form-list .list-button {
+    padding-bottom: 5px;
+    text-align: right;
+    display: inline-table;
+    float: right;
+  }
+
+  .ct-table-inputnumber {
+    text-align: right;
+  }
+
+  .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter div {
+    text-align: right;
+  }
+
+  .ct-form-list .el-table__footer-wrapper .el-table__footer .has-gutter tr td:first-child div {
+    text-align: left;
+  }
+
+  .ct-table-required {
+    color: red;
+  }
+
+  .tableDisabled {
+    pointer-events: none;
+    opacity: 0.4;
+  }
+</style>

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

@@ -30,10 +30,9 @@
             </li>
           </ul>
         </div>
-        <el-popover :append-to-table="option.appendId?option.appendId:''"
+        <el-popover :append-to-table="option.appendId?option.appendId:''" class="Stats-popover"
                     :placement="option.placement?option.placement:'left'"
-                    :trigger="option.trigger?option.trigger:''"
-                    >
+                    :trigger="option.trigger?option.trigger:''">
           <div v-if="FlagStatistics" class="tab-list" style="border-bottom:none">
             <div class="tablf" v-for="(item, index) in showData[1]" @click="handleClick($event,item)" style="text-align:left">
               <ul class="btnTab">
@@ -44,7 +43,7 @@
               </ul>
             </div>
           </div>
-          <i slot="reference" class="icon-more"></i>
+          <sapn slot="reference" class="icon-more">⋮</sapn>
 
         </el-popover>
       </template>
@@ -71,7 +70,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属性
         },
@@ -177,9 +176,8 @@
 
 <style>
   .tab-list {
-    border-bottom: 2px solid #E0E0E0;
-    margin-bottom: 10px;
-    padding-bottom: 5px;
+      position:relative; 
+    margin-bottom: 10px; 
     height: 30px;
   }
 
@@ -220,8 +218,7 @@
       /* border-bottom-right-radius: 12px !important; */
       /* border-top-right-radius: 11px; */
       width: 20px;
-      background: -webkit-linear-gradient(right, #dfdede,#ff0c00);
-      height: 4px;
+      border-bottom: #ee5d56 solid 3px; 
     }
 
     .tab-list .activecolor {
@@ -234,11 +231,17 @@
     }
 
     .tab-list .icon-more {
-      background: url(../../../assets/ver.png)no-repeat;
-      background-size: 80% 80%;
-      height: 20px;
-      width: 7px;
+      color: #ee5d56;
+      font-size: 20px;
+      font-weight: 900;
       display: inline-block;
-      vertical-align: bottom;
+      vertical-align: 0.5em;
+      margin-top: -3px;
+      cursor: pointer;
     }
+
+  .Stats-popover {
+      position:absolute;
+      right:5px;
+  }
 </style>

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/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

@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  baseUrl: "http://10.1.245.111:38028/v1/form/router",  
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://10.1.245.111:38028/v1/form/router",  
   // baseUrl: "http://10.88.22.46:7070/", 
   // flagRouterSelf: true,
   zindex: 999,