centaline-data-driven-v3 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/web/Label.vue

@@ -1,11 +1,13 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control v-if="model.code1">
-            <template v-if="model.controlType==Enum.ControlType.HtmlLabel">
-                <span class="ct-html" :class="{ 'cursor-pointer': model.onChanged }"  @click="clickHandle" v-html="model.value"></span>
+            <template v-if="model.controlType == Enum.ControlType.HtmlLabel">
+                <span class="ct-html" :class="{ 'cursor-pointer': model.onChanged }" @click="clickHandle"
+                    v-html="HtmlReplace(model.value)"></span>
             </template>
             <template v-else-if="model.flagJson">
-                <el-tag v-for="item in model.value" :key="item" type="info" :disable-transitions="true" style="margin: 2px 6px 2px 0px;">{{ item
+                <el-tag v-for="item in model.value" :key="item" type="info" :disable-transitions="true"
+                    style="margin: 2px 6px 2px 0px;">{{ item
                     }}</el-tag>
             </template>
             <template v-else>
@@ -16,7 +18,8 @@
                         <div :style="{ 'width': (model.value.length > 66 ? '400px' : 'auto') }" v-html="model.value">
                         </div>
                     </template>
-                    <span class="ct-lable" :class="{ 'cursor-pointer': model.onChanged }"  @mouseover="onMouseOver($event)" v-html="model.value" @click="clickHandle"></span>
+                    <span class="ct-lable" :class="{ 'cursor-pointer': model.onChanged }"
+                        @mouseover="onMouseOver($event)" v-html="model.value" @click="clickHandle"></span>
                 </el-tooltip>
                 <span class="unitName">{{ model.unitName1 }}</span>
             </template>
@@ -36,7 +39,7 @@ import { ref, nextTick } from 'vue'
 import { initData } from '../../utils/mixins';
 import Enum from '../../utils/Enum'
 import Label from '../../loader/src/Label';
-const emit = defineEmits(['popupSearchList','change'])
+const emit = defineEmits(['popupSearchList', 'change'])
 const props = defineProps({
     parameterAction: String,
     vmodel: Object,
@@ -51,7 +54,7 @@ function onMouseOver(event) {
     let ev = event.target;
     nextTick(function () {
         // 判断是否禁用tooltip功能
-        if(ev.clientWidth>0){
+        if (ev.clientWidth > 0) {
             isShowTooltip.value = refComputLabel.value.clientWidth <= ev.clientWidth;
         }
         isShowComput.value = false
@@ -61,12 +64,15 @@ function onMouseOver(event) {
 }
 //弹出选择列表
 function popupSearchListHandle() {
-    let isSingle=model.value.moreActionRouter.isSingle
+    let isSingle = model.value.moreActionRouter.isSingle
     emit('popupSearchList', isSingle, model, model.value.moreActionRouter);
 }
-function clickHandle(){
+function clickHandle() {
     emit('change', model);
 }
+function HtmlReplace(v) {
+  return v.replace(/ /g, "&nbsp;&nbsp;")
+}
 defineExpose({
     model
 })
@@ -83,17 +89,20 @@ defineExpose({
     -webkit-line-clamp: 1;
     word-break: break-all;
 }
-.ct-html{
+
+.ct-html {
     line-height: 26px;
     font-size: 12px;
     color: #3D5ECC;
 }
+
 .el-tag.el-tag--info {
     --el-tag-text-color: var(--el-color-info);
     color: var(--el-color-info);
 }
 
 .cursor-pointer {
-  cursor: pointer; /* 鼠标悬停时显示为“小手”形状 */
+    cursor: pointer;
+    /* 鼠标悬停时显示为“小手”形状 */
 }
 </style>

package/src/components/web/SearchList/SearchTable.vue

@@ -25,7 +25,7 @@
                     <thead ref="refTableHead" class="right-no-fixation-th">
                         <tr class="ct-tr" ref="refHeadTr" v-for="(columns, columnsIndex) in model.columnsArr"
                             :key="columnsIndex">
-                            <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs"
+                            <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" :rowspan="model.multiRowSpan"
                                 class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
                                 <el-checkbox v-model="model.selectAll" :indeterminate="model.isIndeterminate"
                                     size="default" @change="selectAll"></el-checkbox>

package/src/loader/src/SearchScreen.js

@@ -819,7 +819,7 @@ function displayHandle(item, model) {
     let field = null;
     if (model.sourceFieldsArr) {
       for (var i in model.sourceFieldsArr) {
-        if (model.sourceFieldsArr[i].displayRelationField === item.fieldName1) {
+        if (!model.sourceFieldsArr[i].hiddenRelationField && model.sourceFieldsArr[i].displayRelationField === item.fieldName1) {
           field = model.sourceFieldsArr[i];
           if (field) {
             let displayValueArr = field.displayRelationFieldValue.split(',');
@@ -835,7 +835,7 @@ function displayHandle(item, model) {
     }
     if (model._screen) {
       for (var i in model._screen) {
-        if (model._screen[i].displayRelationField === item.fieldName1) {
+        if (!model._screen[i].hiddenRelationField && model._screen[i].displayRelationField === item.fieldName1) {
           field = model._screen[i];
           if (field) {
             let displayValueArr = field.displayRelationFieldValue.split(',');
@@ -853,7 +853,7 @@ function displayHandle(item, model) {
 
     if (model._highScreen) {
       for (var i in model._highScreen) {
-        if (model._highScreen[i].displayRelationField === item.fieldName1) {
+        if (!model._highScreen[i].hiddenRelationField && model._highScreen[i].displayRelationField === item.fieldName1) {
           field = model._highScreen[i];
           if (field) {
             let displayValueArr = field.displayRelationFieldValue.split(',');

package/src/loader/src/SearchTable.js

@@ -262,10 +262,15 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         get parameterAction() {
             return source.content.parameterAction;
         },
-        get isMulti() { //是否多选
+        get multiRowSpan(){
             if (this.isMergeTitle) {
-                return false; //合并表头暂不支持多选
+                if (typeof source.content.columns !== 'undefined') {
+                    return source.content.columns.reduce((max, item) => Math.max(max, item.rowSpan), -Infinity);
+                }
             }
+            return 1;
+        },
+        get isMulti() { //是否多选
             return source.content.flagCheckBoxColumn === true;
         },
         // 表格行中要合并的列名列表

package/src/main.js

@@ -67,7 +67,7 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                authObject: '{token:"jiangzf-1955865005534617600",platform:"WEB"}',
+                authObject: '{token:"jiangzf-1957609871855812608",platform:"WEB"}',
                 //authObject: '{token:"1-90f7df2c-fba7-4ea0-8874-aa7202034f06"}',
             };
         },

package/src/views/SearchList.vue

@@ -4,8 +4,8 @@
       :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
        :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
 
-       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
-      :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist>
+       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeLeaveBalanceList/getLayoutOfSearch'"
+      :searchDataApi="'/EmployeeLeaveBalanceList/getListOfSearchModel'"></ct-searchlist>
 
  <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/OvertimeList/getLayoutOfSearch'"
       :searchDataApi="'/OvertimeList/getListOfSearchModel'"></ct-searchlist>  -->