centaline-data-driven-v3 0.0.47 → 0.0.49

package/package.json

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

package/src/components/app/Form.vue

@@ -29,8 +29,8 @@
                 <template v-if="model.isHorizontalLayout">
                     <van-tabs v-model:active="activeName" title-active-color="#EE6B6B" title-inactive-color="#000000"
                         background="#FFFFFF" color="#EE6B6B" shrink>
-                        <template v-for="(field, index) in model.collapse" :key="index">
-                            <van-tab :title="field.controlLabel" :name="index.toString()" v-if="field.show !== false">
+                        <template v-for="(item, index) in model.collapse" :key="index">
+                            <van-tab :title="item.controlLabel" :name="index.toString()" v-if="item.show !== false">
                                 <van-cell-group inset :border="false"
                                     v-for="(field, collapseIndex) in model.collapseFields[index + 1]"
                                     :key="collapseIndex">
@@ -49,7 +49,7 @@
                 <!--分组-->
                 <template v-else>
                     <van-cell-group v-for="(item, index) in model.collapse" :key="index">
-                        <template v-for="(field, collapseIndex) in model.collapseFields[index + 1]"
+                        <template v-if="item.show !== false" v-for="(field, collapseIndex) in model.collapseFields[index + 1]"
                             :key="collapseIndex">
                             <component ref="Fields" :is="field.is" v-if="field.show !== false" :vmodel="field"
                                 :parameterAction="model.parameterAction" v-bind="field.bindPara"
@@ -210,7 +210,6 @@ function load(data) {
     nextTick(function () {
         setFormHeight()
     })
-
     //通知父组件加载完成
     emit('loaded', model.value);
 }

package/src/components/app/PhotoSelectList.vue

