centaline-data-driven 1.5.71 → 1.5.72

package/README.md

@@ -153,9 +153,10 @@ execServerScript(action, object, successCallback)
   * @param {boolean} center 是否居中。
   * @param {number} duration 显示时间,1500毫秒。设为 0 则不会自动关闭。
   * @param {boolean} showClose 是否显示关闭按钮。
+  * @param {boolean} dangerouslyUseHTMLString 是否将 message 属性作为 HTML 片段处理。
   * @desc 消息提示。常用于主动操作后的反馈提示。
   */
-message(message, type, center, duration, showClose)
+message(message, type, center, duration, showClose,dangerouslyUseHTMLString)
 
 ```
 

package/package.json

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

package/release-log.md

@@ -1,3 +1,16 @@
+## v1.5.72
+2023-11-01
+优化
+
+日历组件右键操作栏位置计算逻辑
+
+树组件右键操作栏位置计算逻辑
+
+FormList 提示优化
+
+日历组件优化刷新
+
+
 ## v1.5.71
 2023-10-30
 

package/src/centaline/common/index.js

@@ -351,6 +351,9 @@ const common = {
       else if (parent.$options.name === 'DataDrivenSearchTree') {
         return parent;
       } 
+      else if (parent.$options.name === 'DataDrivenEmployeeClassList') {
+        return parent;
+      } 
       else {
         return this.getParentPane(parent);
       }

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

@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <!-- <ct-searchScreen ref="screen" :api="searchConditionApi" :screenPara="apiParam" @search="search"  @loaded="screenLoaded"  @resetSearch="resetSearch()"
-      @clickHandler="rolRouterClickHandler" style="margin-bottom: 10px;"></ct-searchScreen> -->
+  <div id="canlendarBox">
     <ct-searchScreen
       ref="screen"
       :api="searchConditionApi"
@@ -20,16 +18,19 @@
       :class="[theme ? theme : '']"
       v-loading="loading"
     >
-      <div class="canlendar_content flex flex-wrap">
+      <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
-          v-for="(value, index) in dayArr" @contextmenu.prevent.stop="rightClick($event, value)"
+          id="fieldName"
+          v-for="(value, index) in dayArr"
+          @contextmenu.prevent.stop="openRightClick($event, value)"
           :key="index"
           :class="[
             value.isCurrentMonth ? '' : 'item-disabled',
@@ -38,32 +39,35 @@
             'item canlendar_item flex flex-column flex-center',
           ]"
         >
-          <div
+          <section
             v-for="(item, index) in getDayData(value.day)"
             :key="index"
-            v-if="model.columns" 
+            v-if="model.columns"
           >
-            <div v-for="(col, index) in model.columns" :key="index" >
-              <div
-               
-                v-if="col.fieldName != 'operation'"
-              >
+            <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>
-                  {{ item[col.fieldName] }}
-                </span>
+                <span v-else v-html="item[col.fieldName]"> </span>
               </div>
             </div>
-          </div>
+          </section>
         </div>
       </div>
     </div>
-  
-    <div class="box-menu" v-if="menuVisible && model.actionRouter"
-      :style="{ left: menu_left + 'px', top: menu_top + 'px' }">
-      <div class="opertion" @click="routerClickHandler(item)" v-for="(item, index) in model.actionRouter" :key="index">
+    <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>
@@ -81,24 +85,24 @@ export default {
   mixins: [dynamicElement],
   // 注册局部组件
   components: {
-    "ct-searchScreen": dynamicSearchScreen
+    "ct-searchScreen": dynamicSearchScreen,
   },
   props: {
     width: {
       type: [Number, String],
-      default: "100%"
+      default: "100%",
     },
     height: {
       type: [Number, String],
-      default: ""
+      default: "",
     },
     theme: {
       type: String,
-      default: ""
+      default: "",
     },
     autoMonthSwitch: {
       type: Boolean,
-      default: true
+      default: true,
     },
     vmodel: Object,
     api: String,
@@ -107,16 +111,16 @@ export default {
     searchDataApi: String,
     apiParam: {
       type: Object,
-      default: () => {}
-    }
+      default: () => {},
+    },
   },
   computed: {
     getCalerndarStyle() {
       return {
         width: this.width,
-        height: this.height
+        height: this.height,
       };
-    }
+    },
   },
   created() {},
   data() {
@@ -125,7 +129,7 @@ export default {
     let day = moment().date();
     return {
       loaded: {
-        screenLoaded: false
+        screenLoaded: false,
       },
       currentTime: "",
       today: moment().format("YYYY-MM-DD"),
@@ -140,11 +144,14 @@ export default {
         "星期三",
         "星期四",
         "星期五",
-        "星期六"
+        "星期六",
       ],
       loading: true,
       menuVisible: false,
-      currentData: {}
+      currentData: {},
+      menu_top: 0,
+      menu_left: 0,
+      actionRouter: [],
     };
   },
   mounted() {},
@@ -155,15 +162,9 @@ export default {
     },
     getDayData(day) {
       if (this.model && this.model.listData) {
-        let fileList = this.model.listData.filter(item => {
-          return (
-            item.date
-              .split("-")
-              .slice(2)
-              .join("-") == day
-          );
+        let fileList = this.model.listData.filter((item) => {
+          return item.date.split("-").slice(2).join("-") == day;
         });
-        console.log(fileList);
         return fileList;
       }
       return [];
@@ -175,13 +176,12 @@ export default {
     screenLoaded() {
       var self = this;
       self.search(self.$refs.screen.model);
-    }, 
+    },
     initdate() {
       if (this.currentTime && moment(this.currentTime).isValid()) {
         this.day = moment(this.currentTime).date();
         this.month = moment(this.currentTime).month() + 1;
         this.year = moment(this.currentTime).year();
-    
       }
       this.build();
     },
@@ -195,14 +195,15 @@ export default {
           this.$refs.screen.model.defaultSearch,
           self.load
         );
-      
+
         this.$emit("search", self.$refs.screen.model);
       }
     },
     load(data) {
       var self = this;
       self.model = data;
-      self.$nextTick(function() {
+      self.actionRouter = self.model.actionRouter;
+      self.$nextTick(function () {
         if (self.model.listData.length > 0) {
           self.currentTime = self.model.listData[0].date;
           this.model.value = 0;
@@ -210,32 +211,91 @@ export default {
         }
       });
       self.loading = false;
-    },
-    rightClick(event, object) {
-      this.currentData = this.getDayData(object.day)[0]; // 定义变量接收该节点所对应的对象
-      if (this.model.actionRouter) {
-        this.model.actionRouter.forEach(v => {
-          if (this.currentData[v.rightField] == "1") {
-            this.menuVisible = true; //显示增删改的div
-          }
+      document
+        .getElementById("canlendar")
+        .addEventListener("contextmenu", function (e) {
+          e.preventDefault();
         });
+      this.closeRightClick()
+    },
+    openRightClick(event, object) {
+      if (object.isCurrentMonth) {
+        // 获取单元格的宽高
+        // let fieldNameWidth = document.getElementById('fieldName').offsetWidth;
+        let fieldNameHeight = document.getElementById("fieldName").offsetHeight;
+        // 获取父元素
+        const canlendarEle = document.getElementById("canlendar");
+        // 获取目标元素
+        const clickedElement = event.target;
+        var centerX;
+        var centerY;
+        if (event.target.tagName === "DIV") {
+          centerX = canlendarEle.offsetLeft + clickedElement.offsetLeft;
+          centerY =
+            canlendarEle.offsetTop + clickedElement.offsetTop + fieldNameHeight;
+        } else if (event.target.tagName === "SECTION") {
+          centerX =
+            canlendarEle.offsetLeft + clickedElement.parentElement.offsetLeft;
+          centerY =
+            canlendarEle.offsetTop +
+            clickedElement.parentElement.offsetTop +
+            fieldNameHeight;
+        } else if (event.target.tagName === "SPAN") {
+          centerX =
+            canlendarEle.offsetLeft +
+            clickedElement.parentElement.parentElement.parentElement
+              .parentElement.offsetLeft;
+          centerY =
+            canlendarEle.offsetTop +
+            clickedElement.parentElement.parentElement.parentElement
+              .parentElement.offsetTop +
+            fieldNameHeight;
+        }
+        // 获取文本内容的宽高
+        let mainHeight = document.getElementById("app-Class").offsetHeight;
+        let mainWidth = document.getElementById("app-Class").offsetWidth;
+        if (centerX + 150 > mainWidth) {
+          this.menu_left = centerX - (centerX + 150 - mainWidth) - 10;
+        } else {
+          this.menu_left = centerX;
+        }
+        if (centerY + 72 > mainHeight) {
+          this.menu_top = centerY - fieldNameHeight * 2 - 10;
+        } else {
+          this.menu_top = centerY;
+        }
+        this.currentData = this.getDayData(object.day)[0]; // 定义变量接收该节点所对应的对象
+        if (this.model.actionRouter) {
+          this.model.actionRouter.forEach((v) => {
+            if (this.currentData[v.rightField] == "1") {
+              this.menuVisible = true; //显示增删改的div
+              document
+                .getElementById("boxMenu")
+                .addEventListener("contextmenu", function (e) {
+                  e.preventDefault();
+                });
+            }
+          });
+        }
+        // 监听事件鼠标点击事件，若点击则隐藏菜单
+        document.addEventListener("click", this.foo);
+      }else{
+        this.menuVisible = false;
       }
-      // 监听事件鼠标点击事件，若点击则隐藏菜单
-      document.addEventListener("click", this.foo); 
-      // 以下两句话将菜单显示在鼠标点击旁边定位
-      this.menu_left = event.clientX ;
-      this.menu_top = event.clientY;
     },
     foo() {
       this.menuVisible = false;
       //  要及时关掉监听，不关掉的是一个坑，不信你试试，虽然前台显示的时候没有啥毛病，加一个alert你就知道了
       document.removeEventListener("click", this.foo);
     },
+    closeRightClick() {
+      this.menuVisible = false;
+    },
     // 打开弹层
     openDialog(field, apiParam, callBack) {
       var self = this;
       field.apiParam = apiParam;
-      var clickAcion = function() {
+      var clickAcion = function () {
         if (field.isOpenForm) {
           // 对话框
           let dialogOption = {
@@ -249,27 +309,27 @@ export default {
                   apiParam: field.apiParam,
                   showTitle: true,
                   width: field.dialogWidth + "px",
-                  height: field.dialogHeight + "px"
+                  height: field.dialogHeight + "px",
                 },
                 on: {
                   submit(ev) {
                     if (callBack) {
-                      callBack(ev.responseData.content[0]);
+                      callBack(ev.responseData);
                     }
                     self.$common.closeDialog(dialogOption.dialog);
-                  }
-                }
-              }
-            ]
+                  },
+                },
+              },
+            ],
           };
           self.$common.openDialog(dialogOption);
         } else {
           self.model.getCurrentRowApiData(
             field.action,
             field.apiParam,
-            function(data) {
-              if (data) {
-                callBack();
+            function (response) {
+              if (response) {
+                callBack(response);
               }
             }
           );
@@ -281,7 +341,7 @@ export default {
             confirmButtonText: field.alertOKButtonText,
             cancelButtonText: field.alertCancelButtonText,
             //type: 'warning'
-            center: field.alertCenter
+            center: field.alertCenter,
           })
           .then(() => {
             clickAcion();
@@ -295,27 +355,27 @@ export default {
     routerClickHandler(action) {
       let self = this;
       var actionRouterData = {};
-      action.submitFormField.forEach(v => {
+      action.submitFormField.forEach((v) => {
         actionRouterData[v] = self.currentData[v];
       });
       actionRouterData.actionType = action.actionType;
-     
-      self.openDialog(action, actionRouterData, function(newData) {
+
+      self.openDialog(action, actionRouterData, function (newData) {
         // 在页面增加删除修改
-        self.model.doAction(action, newData, self.currentNode);
+        self.model.doAction(action, newData,self.searchDataApi);
       });
     },
-     //删除树节点
-     remove(newData) {
+    //删除树节点
+    remove(newData) {
       let self = this;
-      self.getNextClickNode()
+      self.getNextClickNode();
       this.$refs.Tree.remove(self.currentNode);
     },
     //新增树节点
     add(newData) {
       let self = this;
-      this.$refs.Tree.append(newData, self.currentNode)
-      this.handleNodeClick(newData,true)
+      this.$refs.Tree.append(newData, self.currentNode);
+      this.handleNodeClick(newData, true);
     },
     change() {
       let fullDate = moment(
@@ -324,7 +384,7 @@ export default {
       ).format();
       this.$emit("change", fullDate);
     },
-    build: function(year, month, day, labelName) {
+    build: function (year, month, day, labelName) {
       year = year || this.year;
       month === 0 ? (month = -1) : (month = month || this.month);
       day = day || this.day;
@@ -361,7 +421,7 @@ export default {
         this.dayArr.push({
           day: lastMonthDay,
           month: month - 1,
-          isCurrentMonth: false
+          isCurrentMonth: false,
         });
       }
       //构建当前月份的日期
@@ -370,20 +430,19 @@ export default {
           year + "-" + month + "-" + i,
           "YYYY-MM-DD"
         ).format("YYYY-MM-DD");
-        let isToday = false ,
-         isSelected = false;
+        let isToday = false,
+          isSelected = false;
         if (fullDate === this.today) {
           isToday = true;
-          isSelected= true;
-        } 
-          this.dayArr.push({
-            month: month,
-            day: i,
-            isCurrentMonth: true,
-            isSelected: isSelected,
-            isToday: isToday
-          });
-        
+          isSelected = true;
+        }
+        this.dayArr.push({
+          month: month,
+          day: i,
+          isCurrentMonth: true,
+          isSelected: isSelected,
+          isToday: isToday,
+        });
       }
       //构建下个月的日期
       let nextMonthDay = 1;
@@ -391,7 +450,7 @@ export default {
         this.dayArr.push({
           day: nextMonthDay,
           month: month + 1,
-          isCurrentMonth: false
+          isCurrentMonth: false,
         });
         nextMonthDay++;
       }
@@ -403,14 +462,14 @@ export default {
           this.dayArr.push({
             day: nextMonthDay,
             month: month + 1,
-            isCurrentMonth: false
+            isCurrentMonth: false,
           });
           nextMonthDay++;
         }
       }
       this.change();
-    }
-  }
+    },
+  },
 };
 </script>
 

package/src/centaline/dynamicCalendar/src/index.css

@@ -137,7 +137,7 @@
 .canlendar .canlendar_today {
 	/* background: var(--color-primary-light); */
 	/* color: var(--chinaRed); */
-	border-radius: 12%;
+	/* border-radius: 12%; */
 	text-align: center;
 }
 

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

@@ -333,11 +333,7 @@
         var rtnBool = true;
         for (let i of self.model.tableData) {
           if (i.isSet) {
-            self.$message({
-              message: "请先保存表格编辑项",
-              type: 'warning',
-              showClose:true,
-            });
+            self.validMessage= "请先保存表格编辑项";
             rtnBool = false;
           }
         };

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -185,23 +185,36 @@ export default {
         this.firstLevel = false // 否则视为叶子节点不添加同级选项
 
       }
+      let actionIndex = 0;
       if (this.model.actionRouter) {
         this.model.actionRouter.forEach(v => {
           if (this.currentData[v.rightField] == '1') {
             this.menuVisible = true //显示增删改的div
+            actionIndex +=1;  
           }
         })
       }
       document.addEventListener('click', this.foo)  // 监听事件鼠标点击事件，若点击则隐藏菜单
-      let sideWidth = 0;
-      if (document.getElementsByClassName('sidebar-container')[0]) {
-        sideWidth = document.getElementsByClassName('sidebar-container')[0].clientWidth + 10 || 0;
-      }
-      // 以下两句话将菜单显示在鼠标点击旁边定位
-      this.menu_left = event.clientX - document.getElementById('mytree').offsetLeft - sideWidth;
-      this.menu_top = event.clientY - document.getElementById('mytree').offsetTop + 10;
+     //  获取树状图的高度
+      let treeHeight = document.getElementById("mytree").offsetHeight;
+         // 获取文本内容的宽高
+         let mainHeight = document.getElementById("app-Tree").offsetHeight;
+        let mainWidth = document.getElementById("app-Tree").offsetWidth;
+        // 10是padding 获取查询条件高度
+        let screenHeight = document.getElementById("mytree").parentElement.offsetHeight - treeHeight - 10;
+        let windowWidth = window.innerWidth;  
+       let windowHeight = window.innerHeight;
+       // 将菜单显示在鼠标点击旁边定位
+       this.menu_left = event.clientX -( windowWidth - mainWidth);
+       // 18是节点文本的高度
+       this.menu_top =event.clientY - ( windowHeight -mainHeight) - screenHeight + actionIndex*30  +18;
+      //  微调
+       if (document.getElementById("uplink")) {
+        this.menu_top = this.menu_top -8;
+       } else if(document.getElementById("onecard")){
+        this.menu_top = this.menu_top +10;
+       }
     },
-
     foo() {
       this.menuVisible = false
       //  要及时关掉监听，不关掉的是一个坑，不信你试试，虽然前台显示的时候没有啥毛病，加一个alert你就知道了

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -86,7 +86,8 @@ export default {
           }
 
         });
-      }
+      }      
+      this.$emit('loaded');
     },
   setsearchtreeHeight(){
      let self = this;