centaline-data-driven 1.3.22 → 1.3.25

package/src/centaline/dynamicDragSort/src/dynamicDragSort.vue

@@ -0,0 +1,197 @@
+<template>
+    <!--使用draggable组件-->
+    <div class="dragCol">
+        <div class="dragItem">
+            <el-checkbox id="all" v-model="checkAll" @change="handleAllChecked" class="checkbox-common">{{ controlLabel
+            }}
+            </el-checkbox>
+            <span class="svgIcon">
+                <!-- <svg-icon icon-class="sort" style="cursor: pointer"></svg-icon> -->
+            </span>
+        </div>
+        <draggable v-model="testList" :options="{ group: { name: 'itxst', pull: 'clone' }, sort: true }" animation="300"
+            :move="onMove" dragClass="dragClass" ghostClass="ghostClass" chosenClass="chosenClass"
+            @input="handleListChange($event)">
+            <transition-group>
+                <div class="dragItem canDragon" v-for="(item, index) in testList" :key="index">
+                    <el-checkbox v-model="item.checked" :disabled="item.locked" name="checkItem"
+                        @change="handleChecked(item, $event)" class="checkbox-common"> {{ item.displayName
+                        }}</el-checkbox>
+                    <span class="svgIcon">
+                        <img :src="iconSort" alt="" width="100%" />
+                    </span>
+                </div>
+            </transition-group>
+        </draggable>
+    </div>
+</template>
+
+<script>
+//导入draggable组件
+import draggable from 'vuedraggable'
+
+export default {
+    //注册draggable组件
+    name: 'ct-dragSort',
+    components: {
+        draggable,
+    },
+    props: {
+        vmodel: Object,
+        api: String,
+    },
+    data() {
+        return {
+            iconSort: require("../../../assets/sort.png"),
+            drag: false,
+            checkAll: true,
+            controlLabel: '列名',
+            //定义要被拖拽对象的数组
+            testList: [],
+        };
+    },
+    watch: {
+        testList: { // 监听事件,监听复选框是否全部选中,全部选中则全选的复选框勾选上
+            handler(val) {
+                var i = 0
+                this.testList.forEach(item => {
+                    if (item.checked === true) {
+                        i++
+                    }
+                    if (i === this.testList.length) {
+                        this.checkAll = true
+                    } else {
+                        this.checkAll = false
+                    }
+                })
+            },
+            deep: true
+        }
+    },
+    created() {
+        console.log('draglist', this.vmodel.dragList);
+        this.$nextTick(function () {
+            if (typeof this.vmodel === 'undefined') {
+                this.model = this.loaderObj.DragSort(this.source);
+            }
+            else {
+                this.model = this.vmodel;
+                this.testList = this.vmodel.dragList;
+                console.log('this.testList', this.testList);
+            }
+        });
+
+        this.testList.forEach(item => { // 处理后端传过来的数据,如果没有可以判断是否勾选复选框的字段,则需给数据作处理,加上一个isChecked字段,判断复选框勾选
+            this.$set(item, 'checked', false) // 添加判断的字段
+        })
+    },
+    methods: {
+        // 更新位置
+        handleListChange(event) {
+            console.log(event);
+            this.testList = event;
+
+            this.testList.forEach((item, i) => {
+                this.model.dragList.splice(i, 1, item)
+            })
+
+            console.log('handleListChange-testList', this.testList);
+            console.log('this.model.code1', this.model.code1);
+        },
+        //move回调方法
+        onMove(e, originalEvent) {
+        },
+        //开始拖拽事件
+        onStart() {
+            this.drag = true;
+        },
+        //拖拽结束事件
+        onEnd() {
+            this.drag = false;
+            // this.handleListChange()
+        },
+        handleAllChecked(v) { // 实现全选，反选(点击会传递true或者false过来)
+            this.testList.map(item => {
+                if (!item.locked) {
+                    item.checked = v
+                } else {
+                    return false
+                }
+            })
+            this.vmodel.draglist = this.testList
+            console.log('this.vmodel.draglist', this.vmodel.dragList);
+        },
+        handleChecked(item, e) { // 单个选中
+            item.checked = e
+            console.log('this.testList', this.testList);
+            this.vmodel.draglist = this.testList
+            console.log('this.vmodel.draglist', this.vmodel.dragList);
+        }
+    }
+}
+</script>
+<style  scoped>
+/*定义要拖拽元素的样式*/
+.ghostClass {
+    background-color: #fff !important;
+}
+
+.chosenClass {
+    background-color: #ccc !important;
+    opacity: 1 !important;
+}
+
+/* 拖拽过程 */
+.dragClass {
+    background-color: #fff !important;
+    opacity: 1 !important;
+    box-shadow: none !important;
+    outline: none !important;
+    background-image: none !important;
+}
+
+.dragCol {
+    width: 100%;
+    flex: 1;
+    border-radius: 5px;
+    float: left;
+}
+
+.dragCol+.dragCol {
+    margin-left: 10px;
+}
+
+.dragItem {
+    width: auto;
+    padding: 12px 10px;
+    margin: 0 -5px;
+    border-bottom: solid 1px #eee;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+}
+
+.dragItem:hover {
+    background-color: #F5F7FA;
+    cursor: move;
+}
+
+.dragItem+.dragItem {
+    border-top: none;
+}
+
+#all {
+    color: #909399;
+    font-weight: 700;
+}
+
+.svgIcon {
+    width: 16px;
+    text-align: center;
+    cursor: pointer
+}
+
+/* .checkbox-common>>>span.el-checkbox__label {
+    padding-left: 30px;
+} */
+</style>

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