@@ -203,9 +203,7 @@ function allchoose() {
 }
 
 function handleClick() {
-    if (chooseList.value && chooseList.value.length > 0) {
-        emit('handlePhoto', chooseList.value);
-    } 
+    emit('handlePhoto', chooseList.value);
 }
 function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     if (routerKey == 'photoPreview') {

package/src/components/web/PhotoSelectList.vue

@@ -209,9 +209,7 @@ function allchoose() {
 }
 
 function handleClick() {
-    if (chooseList.value && chooseList.value.length > 0) {
-        emit('handlePhoto', chooseList.value);
-    } 
+    emit('handlePhoto', chooseList.value);
 }
 function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     if (routerKey == 'photoPreview') {

package/src/components/web/TreeList.vue

@@ -1,12 +1,14 @@
 <template>
     <div id="ct-TreeList" style=" height: 100%;" ref="refleft">
         <el-container style="height:  100%;">
-            <el-aside :width="leftWidth ? leftWidth + 'px' : '15%'"
+            <el-aside :width="asideWidth ? asideWidth + 'px' : '15%'"
                 style="background-color:white;border-radius: 6px;overflow-y:hidden">
                 <div>
-                    <ct-tree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi"
-                        :searchtreeHeight="searchtreeHeight" @loaded="loaded"></ct-tree>
+                    <ct-tree :flagsearch="true" :searchConditionApi="searchConditionApi" ref="reftree"
+                        :searchDataApi="searchDataApi" :searchtreeHeight="searchtreeHeight" @loaded="loaded"></ct-tree>
                 </div>
+
+                <div class="resizer" @mousedown="startResizing"></div>
             </el-aside>
             <el-main v-if="isShowMain">
 
@@ -19,9 +21,9 @@
                     </div>
                 </template>
                 <template v-else>
-                    <div :style="{'height':searchtreeHeight+'px'}">
+                    <div :style="{ 'height': searchtreeHeight + 'px' }">
                         <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi"
-                            :api-param="apiParam"></ct-searchlist>
+                            :api-param="apiParam" @refreshParent="refreshParentHandler"></ct-searchlist>
                     </div>
                 </template>
 
@@ -30,8 +32,9 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { ref, nextTick, watch, onActivated, onMounted } from 'vue'
+import { ref, nextTick, watch, onActivated, onMounted, onUnmounted } from 'vue'
 import common from '../../utils/common'
+import Enum from '../../utils/Enum'
 const emit = defineEmits(['loaded'])
 
 
@@ -59,11 +62,26 @@ const pageType = ref('list')
 const apiParam = ref()
 const searchtreeHeight = ref(0)
 const refleft = ref()
+const reftree = ref()
+
+const asideWidth = ref(Number(props.leftWidth ? props.leftWidth : 200));
+
+let isResizing = false;
+let startX = 0;
+let startWidth = 0;
+const dataRowRouter = ref("");
 function loaded(data) {
 
     isShowMain.value = false;
     pageType.value = "list";
     if (data && data.rowRouter && (JSON.stringify(data.rowRouter) != "{}")) {
+        dataRowRouter.value = JSON.stringify(data.rowRouter);
+
+        let localStorageWidth = window.localStorage.getItem(dataRowRouter.value);
+        localStorageWidth = localStorageWidth ? localStorageWidth : asideWidth.value + "";
+        asideWidth.value = Number(localStorageWidth);
+
+
         formApi.value = data.rowRouter.getLayout;
         pageType.value = data.rowRouter.pageType != undefined ? data.rowRouter.pageType : "list";
         width.value = parseFloat(data.rowRouter.width != undefined ? data.rowRouter.width : "0");
@@ -93,6 +111,43 @@ function setsearchtreeHeight() {
         searchtreeHeight.value = refleft.value.offsetHeight | 0;
     }
 }
+function refreshParentHandler(Data) {
+    //删除树节点
+    if (Data.Notification == Enum.ActionType.Delete) {
+        reftree.value.remove(Data);
+    }
+    else if (Data.Notification == Enum.ActionType.Delete) {
+        reftree.value.addNode(Data);
+    }
+    else if (Data.Notification == Enum.ActionType.Delete) {
+        reftree.value.updateNode(Data);
+    }
+
+}
+
+const startResizing = (event: MouseEvent) => {
+    isResizing = true;
+    startX = event.clientX;
+    startWidth = asideWidth.value;
+    document.addEventListener('mousemove', resizeAside);
+    document.addEventListener('mouseup', stopResizing);
+};
+
+const resizeAside = (event: MouseEvent) => {
+    if (isResizing) {
+        const newWidth = startWidth + (event.clientX - startX);
+        asideWidth.value = newWidth > 50 ? newWidth : 50; // 设置最小宽度为 50px
+
+        window.localStorage.setItem(dataRowRouter.value, asideWidth.value);
+    }
+};
+
+const stopResizing = () => {
+    isResizing = false;
+    document.removeEventListener('mousemove', resizeAside);
+    document.removeEventListener('mouseup', stopResizing);
+};
+
 onActivated(() => {
     nextTick(() => {
         setsearchtreeHeight();
@@ -105,6 +160,28 @@ onMounted(() => {
         })
     })
     setsearchtreeHeight();
+    document.addEventListener('mouseup', stopResizing);
+
 })
 
-</script>
+onUnmounted(() => {
+    document.removeEventListener('mouseup', stopResizing);
+});
+</script>
+
+
+<style scoped>
+.el-aside {
+    position: relative;
+}
+
+.resizer {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 3px;
+    height: 100%;
+    cursor: ew-resize;
+    background-color: rgba(0, 0, 0, 0.2);
+}
+</style>

package/src/loader/src/CheckBoxList.js

@@ -28,6 +28,13 @@ const CheckBoxList = function (source) {
             let currentOptions = source.selectItems1.filter((v) => {
                 return this.value.indexOf(v['code']) >= 0;
             });
+            currentOptions.forEach((v) => {
+                rtn.globalOptions.forEach((v1) => {
+                    if(v.code===v1.code){
+                        v['rowID']=v1['rowID']
+                    }
+                });
+            });
             if (source.code1) {
                 let checked = JSON.parse(source.code1)
                 checked.forEach((v) => {
@@ -42,6 +49,7 @@ const CheckBoxList = function (source) {
                     else {
                         return
                     }
+
                     currentOptions.push(v)
                 });
                 source.code1 = JSON.stringify(currentOptions);

package/src/loader/src/SearchTable.js

@@ -205,6 +205,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
 
                     }
                 }
+                else{
+                    data=data.replace("总耗时", "").replace("總耗時", "");
+                }
                 return data;
             }
             else {
@@ -752,7 +755,9 @@ function apiData(model, callback) {
                     }
                 }
                 else {
-                    model.$vue.loadStats();
+                    if (model.$vue && model.$vue.loadStats) {
+                        model.$vue.loadStats();
+                    }
                 }
                 if (response.content.updateToolButtons) {
                     if (response.content.toolButtons) {

package/src/main.js

@@ -26,7 +26,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -63,7 +63,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1647-1802885825978044416",platform:"WEB"}',
-                authObject: '{EmpID:"Token_7b4fbffd-3089-4925-87ed-bb85c501f81a",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_7b4fbffd-3089-4925-87ed-bb85c501f81a",Platform:"IOS"}',
+                authObject: '{EmpID:"Token_4e6cac0d-0185-4e8c-83ca-e4cf26373ff8",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_4e6cac0d-0185-4e8c-83ca-e4cf26373ff8",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作