centaline-data-driven 1.5.97 → 1.5.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.5.97",
+  "version": "1.5.99",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/release-log.md

@@ -1,3 +1,26 @@
+# v1.5.99
+2024-02-29
+
+优化
+
+列表单元格点击时，支持把当前列的columnName传递到api
+
+列表弹层高度计算优化
+
+# v1.5.98
+2024-01-31
+
+优化
+
+容器布局组件 appContainer 布局优化
+
+# v1.5.98
+2024-01-31
+
+优化
+
+表单列表操作显示逻辑优化
+
 # v1.5.97
 2024-01-29
 新增

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/necessaryfile/ContractConfirmImport/getContractConfirmImportForm'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/third-dept-tran/second-hand-transaction/electronic-contract'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          
+          "originalTraId":"1752262617589448705"
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -96,7 +96,7 @@
   
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/TaskList/getLayoutOfSearch'" :searchStatsApi="'/TaskList/getListStats'" :searchDataApi="'/TaskList/getListOfSearchModel'"></ct-searchlist> -->
     
-    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist> -->
 
 
 
@@ -116,6 +116,8 @@
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceBalanceAlertList/getLayoutOfSearch'" :searchDataApi="'/AttendanceBalanceAlertList/getListOfSearchModel'"></ct-searchlist> -->
 
+    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportWorkQuantifyList/getLayoutOfSearch'" :searchDataApi="'/ReportWorkQuantifyList/getListOfSearchModel'"></ct-searchlist>
+
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/apptest.vue

@@ -0,0 +1,111 @@
+<template>
+  <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
+    <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
+    <ct-appContainer :api="api"   :apiParam="apiParam" :topHeight="topHeight"></ct-appContainer>
+    <ct-dialog-list></ct-dialog-list>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'apptest',
+  data() {
+    return {
+     // api: "",
+      api: "AppContainer/EmployeeClassAssign",
+      apiParam: {
+      },
+      topHeight: undefined,
+      source: {
+       
+          "apps": [
+            {
+              "appID": "employeeList",
+              "appName": "员工列表",
+              "appType": "Search",
+              "appRootUrl": "",
+              "formAction": "",
+              "actionType": 2,
+              "searchCategoryAction": "",
+              "searchAppMenuAction": "",
+              "searchConditionAction": "/EmployeeClassList/getEmployeeLayoutOfSearch",
+              "searchStatsAction": "",
+              "searchDataAction": "/EmployeeClassList/getEmployeeListOfSearchModel",
+              "relationAppID": ""
+
+            },
+            {
+              "appID": "employeeClassList",
+              "appName": "员工班次",
+              "appType": "Search",
+              "appRootUrl": "",
+              "formAction": "",
+              "actionType": 2,
+              "searchCategoryAction": "",
+              "searchAppMenuAction": "",
+              "searchConditionAction": "/EmployeeClassList/getLayoutOfSearch",
+              "searchStatsAction": "",
+              "searchDataAction": "/EmployeeClassList/getListOfSearchModel",
+              "relationAppID": "employeeList"
+            },
+            {
+              "appID": "employeeClassCalenderList",
+              "appName": "员工班次",
+              "appType": "Search",
+              "appRootUrl": "",
+              "formAction": "",
+              "actionType": 2,
+              "searchCategoryAction": "",
+              "searchAppMenuAction": "",
+              "searchConditionAction": "/EmployeeClassCalenderList/getLayoutOfSearch",
+              "searchStatsAction": "",
+              "searchDataAction": "/EmployeeClassCalenderList/getListOfSearchModel",
+              "relationAppID": "employeeList"
+            }
+          ],
+          "layout": {
+            "containerLayoutType": "Container",
+            "appID": "",
+            "layouts": [
+              {
+                "containerLayoutType": "Header",
+                "appID": "employeeList",
+                "height": "500px",
+                "layouts": []
+              },
+              {
+                "containerLayoutType": "Container",
+                "appID": "",
+                "layouts": [
+                  {
+                    "containerLayoutType": "Aside",
+                    "appID": "employeeClassList",
+                    "layouts": [],
+                    "width": "50%",
+                    "height": "400px",
+                    
+                  },
+                  {
+                    "containerLayoutType": "Main",
+                    "appID": "employeeClassCalenderList",
+                    "width": "50%",
+                    "height": "400px",
+                    "layouts": []
+                  }
+                ]
+              }
+            ]
+          }
+       
+      }
+    }
+  },
+  activated() {
+  },
+  methods: {
+    test111(val) {
+       
+    },
+  }
+}
+</script>

