centaline-data-driven-v3 0.1.19 → 0.1.20

package/package.json

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

package/src/components/Layout/Layout.vue

@@ -1,5 +1,6 @@
 <template>
-    <div class="ct-Layout" v-if="Layout !== null && !loading" @click="rowClickHandle" :style="{ 'background-color': selectIndex === rowindex?selectedRowBackColor:'' }">
+    <div class="ct-Layout" v-if="Layout !== null && !loading" @click="rowClickHandle"
+        :style="{ 'background-color': selectIndex === rowindex ? selectedRowBackColor : '' }">
         <ct-layoutchildren :rowindex="rowindex" :actionRouter="actionRouter" :rowdata="vmodel" :vmodel="LayoutList"
             :flagflex="true" :fields="fields" :parameterAction="parameterAction"
             :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler"
@@ -9,7 +10,7 @@
 <script setup lang="ts">
 import { ref, nextTick } from 'vue'
 import common from '../../utils/common'
-const emit = defineEmits(['rolRouterclick', 'changeHandler','rowclick'])
+const emit = defineEmits(['rolRouterclick', 'changeHandler', 'rowclick'])
 const props = defineProps({
     action: String,
     cellLayout: String,
@@ -20,8 +21,8 @@ const props = defineProps({
     apiParam: Object,
     parameterAction: String,
     fields: Array,
-    selectIndex:Number,
-    selectedRowBackColor:String,
+    selectIndex: Number,
+    selectedRowBackColor: String,
     formListactionRouter: {
         type: Array,
         default: [],
@@ -61,16 +62,14 @@ function load(data, cellLayout) {
         return;
     }
     if (cellLayout.indexOf("for=") != -1) {
-
         var cellxmlDOM = loadXML(cellLayout);
-        var listxml = getxmlForStr(cellxmlDOM);
-
-        if (typeof listxml !== "undefined") {
-            for (var j = 0; j < listxml.attributes.length; j++) {
-                var attribute = listxml.attributes.item(j);
+        const nodesWithFor = cellxmlDOM.querySelectorAll('[for]');
+        nodesWithFor.forEach((v) => {
+             for (var j = 0; j < v.attributes.length; j++) {
+                var attribute = v.attributes.item(j);
                 if (attribute.nodeName.toLowerCase() == "for".toLowerCase()) {
                     var liststr = "";
-                    var celllist = xmlToString(listxml);
+                    var celllist = xmlToString(v);
 
                     var celllistNew = loadXML(celllist);
                     var newAtt = celllistNew.createAttribute("forrowindex");
@@ -97,7 +96,7 @@ function load(data, cellLayout) {
                     cellLayout = cellLayout.replace(celllist, liststr);
                 }
             }
-        }
+        });
     }
     if (typeof data !== "undefined") {
         str = cellLayout.replace(/\{\{(.+?)\}\}/g, (...args) => {
@@ -303,7 +302,7 @@ function clickHandler(routerKey, rowindex, forname, forrowindex, flagHaveAlert)
             emit("rolRouterclick", routerKey, rowindex, props.vmodel.$sourceIndex);
         }
         else {
-            emit("rolRouterclick", routerKey, rowindex, forname, forrowindex, flagHaveAlert,props.vmodel,props.actionRouter);
+            emit("rolRouterclick", routerKey, rowindex, forname, forrowindex, flagHaveAlert, props.vmodel, props.actionRouter);
         }
     }
 }
@@ -315,7 +314,7 @@ function changeHandler(field) {
         emit("changeHandler", field, props.vmodel.$sourceIndex);
     }
 }
-function rowClickHandle(){
+function rowClickHandle() {
     emit("rowclick", props.rowindex);
 }
 </script>

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

@@ -2,8 +2,8 @@
     <div :class="isOperationalColumn ? 'subdiv_allinline' : ''" v-if="isShowLabel"
         @click="isOperationalColumn ? clickHandler($event) : null">
         <template v-if="eventTriggerType == Enum.EventTriggerType.Hover">
-            <el-popover @before-enter="onShow" :width="tooltipModel.width"
-                :fallback-placements="['bottom', 'top', 'right', 'left']">
+            <el-popover @before-enter="onShow" :width="tooltipModel.width"  placement="right"
+                :popper-options="popperOptions">
                 <template #default>
                     <div :style="'height: ' + tooltipModel.height + ''">
                         <component v-bind="tooltipModel.attrs" :is="tooltipModel.component"></component>
@@ -174,9 +174,27 @@ function voiceEndedHandler() {
 function onShow() {
     emit('mouseenter', props.router, props.rowData, props.rowindex, null, props.columnName, function (data) {
         if (data.height) {
-            data.height = (parseInt(data.height.replace('px', ''))+50)+'px';
+            data.height = (parseInt(data.height.replace('px', '')) + 50) + 'px';
         }
         tooltipModel.value = data
     });
 }
+// 自适应位置配置
+const popperOptions = {
+    modifiers: [
+        {
+            name: 'preventOverflow', // 防止溢出视口
+            options: {
+                padding: 10 // 距离视口边缘的留白
+            }
+        },
+        {
+            name: 'flip', // 当空间不足时翻转位置
+            options: {
+                fallbackPlacements: ['left', 'top', 'bottom'], // 备选位置
+                padding: 5
+            }
+        }
+    ]
+}
 </script>

package/src/main.js

@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"jiangzf-1968118576749723648",platform:"WEB"}',
+              authobject: '{token:"jiangzf-1968847679618506752",platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
                 //authObject: '{token:"1-90f7df2c-fba7-4ea0-8874-aa7202034f06"}',

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="'/EmployeeAttendanceBillList/getLayoutOfSearch'"
-      :searchDataApi="'/EmployeeAttendanceBillList/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> -->