centaline-data-driven-v3 0.1.40 → 0.1.41

package/package.json

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

package/src/components/web/Form.vue

@@ -3,8 +3,9 @@
         :style="{ width: pageWidth ? pageWidth + 'px' : '100%', margin: 'auto', 'min-height': minHeight }">
         <div style="display: flex; width: 100%;">
             <div style="flex: 1; min-width: 0;">
-                <div v-if="model !== null && !loading" class="ct-form">
-                    <el-affix target=".ct-form" v-if="model.tip" :offset="62">
+                <div v-if="model !== null && !loading" class="ct-form"
+                    :style="{ margin: openType != 'tree' ? '10px' : '0px' }">
+                    <el-affix target=".ct-form" v-if="model.tip" :offset="tipTopHight">
                         <div class="ct-form-tip" ref="refTip">
                             <span v-html="model.tip"></span>
                         </div>
@@ -57,7 +58,8 @@
                         <template v-if="model.isHorizontalLayout">
                             <component :is="model.flagFixedTabOnHorizontalLayout ? 'el-affix' : 'div'"
                                 v-bind="model.flagFixedTabOnHorizontalLayout ? { offset: tabTopHight, target: '.ct-form' } : {}">
-                                <el-tabs v-model="activeName" @tab-click="tabClick" style="background: #fff;">
+                                <el-tabs v-model="activeName" @tab-click="tabClick" style="background: #fff;"
+                                    ref="refTabs">
                                     <template v-for="(item, index) in model.collapse" :key="index">
                                         <el-tab-pane :name="index.toString()" :lazy="item.lazyLoad"
                                             v-if="item.show !== false" :key="index">
@@ -100,7 +102,7 @@
                                     <template #title>
                                         <i class="sign"></i>
                                         <span :class="[item.required ? 'requiredLabel' : '']">{{ item.controlLabel
-                                            }}</span>
+                                        }}</span>
                                         <span v-html="item.sufLabel1"></span>
                                     </template>
 
@@ -110,10 +112,11 @@
                                                 v-if="col.show !== false && col.lineFeed"></div>
                                             <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px"
                                                 :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
-                                                <component ref="Fields" :is="col.is" :vmodel="col" :key="col.fieldItemKey"
-                                                    :listHeight="listHeight" :parameterAction="model.parameterAction"
-                                                    v-bind="col.bindPara" :fileData="getFileData(col)"
-                                                    @change="changeHandler" @fieldClick="fieldClickHandler"
+                                                <component ref="Fields" :is="col.is" :vmodel="col"
+                                                    :key="col.fieldItemKey" :listHeight="listHeight"
+                                                    :parameterAction="model.parameterAction" v-bind="col.bindPara"
+                                                    :fileData="getFileData(col)" @change="changeHandler"
+                                                    @fieldClick="fieldClickHandler"
                                                     @popupLocation="popupLocationHandler"
                                                     @popupSearchList="popupSearchListHandler"
                                                     @importComplete="importComplete"
@@ -272,7 +275,6 @@ const props = defineProps({
     dialoWidth: Number,
     listHeight: Number,
 })
-
 const itemKey = ref(1)
 const router = useRouter()
 const loading = ref(true)
@@ -288,7 +290,9 @@ const showAI = ref(false);
 const dialogHeight = ref(props.dialogHeight || (window.innerHeight - 60));
 const tabActiveNameKey = ref('')
 const refTip = ref()
-const tabTopHight = ref(52)
+const tipTopHight = ref(0)
+const tabTopHight = ref(0)
+const refTabs = ref()
 
 const qrtimer1 = ref(null)
 const qrtimer2 = ref(null)
@@ -322,6 +326,17 @@ onDeactivated(() => {
 })
 onMounted(() => {
     setCss();
+    if (refForm.value) {
+        const rect = refForm.value.getBoundingClientRect()
+        const distanceFromTop = rect.top + window.scrollY
+        tipTopHight.value = distanceFromTop;
+        if (refTip.value) {
+            tabTopHight.value = tabTopHight.value + refTip.value.clientHeight + 10
+        }
+        else {
+            tabTopHight.value = tipTopHight.value;
+        }
+    }
 })
 init()
 //初始化数据
@@ -379,11 +394,6 @@ function load(data) {
 
         }
     }
-    nextTick(() => {
-        if (refTip.value) {
-            tabTopHight.value = tabTopHight.value + refTip.value.clientHeight + 10
-        }
-    })
     //通知父组件加载完成
     emit('loaded', model.value);
 }
