centaline-data-driven 1.3.24 → 1.3.27

package/package.json

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

package/src/Form.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
+  <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <ct-form :api="'/salemanage/adjust/point/readDetail'" :apiParam="apiParam"></ct-form>
@@ -18,6 +18,8 @@ adjustID:"220704140952A0156309F316436CAEBA",actionType:3
           }
       }
     },
+    activated(){
+    },
     methods: {
       test111(val) {
         alert(JSON.stringify(val));

package/src/SearchList.vue

@@ -8,13 +8,16 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyDutyList/getLayoutOfSearch'" :searchDataApi="'/PropertyDutyList/getListOfSearchModel'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
+      :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
+      :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'">
+    </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

@@ -39,9 +39,20 @@
 .max-ToolbarButton .max-btn-gray{
     height: 26px;
     background: #FFFFFF;
-    border: 1px solid #CCCCCC;
+    /* border: 1px solid #CCCCCC; */
     border-radius: 6px;
 }
+.max-ToolbarButton .max-btn-gray button.el-button.el-button--primary.el-button--mini {
+    height: 26px;
+    background: #fff;
+}
+.max-ToolbarButton .max-btn-gray button.el-button.el-button--primary.el-button--mini:hover {
+    color: #666;
+    border: 1px solid #ced0d9;
+    background: -webkit-gradient(linear,left top, left bottom,from(#F4F4F5),to(#DFE3F1));
+    background: linear-gradient(#F4F4F5,#DFE3F1);
+}
+
 /* 弹层新增按钮 */
 .max-btn-add button,.max-btn-add{ /*list-button*/
     height: 26px;
@@ -251,3 +262,17 @@
 .ct-text .showLabel label{ 
     line-height: 27px!important;
   }
+
+  .dragItem .el-checkbox__input.is-checked+.el-checkbox__label {
+    /* color: #409EFF !important; */
+    color: #666 !important;
+}
+#dragAll .el-checkbox__input.is-checked+.el-checkbox__label{
+    font-weight: 700;
+}
+/* .dragItem .el-checkbox__input.is-checked .el-checkbox__inner,
+.dragItem .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+    background-color: #409EFF !important;
+    border-color: #409EFF !important;
+} */
+

package/src/centaline/dialogList/src/dialog.vue

@@ -160,7 +160,8 @@
                                         width: item.attrs.width,
                                         'height': item.attrs.height,
                                         'overflow': 'auto',
-                                      }
+                                      },
+                                      ref:'content'
                                     }, [
                                         h(item.component, {
                                           props: item.attrs,
@@ -168,7 +169,8 @@
                                         }, [])
                                       ]);
                                   }