package/src/centaline/dialogList/src/dialog.vue

@@ -169,7 +169,7 @@
                                       }
                                     }
                                     else if(self.vmodel.pane && self.vmodel.pane.$el){
-                                      if(self.vmodel.pane.$el.clientHeight<ph) {
+                                      if(self.vmodel.pane.$el.clientHeight<ph+44) {
                                         item.attrs.height=(self.vmodel.pane.$el.clientHeight-60)+'px';
                                       }
                                       if(item.component=='ct-form'){

package/src/centaline/dynamicAppContainer/src/dynamicAppContainer.vue

@@ -1,7 +1,11 @@
 <template>
-  <div class="common-layout"  v-loading="loading">
-
-    <appContainerLayout :apps="model.apps" :layouts="model.layouts" v-if="model !== null && !loading" :firstLoad="true"></appContainerLayout>
+  <div class="common-layout" v-loading="loading" ref="refappContainer" style="display: flex; /* 创建flex容器 */
+    justify-content: center;" :style="{ height: appContainerHeight }">
+<!-- {{appContainerWidth}}<br> -->
+    <appContainerLayout :apps="model.apps" :layouts="model.layouts" v-if="model !== null && !loading&&flagShow" :firstLoad="true"
+      :appContainerTop="appContainerTop+''" :appContainerLeft="appContainerLeft+''" :appContainerHeight="appContainerHeight+''"
+      :appContainerWidth="appContainerWidth+''" :orientation="'1'"  style="width: 100%;">
+    </appContainerLayout>
   </div>
 </template>
 
@@ -23,7 +27,13 @@ export default {
   },
   data() {
     return {
-      loading: true
+      loading: true,
+      appContainerTop: 0,
+      appContainerLeft: 0,
+      appContainerHeight: 0,
+      appContainerWidth: 0,
+      flagShow: true,
+      data: null
     }
   },
   methods: {
@@ -31,26 +41,60 @@ export default {
       var self = this;
       //初始化
       this.loading = true;
-      this.$nextTick(function () {
-        if (typeof self.source !== 'undefined') {
+      this.$nextTick(function () {  
+         if (typeof self.source !== 'undefined') {
           self.load(self.loaderObj.AppContainer(self.source));
         }
-       else if (typeof self.api !== 'undefined') {
+        else if (typeof self.api !== 'undefined') {
           self.loaderObj.AppContainer(self.api, this.apiParam, self.load);
         }
+      
         else if (self.vmodel) {
           self.load(self.vmodel);
         }
       });
     },
     load(data) { 
+      console.log('data',data);
+      this.data = data;
       this.model = data;
       this.model.self = this;
       this.loading = false;
     },
+    setresize() { 
+      let highparentNode = this.getparentNode(this.$refs.refappContainer);
+      this.appContainerHeight = (highparentNode.offsetHeight||document.body.offsetHeight)-5
+      this.appContainerWidth = (highparentNode.offsetWidth||document.body.offsetWidth)-5
+      this.appContainerTop = document.body.offsetHeight - this.appContainerHeight;
+      this.appContainerLeft = document.body.offsetWidth - this.appContainerWidth;
+    },
+    // 获取当前元素的指定父级
+    getparentNode(el) {
+      if (!el.parentNode) { 
+        return el;
+      }
+      let parentElement = el.parentNode; // 初始化为当前元素的父级
+      while (parentElement && typeof parentElement !== 'undefined' && parentElement.offsetHeight <= 0) {
+        parentElement = parentElement.parentNode; // 更新父级元素
+      }
+      return parentElement;
+
+    },
   },
   mounted() {
+    let self = this;
+    window.addEventListener('resize', function () {
+    // self.flagShow = false;
+      self.$nextTick(() => {
+        self.model = self.data;
+        self.setresize();
+       // self.flagShow = true;
+       
+      })
+    })
+     self.setresize();
     this.init();
+
   },
 }
 </script>
@@ -59,9 +103,20 @@ body {
   height: 100%;
   overflow: hidden;
   background: #ddd;
+  margin: 0;  
+    padding: 0;  
+    height: 100%; /* 确保html和body占据全屏 */ 
 }
 
 html {
   height: 100%;
+   margin: 0;  
+    padding: 0;  
+    height: 100%; /* 确保html和body占据全屏 */ 
+}
+.common-layout{
+  display: flex;  
+        height: 100%;
+        width: 100%;  
 }
 </style>

package/src/centaline/dynamicAppContainer/src/dynamicAppContainerLayout.vue

@@ -1,30 +1,31 @@
 <template>
-    <div style="width: 100%;" :class="{ 'isFlex': isFlex }">
-        <template v-for="(item, index) in layouts" style="width: 100%;">
-            <component :is="'el'+item.containerLayoutType" :width="item.width"
-                :style="{ width: item.width, height: item.height, 'margin-top': !firstLoad && item.containerLayoutType == 'Container' ? '0px' : '', 'padding-bottom': '5px' }"
-                :height="item.height">
-                <template v-if="item.appID">
+  <div :class="orientation == 2? 'isRow' : 'isColumn'">
+        <div v-for="(item, index) in layouts"  :style="{ height: item.height , width: item.width ,
+                'padding-bottom': '5px','flex-grow':item.weight=='1'?'1':''}">
+            <!-- 容器 -->
+                <div v-if="item.appID" 
+                :height="item.height " style="height:100%;">
                     <template v-for="(app) in getAppParm(item.appID)">
                         <template v-if="app.relationAppID == '' || (app.relationAppID != '' &&
                             JSON.stringify(apiParam) != '{}')">
+                            <!-- 组件 -->
                             <component :is="'ct-'+app.appType" :searchConditionApi="app.searchConditionAction"
-                                :appID="app.appID" :ref="'ref' + app.appID" :key="index" 
+                                :appID="app.appID" :ref="'ref' + app.appID" :key="index" :pageHeight="item.height "
                                 :searchDataApi="app.searchDataAction" @rowClickHandle="rowClickHandle" :apiParam="apiParam"
                                 :style="{ 'padding-left': index > 0 ? '10px' : '' }" :from="'hasTop'">
                             </component>
-                            <!-- <ct-searchlist :searchConditionApi="app.searchConditionAction" :appID="item.appID"
-                                :ref="'ref' + item.appID" :key="index" :searchDataApi="app.searchDataAction"
-                                @rowClickHandle="rowClickHandle" :apiParam="apiParam"></ct-searchlist> -->
                         </template>
                     </template>
-                </template>
+                </div>
 
                 <dynamicAppContainerLayout v-if="item.layouts && item.layouts.length > 0" :layouts="item.layouts"
-                    :apps="apps" :apiParam="screenPara" :parentAppID="appID" :firstLoad="false" />
-            </component>
+                    :apps="apps" :apiParam="screenPara" :parentAppID="appID" :firstLoad="false"
+                    :appContainerTop="appContainerTop + ''" :appContainerLeft="appContainerLeft + ''"
+                    :appContainerHeight="item.height + ''" :appContainerWidth="item.width + ''" 
+                     :orientation="item.orientation+''"/>
+         
 
-        </template>
+        </div>
 
     </div>
 </template>
@@ -54,29 +55,30 @@ export default {
         parentAppID: {
             type: String,
             default: "",
+        }, 
+        orientation: {
+            type: String,
+            default: "",
         },
         firstLoad: {
             type: Boolean,
             default: true,
         },
+        appContainerTop: String,
+        appContainerLeft: String,
+        appContainerHeight: String,
+        appContainerWidth: String,
     },
     data() {
         return {
             screenPara: {},
             appID: "",
-            appIDs: {}
+            appIDs: {},
+            
         }
     },
-    computed: {
-        isFlex() {
-            return this.layouts.some(n => {
-                return n.containerLayoutType == "Aside"
-            })
-
-        },
-
-    },
     created() {
+        this.load();
     },
     mounted() {
     },
@@ -92,6 +94,11 @@ export default {
             this.appID = appID;
             this.screenPara = data;
         },
+        load() { 
+            let self = this;
+       
+
+        }
     },
     watch: {
         //监听父级传过来的的数据
@@ -119,18 +126,26 @@ export default {
 
             })
         },
+        appContainerWidth: function (newVal, oldVal) { 
+            this.load()
+        }
     },
 } 
 </script>
 <style scoped>