@@ -28,7 +28,7 @@
                     @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
                 <span v-else-if="v.is=='ct-sensitiveeye'">
-                  <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
+                  <component ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
                 </span>
                 <!--可点击的列-->
                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">

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

@@ -26,6 +26,7 @@
           {{model.labelValue}}
         </label>
         <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>
     </div>
   </div>

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -17,6 +17,7 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
+      rowdata: Object,
       actionRouter: Array,
       rowindex: Number,
       forname: String,

package/src/centaline/dynamicLayout/src/dynamicLayoutLine.vue

@@ -9,8 +9,10 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
+      rowdata: Object,
+      actionRouter: Array,
       rowindex: Number,
-       forname: String,
+      forname: String,
       forrowindex: String
     },
     data() {

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -277,20 +277,20 @@ export default {
           if (rtn) {
             self.$forceUpdate();
             self.$nextTick(() => {
-              if (
-                self.$refs.tableParent.scrollHeight <=
-                self.$refs.tableParent.offsetHeight
-              ) {
-                self.tableLoading = true;
-                self.model.nextPage(next);
-              } else {
-                self.tableLoading = false;
-                self.rowColorChange();
-
-                self.calculatingRowHeight();
+              if(!self.isLayout){
+                if (self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
+                  self.tableLoading = true;
+                  self.model.nextPage(next);
+                } 
+                else {
+                  self.tableLoading = false;
+                  self.rowColorChange();
+                  self.calculatingRowHeight();
+                }
               }
             });
-          } else {
+          } 
+          else {
             self.tableLoading = false;
           }
         };
@@ -569,34 +569,24 @@ export default {
     setTableHeight() {
       var self = this;
       this.$nextTick(() => {
-        if (
-          this.$refs.searchTable &&
-          this.$refs.toolbar &&
-          this.$refs.searchTable.parentElement &&
-          !self.isLayout
-        ) {
+        if (this.$refs.searchTable && this.$refs.toolbar &&
+          this.$refs.searchTable.parentElement &&!self.isLayout) {
           var h1 = this.$refs.searchTable.parentElement.offsetHeight | 0;
           var h2 = this.$refs.searchTable.offsetTop | 0;
           var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
           var h4 = this.$refs.footer.$el.offsetHeight | 0;
           var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
           var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-          var h7 = this.$refs.tableStats
-            ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0
-            : 0;
+          var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0: 0;
           let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - 22;
           this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
           this.$nextTick(() => {
             self.getScrollAttr();
           });
-        } else {
-          if (
-            this.$parent.$parent.$vnode.componentOptions.tag ===
-            "ct-PropertySimpleDetailRET"
-          ) {
-            var h1 =
-              this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight |
-              0;
+        } 
+        else {
+          if (this.$parent.$parent.$vnode.componentOptions.tag === "ct-PropertySimpleDetailRET") {
+            var h1 = this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight | 0;
             var h2 = 0;
             if (this.$parent.$parent.$refs.contact) {
               h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;

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

@@ -59,7 +59,7 @@ const Base = function (source) {
       source.code2 = v;
     },
     get labelValue() {
-      if (source.code1)
+      if (source.code1!=undefined && source.code1!=null)
         return source.code1;
       else
         return '';
@@ -166,7 +166,9 @@ const Base = function (source) {
       return bind;
     },
     reset() {
-      if(this.type!==Enum.ControlType.Hidden){
+      if(this.type!==Enum.ControlType.Hidden 
+        && this.type!==Enum.ControlType.Label 
+        && this.type!==Enum.ControlType.MultiLineLabel){
         this.value = this.defaultValue;
       }
     },

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

@@ -0,0 +1,35 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+const DragSort = function (source) {
+  var init = function (data) {
+    var rtn = {
+      get tableCol() {
+        let l = '';
+        if (source.controlLabel) {
+          l = source.controlLabel;
+        }
+        if (source.labelDelimiter) {
+          l = l + source.labelDelimiter;
+        }
+
+        return [{
+          prop: 'displayName',
+          label: l
+        }];
+      },
+      get dragList() {
+        return source.code1;
+      },
+      set dragList(v) {
+        source.code1 = v;
+      },
+    };
+    rtn = base.copy(Base(source), rtn);
+    rtn = base.copy(rtn, valid.Init(rtn));
+    return rtn;
+
+  };
+  return init(source);
+}
+export default DragSort;

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

@@ -608,6 +608,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                     for (var vkey in row) {
                       rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
                     }
+                    for (var vkey in rtn.dataDictionary[row[rtn.primaryKey]]) {
+                      rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey]||'';
+                    }
                   });
                   if (rtn.cellLayout) {
                     rtn.$vue.$set(rtn.listData, rtn.selectIndex, rtn.dataDictionary[searchValue1]);
@@ -631,7 +634,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
           })
           .catch((error) => {
-            console.error(error);
             if (typeof callback !== 'undefined') {
               callback();
             }

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

@@ -4,7 +4,7 @@ const Enum = {
   //组件类型
   ControlType: {
     /// <summary>
-    /// 文本标签
+    /// 单行文本标签
     /// </summary>
     Label: 1,
 
@@ -24,7 +24,7 @@ const Enum = {
     NumericTextBox: 4,
 
     /// <summary>
-    /// 
+    /// 文本框+高级搜索
     /// </summary>
     TextBoxWithButton: 5,
 
@@ -38,7 +38,6 @@ const Enum = {
     /// </summary>
     EmailText: 7,
 
-
     /// <summary>
     /// 下拉框
     /// </summary>
@@ -144,7 +143,6 @@ const Enum = {
     /// </summary>
     MultiSelectNoSearch: 28,
 
-
     /// <summary>
     /// 分组间的分隔线
     /// </summary>
@@ -209,32 +207,44 @@ const Enum = {
     /// 敏感数据小眼睛控件
     /// </summary>
     SensitiveEye: 41,
+
     /// <summary>
     /// 复选
     /// </summary>
     CheckBox: 43,
+
     /*带标签的超链接列表*/
     HyperlinkListWithLabel: 44,
+
     /// <summary>
     /// 图片选择
     /// </summary>
     PhotoSelect: 45,
+
     /// <summary>
     /// 年份-月份控件
     /// </summary>
     DateYearMonth: 46,
+
     /// <summary>
     /// 重复控件
     /// </summary>
     Repeat: 47,
+
     /// <summary>
     /// 复合控件
     /// </summary>
     Compound: 48,
+
     /// <summary>
     /// 表单
     /// </summary>
     From: 49,
+    /// <summary>
+    ///  列表的的自定义列
+    /// </summary>
+    CustomizeColumns: 50,
+
   },
 
   //返回状态码