centaline-data-driven-v3 0.1.24 → 0.1.26

package/package.json

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

package/src/components/web/Field.vue

@@ -18,7 +18,7 @@
                 </template>
 
                 <slot name="PreLabel">
-                    <div v-if="model.preLabel1" class="preLabel">
+                    <div v-if="model.preLabel1" class="preLabel" :style="model.isList ? 'white-space: nowrap' : ''">
                         <span v-html="model.preLabel1"></span>
                     </div>
                 </slot>
@@ -37,7 +37,7 @@
                 </template>
 
                 <slot name="PreLabel">
-                    <div v-if="model.preLabel1" class="preLabel">
+                    <div v-if="model.preLabel1" class="preLabel" :style="model.isList ? 'white-space: nowrap' : ''">
                         <span v-html="model.preLabel1"></span>
                     </div>
                 </slot>

package/src/components/web/Label.vue

@@ -71,7 +71,18 @@ function clickHandle() {
     emit('change', model);
 }
 function HtmlReplace(v) {
-  return v.replace(/ /g, "  ")
+    return v.replace(
+        /(?:<[^>]*>)|([^<]+)/g, // 匹配所有标签，或标签外的文本
+        (match, text) => {
+            if (text) {
+                // 若匹配到文本部分，替换其中的空格（例如替换为 &nbsp; 或保留连续空格）
+                return text.replace(/ /g, '&nbsp;&nbsp;'); // 仅替换文本中的空格
+            } else {
+                // 若匹配到标签（含属性），不做处理，直接返回原标签
+                return match;
+            }
+        }
+    )
 }
 defineExpose({
     model

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

@@ -140,7 +140,7 @@
                                                                     v-if="!router.rightField || row[router.rightField] == 1"
                                                                     :key="rowRouterIndex" :rowData="row"
                                                                     :rowindex="rowindex" :isOperationalColumn="true"
-                                                                    :router="router" :colValue="router.label"
+                                                                    :router="router" :colValue="router.controlLabel"
                                                                     :isShowImg="false" @click="rolRouterClickHandler">
                                                                 </Tablecurrency>
                                                             </template>
@@ -183,7 +183,8 @@
                                                 <Tablecurrency v-else :rowindex="rowindex" :align="column.attrs.align"
                                                     :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
                                                     :columnName="column.id" :router="column.router"
-                                                    :colValue="row[column.id]" :rowData="row"
+                                                    :columnGroupId="column.groupId"
+                                                    :colValue="getValueCaseInsensitive(row,column.id)" :rowData="row"
                                                     :eventTriggerType="column.eventTriggerType"
                                                     @click="rolRouterClickHandler"
                                                     @mouseenter="rolRouterMouseenterHandler">
@@ -726,7 +727,7 @@ function rowLayoutClickHandle(index) {
 }
 
 //表单列表操作
-function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, callBack, flagMouseenter) {
+function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, columnGroupId,callBack, flagMouseenter) {
     field.rowindex = rowindex;
     if (refRowsPopover.value[rowindex]) {
         refRowsPopover.value[rowindex].hide();
@@ -752,6 +753,9 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, ca
     if (columnName) {
         submitData.columnName = columnName;
     }
+    if (columnGroupId) {
+        submitData.columnGroupId = columnGroupId;
+    }
 
     let action = field.action;
     if (field.actionField) {
@@ -761,8 +765,8 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, ca
     RouterClickHandler(field, submitData, action, model.value, 'table', callBack, flagMouseenter)
 }
 //表单列表操作
-function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName, callBack, flagMouseenter) {
-    rolRouterClickHandler(field, rowData, rowindex, visible, columnName, callBack, true)
+function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName,columnGroupId, callBack, flagMouseenter) {
+    rolRouterClickHandler(field, rowData, rowindex, visible, columnName,columnGroupId, callBack, true)
 }
 function popupClickHandler() {
     var tempListData = model.value.getSelectRowData({ isMulti: model.value.isMulti });
@@ -1604,6 +1608,11 @@ function addClass(el, className) {
     newClassName.push(className);
     el.className = newClassName.join(" ");
 }
+function getValueCaseInsensitive(obj, key) {
+  const searchKey = key.toLowerCase();
+  const foundKey = Object.keys(obj).find(k => k.toLowerCase() === searchKey);
+  return foundKey ? obj[foundKey] : undefined;
+}
 
 defineExpose({
     model,

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

@@ -77,6 +77,7 @@ const props = defineProps({
     colValue: String,
     rowindex: Number,
     columnName: String,
+    columnGroupId: String,
     isOperationalColumn: {
         type: Boolean,
         default: false
@@ -141,10 +142,10 @@ function clickHandler(ev) {
             video.value.pause();
         }
         visible.value = !visible.value;
-        emit('click', props.router, props.rowData, props.rowindex, visible.value, props.columnName);
+        emit('click', props.router, props.rowData, props.rowindex, visible.value, props.columnName,props.columnGroupId);
     }
     else {
-        emit('click', props.router, props.rowData, props.rowindex, null, props.columnName);
+        emit('click', props.router, props.rowData, props.rowindex, null, props.columnName, props.columnGroupId);
     }
     labelColor.value = 'mazarine'
 
@@ -172,7 +173,7 @@ function voiceEndedHandler() {
     listenSeconds.value = -1;
 }
 function onShow() {
-    emit('mouseenter', props.router, props.rowData, props.rowindex, null, props.columnName, function (data) {
+    emit('mouseenter', props.router, props.rowData, props.rowindex, null, props.columnName, props.columnGroupId,function (data) {
         if (data.height) {
             data.height = (parseInt(data.height.replace('px', '')) + 50) + 'px';
         }

package/src/loader/src/SearchTable.js

@@ -64,6 +64,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         toolbarKey: 0,
         downloadUrl: '',
         _scripts: null,
+        OriginalColumns:source.content.columns?JSON.parse(JSON.stringify(source.content.columns)):[],
         get scripts() {
             if (rtn._scripts !== null) {
                 return rtn._scripts;
@@ -449,6 +450,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                             get rowspan() {
                                 return v.rowSpan || 1;
                             },
+                            get groupId() {
+                                return v.groupId;
+                            },
                             get colspan() {
                                 return v.colSpan || 1;
                             },
@@ -794,7 +798,8 @@ function apiData(model, callback) {
                 if (typeof response.page.flagMoreData !== 'undefined') {
                     model.flagMoreData = response.page.flagMoreData;
                 }
-                if (response.content.updateTableColumns && response.page.pageIndex <= 1) {
+                if (response.content.updateTableColumns && response.page.pageIndex <= 1
+                    &&JSON.stringify(model.OriginalColumns) !== JSON.stringify(response.content.columns)) {
                     model.columns = response.content.columns;
                     if (model.template) {
                         // var tempLoader = template.loader(model.template).default;
@@ -1031,7 +1036,9 @@ function getCurrentRowApiData(model, callback, rtnData, router) {
                 if (typeof response.content.bottomText !== 'undefined') {
                     model.listFooter = response.content.bottomText;
                 }
-                if (response.content.updateTableColumns && response.page.pageIndex <= 1) {
+                if (response.content.updateTableColumns && response.page.pageIndex <= 1
+                    &&JSON.stringify(model.OriginalColumns) !== JSON.stringify(response.content.columns)
+                ) {
                     model.columns = response.content.columns;
                     if (model.template) {
                         // var tempLoader = template.loader(model.template).default;

package/src/main.js

@@ -25,7 +25,7 @@ app.use(centaline, {
     //baseUrl:"http://10.88.22.13:7070/onecard-api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
-    //baseUrl: "http://10.88.22.66:6060/xian/",
+    //baseUrl: "http://10.88.22.66/IBS.Mvc/api/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
 
@@ -65,10 +65,10 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"wufw-1976853466353664000",platform:"WEB"}',
+              authobject: '{token:"wufw-1980431367841927168",platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
-                //authObject: '{token:"1-90f7df2c-fba7-4ea0-8874-aa7202034f06"}',
+                //authObject: '{EmpID:"Token_4e09499b-4b76-46df-9ce5-5498d48ed062",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4e09499b-4b76-46df-9ce5-5498d48ed062",Platform:"WEB"}',
             };
         },
         getToken() {

package/src/utils/mixins.js

@@ -662,68 +662,54 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                         });
                     }
                     else {
-                        if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
-                            if (field.action.indexOf(".zip") > -1) {
-                                window.location.href = encodeURI(field.action);
-                            }
-                            else {
-                                if (field.action.indexOf("?") > -1) {
-                                    model.$vue.downloadUrl = field.action + "&" + Math.random();
-                                }
-                                else {
-                                    model.$vue.downloadUrl = field.action + "?" + Math.random();
-                                }
-                            }
+
+                        field.loading = true;
+                        if (!field.flagAlert && field.content) {
+                            common.message(field.content, 'info', 1500, true)
                         }
-                        else {
-                            field.loading = true;
-                            if (!field.flagAlert && field.content) {
-                                common.message(field.content, 'info', 1500, true)
-                            }
-                            field.doBlobAction(submitData, (data, headers) => {
-                                field.loading = false;
-                                if (data.type == "application/json") {
-                                    const reader = new FileReader();
-                                    reader.readAsText(data, 'utf-8');
-                                    reader.onload = function () {
-                                        data = JSON.parse(reader.result);
-                                        if (data.content) {
-                                            if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                                                if (data.content.indexOf(".zip") > -1) {
-                                                    window.location.href = encodeURI(data.action);
+                        field.doBlobAction(submitData, (data, headers) => {
+                            field.loading = false;
+                            if (data.type == "application/json") {
+                                const reader = new FileReader();
+                                reader.readAsText(data, 'utf-8');
+                                reader.onload = function () {
+                                    data = JSON.parse(reader.result);
+                                    if (data.content) {
+                                        if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
+                                            if (data.content.indexOf(".zip") > -1) {
+                                                window.location.href = encodeURI(data.action);
+                                            }
+                                            else {
+                                                if (data.content.indexOf("?") > -1) {
+                                                    model.$vue.downloadUrl = data.content + "&" + Math.random();
                                                 }
                                                 else {
-                                                    if (data.content.indexOf("?") > -1) {
-                                                        model.$vue.downloadUrl = data.content + "&" + Math.random();
-                                                    }
-                                                    else {
-                                                        model.$vue.downloadUrl = data.content + "?" + Math.random();
-                                                    }
+                                                    model.$vue.downloadUrl = data.content + "?" + Math.random();
                                                 }
                                             }
-                                            else {
-                                            }
                                         }
-                                    };
-                                }
-                                else {
-                                    if (!headers['content-disposition']) {
-                                        common.message('返回结果headers必须包含Access-Control-Expose-Headers和Content-Disposition！', 'error')
-                                        return false;
+                                        else {
+                                        }
                                     }
-
-                                    let blob = new Blob([data], { type: "application/octet-stream;" })
-                                    const url = window.URL.createObjectURL(blob);
-                                    const link = document.createElement('a');
-                                    let fileName = decodeURIComponent(escape(headers['content-disposition'].split('filename=')[1]));
-                                    link.href = url;
-                                    link.setAttribute('download', fileName);
-                                    document.body.appendChild(link);
-                                    link.click();
-                                    document.body.removeChild(link);
+                                };
+                            }
+                            else {
+                                if (!headers['content-disposition']) {
+                                    common.message('返回结果headers必须包含Access-Control-Expose-Headers和Content-Disposition！', 'error')
+                                    return false;
                                 }
-                            });
-                        }
+
+                                let blob = new Blob([data], { type: "application/octet-stream;" })
+                                const url = window.URL.createObjectURL(blob);
+                                const link = document.createElement('a');
+                                let fileName = decodeURIComponent(escape(headers['content-disposition'].split('filename=')[1]));
+                                link.href = url;
+                                link.setAttribute('download', fileName);
+                                document.body.appendChild(link);
+                                link.click();
+                                document.body.removeChild(link);
+                            }
+                        });
                     }
                 }
                 else if (field.isOpenForm) {

package/src/views/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeWorkLogList/getLayoutOfSearch'"
-      :searchDataApi="'/EmployeeWorkLogList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/ReportPersonAttendanceList/getLayoutOfSearch'"
+      :searchDataApi="'ReportPersonAttendanceList/getListOfSearchModel'"></ct-searchlist>
 
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->
@@ -15,6 +15,6 @@
   
 <script lang="ts" setup>
 import { ref, nextTick } from 'vue'
-const apiParam = {"rowGUID":"{7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A}","code":"KD01","name":"中原（中国）物业顾问有限公司","deptID":"{7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A}","path":"KD01","checkBillLeftHours":"1","rightEdit":"1"}
+const apiParam = {}
 
 </script>