-.isFlex {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-}
 
 .el-header,
 .el-main {
     padding: 0px;
 }
+.isRow{
+    display: flex;
+    flex: 1;
+    height: 100%;
+}
+.isColumn {
+    display: flex;
+    flex-direction: column;
+}
+
 </style>

package/src/centaline/dynamicCalendar/src/dynamicCalendar.vue

@@ -1,79 +1,47 @@
 <template>
   <div id="canlendarBox">
-    <ct-searchScreen
-      ref="screen"
-      :api="searchConditionApi"
-      :key="reloadKeyScreen"
-      @loaded="screenLoaded"
-      :screenPara="apiParam"
-      @resetSearch="resetSearch()"
-      @search="search()"
-      style="margin-bottom: 10px"
-    ></ct-searchScreen>
+    <DIV v-if="flagShow">
+      <ct-searchScreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen" @loaded="screenLoaded"
+        :screenPara="apiParam" @resetSearch="resetSearch()" @search="search()"
+        style="margin-bottom: 10px"></ct-searchScreen>
 
-    <div
-      class="canlendar"
-      id="canlendar"
-      :style="getCalerndarStyle"
-      :class="[theme ? theme : '']"
-      v-loading="loading"
-    >
-      <div class="canlendar_content flex flex-wrap" id="fieldNameBox">
-        <div
-          class="header-item flex flex-column flex-center"
-          v-for="item in weekArr"
-          :key="item"
-          @contextmenu.prevent.stop="closeRightClick"
-        >
-          <div>{{ item }}</div>
-        </div>
-        <div
-          id="fieldName"
-          v-for="(value, index) in dayArr"
-          @contextmenu.prevent.stop="openRightClick($event, value)"
-          :key="index"
-          :class="[
-            value.isCurrentMonth ? '' : 'item-disabled',
-            value.isSelected && !value.isToday ? 'canlendar_selected' : '',
-            value.isToday ? 'canlendar_today' : '',
-            'item canlendar_item flex flex-column flex-center',
-          ]"
-        >
-          <section
-            v-for="(item, index) in getDayData(value.day)"
-            :key="index"
-            v-if="value.isCurrentMonth&&model.columns"
-          >
-            <div v-for="(col, index) in model.columns" :key="index">
-              <div v-if="col.fieldName != 'operation'">
-                <span v-if="col.fieldName == 'date'" class="date-text">
-                  {{ extractedDate(item[col.fieldName]) }}
-                </span>
-                <span v-else v-html="item[col.fieldName]"> </span>
+      <div class="canlendar" id="canlendar" :style="getCalerndarStyle" :class="[theme ? theme : '']" v-loading="loading">
+        <div class="canlendar_content flex flex-wrap" id="fieldNameBox">
+          <div class="header-item flex flex-column flex-center" v-for="item in weekArr" :key="item"
+            @contextmenu.prevent.stop="closeRightClick">
+            <div>{{ item }}</div>
+          </div>
+          <div id="fieldName" v-for="(value, index) in dayArr" @contextmenu.prevent.stop="openRightClick($event, value)"
+            :key="index" :class="[
+              value.isCurrentMonth ? '' : 'item-disabled',
+              value.isSelected && !value.isToday ? 'canlendar_selected' : '',
+              value.isToday ? 'canlendar_today' : '',
+              'item canlendar_item flex flex-column flex-center',
+            ]">
+            <section v-for="(item, index) in getDayData(value.day)" :key="index"
+              v-if="value.isCurrentMonth && model.columns">
+              <div v-for="(col, index) in model.columns" :key="index">
+                <div v-if="col.fieldName != 'operation'">
+                  <span v-if="col.fieldName == 'date'" class="date-text">
+                    {{ extractedDate(item[col.fieldName]) }}
+                  </span>
+                  <span v-else v-html="item[col.fieldName]"> </span>
+                </div>
               </div>