-                                  else {var ph=0;
+                                  else {
+                                    var ph=0;
                                     if(item.attrs.height){
                                       ph=parseInt(item.attrs.height.replace('px',''));
                                     }

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

@@ -1,75 +1,79 @@
 <template>
     <!--使用draggable组件-->
-    <div class="dragCol">
-        <div class="dragItem">
-            <el-checkbox id="all" v-model="checkAll" @change="handleAllChecked" class="checkbox-common">{{ controlLabel
+    <div class="dragCol" ref="dragCol">
+        <div class="dragItem dragHeader" ref="dragHeader">
+            <el-checkbox id="dragAll" v-model="checkAll" @change="handleAllChecked" class="checkbox-common">{{
+                    this.vmodel.label
             }}
             </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 class="dragMain" style="height:dragMainHeight;"> -->
+        <div class="dragMain" ref="dragMain" :style="{ height: mainHeight }">
+            <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" ref="dragItem">
+                        <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>
     </div>
 </template>
 
 <script>
 //导入draggable组件
-import draggable from 'vuedraggable'
+import draggable from "vuedraggable";
 
 export default {
     //注册draggable组件
-    name: 'ct-dragSort',
+    name: "ct-dragSort",
     components: {
-        draggable,
+        draggable
     },
     props: {
         vmodel: Object,
-        api: String,
+        api: String
     },
     data() {
         return {
             iconSort: require("../../../assets/sort.png"),
             drag: false,
             checkAll: true,
-            controlLabel: '列名',
             //定义要被拖拽对象的数组
             testList: [],
+            mainHeight: 500
         };
     },
     watch: {
-        testList: { // 监听事件,监听复选框是否全部选中,全部选中则全选的复选框勾选上
+        testList: {
+            // 监听事件,监听复选框是否全部选中,全部选中则全选的复选框勾选上
             handler(val) {
-                var i = 0
+                var i = 0;
                 this.testList.forEach(item => {
                     if (item.checked === true) {
-                        i++
+                        i++;
                     }
                     if (i === this.testList.length) {
-                        this.checkAll = true
+                        this.checkAll = true;
                     } else {
-                        this.checkAll = false
+                        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);
@@ -77,30 +81,54 @@ export default {
             else {
                 this.model = this.vmodel;
                 this.testList = this.vmodel.dragList;
-                console.log('this.testList', this.testList);
+                // console.log('this.testList', this.testList);
             }
         });
 
-        this.testList.forEach(item => { // 处理后端传过来的数据,如果没有可以判断是否勾选复选框的字段,则需给数据作处理,加上一个isChecked字段,判断复选框勾选
-            this.$set(item, 'checked', false) // 添加判断的字段
-        })
+        this.testList.forEach(item => {
+            // 处理后端传过来的数据,如果没有可以判断是否勾选复选框的字段,则需给数据作处理,加上一个isChecked字段,判断复选框勾选
+            this.$set(item, "checked", false); // 添加判断的字段
+        });
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.sjcount();
+        });
     },
+
     methods: {
+        sjcount() {
+            this.$nextTick(() => {
+                // const height = window.innerHeight;
+                let screenHeight = document.body.clientHeight;
+                let dragHeaderHeight = this.$refs.dragHeader.offsetHeight;
+                let dragMainHeight = this.$refs.dragMain.style.height;
+                let num = this.testList.length
+                let dragItemAll = 44.68 * num;
+                dragMainHeight =
+                    screenHeight - dragHeaderHeight - 26 - 8 - 44 - 40;
+                if (dragMainHeight > dragItemAll) {
+                    this.mainHeight = dragItemAll + "px";
+                    this.$refs.dragMain.style.overflowY = 'hidden'
+                } else {
+                    this.mainHeight = dragMainHeight + "px";
+                    this.$refs.dragMain.style.overflowY = 'scroll'
+                }
+
+            });
+        },
+
         // 更新位置
         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);
+                this.model.dragList.splice(i, 1, item);
+            });
         },
         //move回调方法
-        onMove(e, originalEvent) {
-        },
+        onMove(e, originalEvent) { },
         //开始拖拽事件
         onStart() {
             this.drag = true;
@@ -108,27 +136,25 @@ export default {
         //拖拽结束事件
         onEnd() {
             this.drag = false;
-            // this.handleListChange()
         },
-        handleAllChecked(v) { // 实现全选，反选(点击会传递true或者false过来)
+        handleAllChecked(v) {
+            // 实现全选，反选(点击会传递true或者false过来)
             this.testList.map(item => {
                 if (!item.locked) {
-                    item.checked = v
+                    item.checked = v;
                 } else {
-                    return false
+                    return false;
                 }
-            })
-            this.vmodel.draglist = this.testList
-            console.log('this.vmodel.draglist', this.vmodel.dragList);
+            });
+            this.vmodel.draglist = this.testList;
         },
-        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);
+        handleChecked(item, e) {
+            // 单个选中
+            item.checked = e;
+            this.vmodel.draglist = this.testList;
         }
     }
-}
+};
 </script>
 <style  scoped>
 /*定义要拖拽元素的样式*/
@@ -155,6 +181,7 @@ export default {
     flex: 1;
     border-radius: 5px;
     float: left;
+    margin-top: -5px;
 }
 
 .dragCol+.dragCol {
@@ -172,7 +199,7 @@ export default {
 }
 
 .dragItem:hover {
-    background-color: #F5F7FA;
+    background-color: #f5f7fa;
     cursor: move;
 }
 
@@ -180,7 +207,7 @@ export default {
     border-top: none;
 }
 
-#all {
+#dragAll {
     color: #909399;
     font-weight: 700;
 }
@@ -188,10 +215,17 @@ export default {
 .svgIcon {
     width: 16px;
     text-align: center;
-    cursor: pointer
+    cursor: pointer;
+}
+
+.dragHeader {}
+
+.dragMain {
+    overflow-y: scroll;
+    overflow-x: hidden;
 }
 
 /* .checkbox-common>>>span.el-checkbox__label {
     padding-left: 30px;
 } */
-</style>
+</style>

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

@@ -68,7 +68,7 @@
             <component v-for="(btn, index) in model.links" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
         </el-row>
-        <el-row v-if="model.buttons.findIndex((v)=>{return v.show}) > -1" style="margin-top: 8px;">
+        <el-row v-if="model.buttons.findIndex((v)=>{return v.show}) > -1" :class="isScroll?'button-absolute':'button-initial'">
           <el-col :span="24" style="text-align:center">
             <component v-for="(btn, index) in model.buttons" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
@@ -102,8 +102,8 @@
       }
     },
     data() {
-      var self = this;
       return {
+        isScroll: false,
         loading: true,
         activeName: '-1',
         collapse: [],//分组数组
@@ -115,6 +115,11 @@
     mounted() {
       this.init();
     },
+    updated(){
+      if(this.$el.parentElement.scrollHeight>this.$el.parentElement.clientHeight){
+        this.isScroll=true;
+      }
+    },
     methods: {
       init() {
         var self = this;
@@ -700,4 +705,19 @@
 .el-collapse-saveLine .ct-collapse-item-title:last-child .el-collapse-item__wrap{
   border-bottom:none; 
 }
+.button-initial{
+  margin-top: 8px;
+}
+.button-absolute{
+  z-index: 100;
+  bottom: 6px;
+  position: absolute;
+  line-height: 34px;
+  background-color: #fff;
+  width: 100%;
+  margin: auto;
+  max-width: 800px;
+  box-shadow: 0 2px 20px 0 rgb(0 0 0 / 10%);
+  margin-left: -20px;
+}
 </style>

package/src/centaline/dynamicMt/src/dynamicMt.vue

@@ -12,7 +12,7 @@
         {{validMessage}}
       </span>
     </transition>
-    <ct-quick-input v-if="model.paramName && !model.lock" :pn="model.paramName" :action="api" @input="model.value=$event"></ct-quick-input>
+    <ct-quick-input v-if="model.paramName && !model.lock" :pn="model.paramName" :action="api" @input="quickSelect"></ct-quick-input>
   </div>
 </template>
 <script>
@@ -35,8 +35,14 @@
       else {
         this.model = this.vmodel;
       }
+    },
+    methods: {      
+      quickSelect(value,label) {
+        this.model.value=this.model.value+label;
+      },
     }
-  }</script>
+  }
+</script>
 <style>
   .noresize {
     resize: none;

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

@@ -799,8 +799,7 @@ export default {
       action = action || field.action;
       var clickAcion = function() {
         //若不是客户端方法，则直接访问接口
-        if (!field.isClientFuntion) {
-          // 外部框架tab页打开
+        if (!field.isClientFuntion) {// 外部框架tab页打开
           if (field.isFormPageInTab) {
             submitData = field.getActionPara(submitData).para;
             if (field.pageStyle) {
@@ -816,29 +815,24 @@ export default {
                 field.dialogWidth
               );
           } 
-          else if (field.isSearchPageInTab) {
-            // 外部框架tab页打开
+          else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
               .handler.openTabSearch(field, submitData);
           } 
-          else if (field.isBrowserNewTab) {
-            // 浏览器打开
+          else if (field.isBrowserNewTab) {// 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(action + query, "_blank");
           } 
-          else if (field.isOpenUrlInBrowse) {
-            // 浏览器打开
+          else if (field.isOpenUrlInBrowse) {// 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
           } 
-          else if (field.isSeeVoice) {
-            //看视频
+          else if (field.isSeeVoice) {//看视频
             self.$common.browseVideo(field, submitData);
           } 
-          else if (field.isBrowseAttachment) {
-            //浏览附件
+          else if (field.isBrowseAttachment) {//浏览附件
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] }
             ];
@@ -920,10 +914,7 @@ export default {
                     },
                     on: {
                       submit(ev) {
-                        if (
-                          !field.flagFreshCurrentRow &&
-                          !field.flagAddRowAfterAction
-                        ) {
+                        if ( !field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
                           self.model.doAction(ev);
                         }
                         self.$forceUpdate();

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

@@ -21,7 +21,7 @@
       </el-input>
 
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
-      <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @click="quickSelect"></ctQuickInputSos>
+      <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" :flagNew="true" @click="quickSelect"></ctQuickInputSos>
     </div>
     <transition name="el-fade-in" class="ct-flex-div-span">
       <span v-show="!valid" class="errorMessage ">
@@ -75,7 +75,8 @@
       isShowClear() {
         if (this.model.value !== '' && this.model.clearable) {
           this.$set(this, 'showClear', true);
-        } else {
+        } 
+        else {
           this.$set(this, 'showClear', false);
         }
       },
@@ -84,13 +85,19 @@
           this.$emit('click');
         }
         else if(this.model.routerKeyForEnterKey){
-          if(this.model.value.trim()!=''){
+          if(this.model.value && this.model.value.trim()!=''){
             this.$emit('enter');
           }
         }
       },
-      quickSelect(v) {
-        this.model.value=v;
+      quickSelect(value,label) {
+        if(this.model.type===3){
+          this.model.value=this.model.value+label;
+          this.validExcute();
+        }
+        else{
+          this.model.value=label;
+        }
         this.search();
       },
     },

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

@@ -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/QuickInputSos.js

@@ -14,11 +14,10 @@ const QuickInput = function (source, moreActionRouter) {
       return source.name1;
     },
     set text(v) {
-      if(source.displayName1)
-      {
+      if(source.displayName1){
         source.displayName1 = v;
-      }else
-      {
+      }
+      else{
         source.name1 = v;
       }
     },

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

@@ -347,6 +347,9 @@ const Router = function (source) {
     get buttonHeight() {
       return source.buttonHeight || 24;
     },
+    get align() {
+      return source.align;
+    },
   };
   return rtn;
 }

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,
+
   },
 
   //返回状态码
@@ -390,10 +400,16 @@ const Enum = {
     ///  在浏览器中打开一个 relationField 执行的URL
     /// </summary>
     OpenUrlInBrowse: 22,
+
     /// <summary>
     /// 浏览附件
     /// </summary>
-    BrowseAttachment: 23
+    BrowseAttachment: 23,
+
+    /// <summary>
+    ///  更新表格的列
+    /// </summary>
+    UpdateColumns: 24,
   },
 
   /// <summary>