@@ -703,11 +713,29 @@ function setCss() {
     if (props.topHeight > -1) {
         minHeight.value = (document.documentElement.clientHeight - props.topHeight - 20) + 'px';
     }
-    else if(props.dialogHeight){
+    else if (props.dialogHeight) {
         minHeight.value = (props.dialogHeight) + 'px';
     }
-    else{
-        minHeight.value = document.documentElement.clientHeight + 'px';
+    else if (props.openType == 'tree') {
+        if (refForm.value) {
+            let parentDom = refForm.value.parentElement;
+            minHeight.value = parentDom.clientHeight + 'px';
+            refForm.value.style.height = minHeight.value
+            refForm.value.style.overflowY = 'auto'
+            refForm.value.style.paddingBottom = '45px'
+        }
+    }
+    else if (props.openType == 'detail') {
+        if (refForm.value) {
+            let parentDom = refForm.value.parentElement;
+            minHeight.value = parentDom.clientHeight + 'px';
+        }
+    }
+    else {
+        if (refForm.value) {
+            let parentDom = refForm.value.parentElement;
+            minHeight.value = parentDom.clientHeight + 'px';
+        }
     }
 }
 
@@ -726,18 +754,93 @@ function buttonsWidth() {
         rtn = props.dialoWidth - model.value.aiAttr.width - 4 + 'px';
     }
     else if (props.pageWidth) {
-        rtn = props.pageWidth - 20 + 'px';
+        rtn = props.pageWidth + 'px';
 
     }
+
     return rtn;
 }
 
-function tabClick(event) {
+
+// 点击后让激活 Tab 居中
+async function tabClick(pane: TabsPaneContext) {
     if (props.openType == 'detail') {
         window.localStorage.setItem(tabActiveNameKey.value, model.value.collapse[event.index].fieldName1);//存储
     }
+    // await nextTick()          // 等 DOM 更新完再取节点
+    // debugger
+    // const navWrapScroll = document.querySelector('.el-tabs__nav-scroll') as HTMLElement
+    // const firstTab = document.querySelector('.el-tabs__item') as HTMLElement
+    // if (!navWrapScroll || !firstTab) return
+
+    // // 第一个 tab 的“右边”到容器左边的距离
+    // const firstRight = firstTab.getBoundingClientRect().right
+    // const wrapLeft = navWrapScroll.getBoundingClientRect().left
+
+    // // 只要右边还在容器左边之外，就说明还没进来
+    // const firstVisible = firstRight >= wrapLeft
+    // const visibleCount = getVisibleTabCount();
+    // if (pane.index < visibleCount / 2 && firstVisible) {
+    //     return;
+    // }
+
+    // const navWrap = document.querySelector('.el-tabs__nav') as HTMLElement
+    // const activeBtn = document.querySelector(
+    //     `.el-tabs__item#tab-${pane.paneName}`
+    // ) as HTMLElement
+
+    // if (!navWrapScroll || !navWrap || !activeBtn) return
+
+    // const wrapWidth = navWrapScroll.clientWidth
+    // const btnLeft = activeBtn.offsetLeft
+    // const btnWidth = activeBtn.offsetWidth
+
+    // /* 想让 activeBtn 居中，需要整个 navWrap 向左移动的距离 */
+    // const dx = (wrapWidth - btnWidth) / 2 - btnLeft
+
+    // setTimeout(() => {
+    //     navWrap.style.transition = 'transform .3s ease-out'
+    //     navWrap.style.transform = `translateX(${dx}px)`
+    // }, 50);
+
+    // const navWrapScroll = document.querySelector('.el-tabs__nav-scroll') as HTMLElement
+    // const navWrap = document.querySelector('.el-tabs__nav') as HTMLElement
+    // const activeBtn = document.querySelector(
+    //     `.el-tabs__item#tab-${pane.paneName}`
+    // ) as HTMLElement
+    // if (!navWrapScroll || !activeBtn) return
+
+    // const wrapWidth = navWrapScroll.clientWidth
+    // const btnLeft = activeBtn.offsetLeft
+    // const btnWidth = activeBtn.offsetWidth
+
+    // // 滚动到“元素中心 - 容器半宽”的位置，就能居中
+    // navWrapScroll.scrollTo({
+    //     left: btnLeft - (wrapWidth - btnWidth) / 2,
+    //     behavior: 'smooth'
+    // })
+
+}
+/** 返回当前屏幕完全可见的 tab 个数 */
+function getVisibleTabCount(): number {
+    const navWrapScroll = document.querySelector('.el-tabs__nav-scroll') as HTMLElement
+    const navWrap = document.querySelector('.el-tabs__nav') as HTMLElement
+    if (!navWrapScroll || !navWrap) return 0
+
+    const wrapWidth = navWrapScroll.clientWidth                    // 容器可视宽
+    const allTabs = Array.from(navWrap.querySelectorAll('.el-tabs__item')) as HTMLElement[]
+    if (!allTabs.length) return 0
+
+    // ① 如果所有 tab 总宽度 ≤ 容器宽，全部可见
+    const totalWidth = allTabs.reduce((sum, tab) => sum + tab.offsetWidth, 0)
+    if (totalWidth <= wrapWidth) return allTabs.length
+
+    // ② 否则按“平均宽度”向下取整
+    const avgWidth = totalWidth / allTabs.length
+    return Math.floor(wrapWidth / avgWidth)
 }
 
+
 </script>
 
 <style scoped>

package/src/components/web/TreeList.vue

@@ -16,8 +16,8 @@
                 <template v-if="pageType == 'form'">
                     <div style="height: 100%;">
                         <div class="ct-form"
-                            :style="{ 'width': (width ? width + 'px' : 'auto'), 'height': (height ? height + 'px' : 'auto') }">
-                            <ct-form :api="formApi" :api-param="apiParam1" :width="width" :height="height"></ct-form>
+                            :style="{ 'width': (width ? width + 'px' : 'auto'), 'height': (height ? height + 'px' : '100%') ,margin: '0px','position': 'relative','background-color': '#FFFFFF','border-radius': '6px'}">
+                            <ct-form :api="formApi" :api-param="apiParam1" :pageWidth="width" :pageHeight="height" :openType="'tree'"></ct-form>
                         </div>
                     </div>
                 </template>

package/src/main.js

@@ -21,8 +21,8 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "http://10.88.22.46:20808/service-api/",
-    //baseUrl:"http://10.88.22.13:7070/onecard-api/",
+    baseUrl: "http://10.88.22.66:7080/ibs-api/",
+    //baseUrl:"http://10.88.22.66/IBS.Mvc/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/IBS.Mvc/api/",
@@ -66,8 +66,9 @@ app.use(centaline, {
         getRequestHeaders: function () {
             return {
                 
-AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjI3NjY3NmE5LWE5ZDEtNDJhNy05N2UwLWZjYjM4ZmM4NGExYiJ9.NMtc9T_b_BHBj1Ru6_BsVrlkUiptS4EKrrMsx9i7FScbcpGSnQqd1JnQ0ObEu_kwkNAqvMA4LDHuve1DsS8hkA',
-              authobject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"f1fe9ca3d9c88ffd7d1298227dbb4def","token":"","random":"c6HfeQ","time":1766043585321,"sign":""}',
+             //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQxZTM1MGE1LWFiMGMtNDY2Mi05MTQ5LTAwYTQ4NTljMDkyYSJ9.3ci0CpgcmIqm-ORf9efFnvB6sgAWVSGv6ptrWMe3ZSs3fQ8PvlZv3BizhcBJjk0l7csA2Ihw9oodq2N81ELUoQ',
+              authobject: '{token:"T5067-2003269852298657792",platform:"WEB"}',
+              //authobject: '{EmpID:"Token_946d56e1-7972-4382-9d10-4a72496aab39",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_946d56e1-7972-4382-9d10-4a72496aab39",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
                 //authObject: '{EmpID:"Token_4e09499b-4b76-46df-9ce5-5498d48ed062",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4e09499b-4b76-46df-9ce5-5498d48ed062",Platform:"WEB"}',

package/src/views/SearchList.vue

@@ -1,9 +1,12 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/comprehensive/ApplicationList/getLayoutOfSearch'"
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/RoleList/getLayoutOfSearch'"
       
-    :searchDataApi="'/comprehensive/ApplicationList/getList'"></ct-searchlist>
+    :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist>
 
+      <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+      
+    :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist> -->
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->
 

package/src/views/Tree.vue

@@ -1,7 +1,8 @@
 <template>
-   <div id="app-Tree" style="height:100%;position: fixed;width:100%;padding: 10px;">
+   <div   id="app-Tree" style="height:100%;position: fixed;width:100%;padding: 10px;">
       <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-         :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'"
+         :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" 
+         :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'"
          @loaded="loaded"></ct-treelist>
       <!-- <ct-textbox :source="source"></ct-textbox> -->
       <ct-dialoglist></ct-dialoglist>
@@ -14,4 +15,9 @@ const apiParam = {
 function loaded() { 
 
 }
-</script>
+</script>
+<style>
+body{
+   background-color: #ddd;
+}
+</style>