-            </div>
-          </section>
+            </section>
+          </div>
         </div>
       </div>
-    </div>
-    <div
-      class="box-menu"
-      id="boxMenu"
-      v-show="menuVisible && actionRouter"
-      :style="{ left: menu_left + 'px', top: menu_top + 'px' }"
-    >
-      <div
-        class="opertion"
-        v-for="(item, index) in actionRouter"
-        :key="index"
-        @click="routerClickHandler(item)"
-      >
-        <div v-if="currentData[item.rightField] == 1">
-          <div class="memuItem">{{ item.label }}</div>
+      <div class="box-menu" id="boxMenu" v-show="menuVisible && actionRouter"
+        :style="{ left: menu_left + 'px', top: menu_top + 'px' }">
+        <div class="opertion" v-for="(item, index) in actionRouter" :key="index" @click="routerClickHandler(item)">
+          <div v-if="currentData[item.rightField] == 1">
+            <div class="memuItem">{{ item.label }}</div>
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  </DIV>
 </template>
 
 <script>
@@ -111,7 +79,7 @@ export default {
     searchDataApi: String,
     apiParam: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
   },
   computed: {
@@ -122,7 +90,7 @@ export default {
       };
     },
   },
-  created() {},
+  created() { },
   data() {
     let year = moment().year();
     let month = moment().month() + 1;
@@ -152,9 +120,10 @@ export default {
       menu_top: 0,
       menu_left: 0,
       actionRouter: [],
+      flagShow:true
     };
   },
-  mounted() {},
+  mounted() { },
   methods: {
     extractedDate(date) {
       // 使用 split 方法按照 "-" 分割字符串，然后返回最后一个元素
@@ -279,7 +248,7 @@ export default {
         }
         // 监听事件鼠标点击事件，若点击则隐藏菜单
         document.addEventListener("click", this.foo);
-      }else{
+      } else {
         this.menuVisible = false;
       }
     },
@@ -346,7 +315,7 @@ export default {
           .then(() => {
             clickAcion();
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         clickAcion();
       }
@@ -362,10 +331,10 @@ export default {
 
       self.openDialog(action, actionRouterData, function (newData) {
         // 在页面增加删除修改
-        self.model.doAction(action, newData,self.searchDataApi);
+        self.model.doAction(action, newData, self.searchDataApi);
       });
     },
-    
+
     change() {
       let fullDate = moment(
         this.year + "-" + this.month + "-" + this.day,
@@ -458,6 +427,13 @@ export default {
       }
       this.change();
     },
+    reload() {
+      let self = this;
+      this.flagShow = false;
+      self.$nextTick(() => {
+        this.flagShow = true;
+      })
+    },
   },
 };
 </script>

package/src/centaline/dynamicForm/src/dynamicFormListTable.vue

@@ -35,7 +35,6 @@
                 </span>
                 <!--可点击的列-->
                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">
-                  <span>{{scope.row.isSet}}</span>
                   <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </span>
@@ -44,7 +43,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}