centaline-data-driven 1.5.80 → 1.5.82

package/build/centaline/centaline.path.js

@@ -43,6 +43,7 @@ const paths = {
     "dynamicPlaceHolder": "./src/centaline/dynamicPlaceHolder/index.js", //占位控件
     "dynamicDetail": "./src/centaline/dynamicDetail/index.js", //详情页控件
     "dynamicTree": "./src/centaline/dynamicTree/index.js", //树组件
+    "dynamicTreeList": "./src/centaline/dynamicTreeList/index.js", //树组件组合带列表或表单
     "dynamicSensitiveEye": "./src/centaline/dynamicSensitiveEye/index.js", ////敏感数据小眼睛控
     "dynamicCb": "./src/centaline/dynamicCb/index.js", ////复选框
     "progress": "./src/centaline/progress/index.js", //进度条 

package/package.json

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

package/release-log.md

@@ -1,3 +1,20 @@
+# v1.5.82
+2023-11-28
+优化
+树组件高度计算优化,边框线去掉
+
+
+# v1.5.81
+2023-11-28
+优化
+树组件与表格拆分成独立组件
+
+查询重置报错处理
+
+新增
+
+表格增加拖拽功能
+
 # v1.5.80
 2023-11-23
 bug修复

package/src/SearchList.vue

@@ -25,7 +25,9 @@
 
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/invoice-apply/layout'"  :searchDataApi="'/api/finance/invoice-apply/list'"></ct-searchlist> -->
 
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/api/approveManage/contractBatchOperation/getLayoutOfSearch'"  :searchDataApi="'/api/approveManage/contractBatchOperation/getTableList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/approveManage/contractBatchOperation/getLayoutOfSearch'"  :searchDataApi="'/api/approveManage/contractBatchOperation/getTableList'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/distribution/standing-book/layout'"  :searchDataApi="'/api/distribution/standing-book/list'"></ct-searchlist> -->
 
 
     <!-- <ct-searchlist :apiParam="para"
@@ -105,6 +107,8 @@
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/HolidayTypeList/getLayoutOfSearch'" :searchDataApi="'/HolidayTypeList/getListOfSearchModel'"></ct-searchlist> -->
 
+    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemLogList/getLayoutOfSearch'" :searchDataApi="'/SystemLogList/getListOfSearchModel'"></ct-searchlist>
+
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/api/index.js

@@ -127,7 +127,7 @@ Axios.defaults.maxContentLength = 400000;
 
 const api = {
   get(url, params, callback) {
-    if(params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
+    if(params.action&&params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
       url=params.action;
       params = params.para;
     }
@@ -146,7 +146,7 @@ const api = {
     );
   },
   post(url, params, callback) {
-    if(params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
+    if(params.action&&params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
       url=params.action;
       params = params.para;
     }
@@ -251,7 +251,7 @@ const api = {
     return Promise.resolve(response.data,response.headers);
   },
   postHandler(url, params, scripts) {
-    if(params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
+    if(params.action&&params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
       url=params.action;
       params = params.para;
     }
@@ -284,7 +284,7 @@ const api = {
     });
   },  
   postBlobHandler(url, params, scripts) {
-    if(params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
+    if(params.action&&params.action.indexOf('http://')>-1||params.action.indexOf('https://')>-1){
       url=params.action;
       params = params.para;
     }

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -136,7 +136,7 @@
           <div class="ScanUploadPhoto" v-if="qrcodeVisible"  @click.stop="qrcodeVisible=true" :style="{ top: QRCodeRefTop + 'px', left: QRCodeRefLeft + 'px' }">
               <div style="border-bottom:none">
                 <div style="text-align: center;margin-bottom:10px;margin-top:5px;color:#666666;font-size: 14px;">扫码上传</div>
-                <i class="jiao"></i>
+                <i class="jiao" :style="{ top: QRCodeRefJiaoTop + 'px'}"></i>
                 <div style="width:200px; height:200px;">
                   <img v-if="qrCodeImg" :src="qrCodeImg" width="200" height="200" :style="isQrCode?'opacity: 0.1':''" />
                   <div class="div-fail" v-if="isQrCode">
@@ -736,7 +736,7 @@
           var QRCodeRefWith = QRCodeRef.width;
           var QRCodeRefBottom=QRCodeRef.getBoundingClientRect().bottom;
           var h=window.innerHeight;
-          if(h-QRCodeRefBottom<270){
+          if(h-QRCodeRefBottom<270&&h-QRCodeRefBottom>0){
               self.QRCodeRefTop =h-280;
               self.QRCodeRefJiaoTop=270-(h-QRCodeRefBottom)>220?220:270-(h-QRCodeRefBottom);
           }

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -16,7 +16,9 @@
       @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" @closeSideBar="closeSideBar" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
-      @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler"></ct-searchtable>      
+      @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler"
+      @drop="drop"   :dragStartItem="dragStartItem" :dragStartName="dragStartName"
+      ></ct-searchtable>      
     </div>
     <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
@@ -76,7 +78,13 @@
       flagPopupSearchlist:{
         Boolean,
         default:false,
-      },
+      }, dragStartItem:{
+        String,
+        default: '',
+      }, dragStartName:{
+        String,
+        default: '',
+      },  
     },
     data() {
       return {
@@ -114,6 +122,7 @@
         drowerClose:'',
         listHeight:0,
         pageHeightReal: '',
+        
       }
     },
     created() {
@@ -463,6 +472,9 @@
           this.$refs.table.updateCurrentRow({flagFreshCurrentRow:true},{responseData:responseData});
         }
       },
+      drop(row, column) {
+        this.$emit('drop',row,column);
+      }
     },
     beforeDestroy() {
       async function destroyDeep(vnode) {
@@ -483,6 +495,15 @@
       }
       destroyDeep(this._vnode)
     },
+     watch: {
+      pageHeight: function (val) {
+      if(this.pageHeight) {
+          this.pageHeightReal=this.pageHeight;
+          this.$refs.table.setTableHeight();
+        }
+      },
+    
+   },
   }
 </script>
 <style lang="scss" scoped>

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -100,7 +100,11 @@
                   column.fixed === 'left' ? 'left-fixation' : null,
                   column.width === undefined ? 'ct-table-auto' : null,
                   column.fixed === 'right' ? 'right-fixation' : null,
-                ]" v-bind="column.attrs">
+                ]" v-bind="column.attrs" 
+                 @drop="drop($event,row, column, 'body')"
+                 @dragover.prevent
+                 @dragenter="dragenter($event, column,'body')"
+                 @dragleave="dragleave($event, column,'body')">
                 <!--操作列-->
                 <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" style="float: left;">
                   <template v-for="(router, rowRouterIndex) in getRowRouterShow(row)" >
@@ -167,6 +171,8 @@
                 <div v-else-if="typeof column.template === 'undefined'"
                      :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" :style="column.style ? column.style : ''">
                   {{ $common.getDataOfUpperLower(row, column.id) }}
+
+                  
                 </div>
 
                 <!--模版列(启用)-->
@@ -255,7 +261,15 @@ export default {
     screenTop: {
       Number,
       default: 0,
-    },   
+    },
+    dragStartItem:{
+      String,
+      default: '',
+     },
+    dragStartName:{
+      String,
+      default: '',
+    }, 
   },
   computed: {},
   data() {
@@ -301,6 +315,8 @@ export default {
       theadTitleWidth:0,
       updateTableColumnsKey:0,
       backgroundColor: "#ecf5ff",
+      dragenterEl:null,
+
     };
   },
   deactivated(){
@@ -759,6 +775,7 @@ export default {
         if (this.$refs.searchTable && this.$refs.toolbar &&
           this.$refs.searchTable.parentElement && !self.isLayout) {
           var h1 = this.$refs.searchTable.parentElement.offsetHeight | 0;
+          var h1top = this.$refs.searchTable.parentElement.offsetTop| 0;
           var h2 = this.$refs.searchTable.offsetTop | 0;
           if(this.from && this.from=='detail'){
             h2=h2-this.screenTop - 13;
@@ -782,7 +799,7 @@ export default {
           && this.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
             h9 = 4
           }
-          let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 + h9 - 8 ;
+          let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 + h9 - 8+h1top ;
           
           this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
           this.$nextTick(() => {
@@ -2138,6 +2155,107 @@ export default {
         });
       }
     },
+ 
+    drop(e, row,column, name) {
+      let self = this;
+      let routerKey = "edit";
+      let submitData = {};
+      if (this.dragStartName == "top" &&name == "body" &&column.paramName == "drop") {
+        var actionRouter = self.model.actionRouter;
+        let field = actionRouter.find((b) => {
+          return b.id === routerKey;
+        });
+
+        field.submitListField.forEach((k) => {
+          let keyLower = self.$common.initialsToLowerCase(k);
+          let keyUpper = self.$common.initialsToUpperCase(k);
+          submitData[k] = row[keyLower] || row[keyUpper];
+        });
+        submitData["columnFieldName"] = column.id;
+        submitData["dropObject"] = self.dragStartItem; 
+
+        this.$api
+          .postHandler(this.$common.globalUri(), {
+            action: field.action,
+            para: submitData,
+          })
+          .then(function (response) {
+          if (response.rtnCode === 200) {
+            self.$nextTick(() => {
+              let key = column.id;
+              if (row[key]!=undefined) {
+                row[key] = self.dragStartItem.name;
+              } else if (row[self.$common.initialsToUpperCase(key)]!=undefined) {
+                row[self.$common.initialsToUpperCase(key)] =
+                  self.dragStartItem.name;
+              } else if (row[self.$common.initialsToLowerCase(key)]!=undefined) {
+                row[self.$common.initialsToLowerCase(key)] =
+                  self.dragStartItem.name;
+              }
+              self.$forceUpdate();
+            });
+            }
+          });
+
+        if (name === "body") {
+         let el=e.target.nodeName.toLowerCase()=="td"?e.target:this.getTDOfParents(e.target);
+        this.removeClass(el, "dragEnterHover");
+        }
+      }
+
+      this.$emit("drop", row, column);
+
+    },
+    dragenter(e,column, name) {
+      let el=e.target.nodeName.toLowerCase()=="td"?e.target:this.getTDOfParents(e.target);
+      if (name === "body"&&column.paramName == "drop") {
+        this.addClass(el, "dragEnterHover");
+      } 
+      this.dragenterEl=el;
+
+    },
+    dragleave(e, column,name) {
+     let el=e.target.nodeName.toLowerCase()=="td"?e.target:this.getTDOfParents(e.target);
+      // 目标节点的背景色恢复原样
+      if (name === "body"&&this.dragenterEl!=el) {
+        this.removeClass(el, "dragEnterHover");
+      }
+
+    },
+   getTDOfParents(element) {
+      let currentElement = element.parentElement;
+      
+      while (currentElement&&currentElement.nodeName.toLowerCase()!="td") {
+     
+        currentElement = currentElement.parentElement;
+      }
+      return currentElement;
+    },
+    // 删除样式
+    removeClass(el, className) {
+      if (!this.hasClass(el, className)) return;
+      let newClassName = (el.className || "").split(" ");
+      let index = newClassName.findIndex((item) => {
+        return item == className;
+      });
+      newClassName.splice(index, 1);
+      el.className = newClassName.join(" ");
+    },
+    // 判断是否包括样式
+    hasClass(el, className) {
+      let reg = new RegExp("(^|\\s)" + className + "($|\\s)");
+      console.log(reg.test(el.className));
+      return reg.test(el.className);
+    },
+    // 添加样式
+    addClass(el, className) {
+      if (this.hasClass(el, className)) return;
+      let newClassName = (el.className || "").split(" ");
+      newClassName.push(className);
+      el.className = newClassName.join(" ");
+    },
+
+
   },
 };
 </script>
@@ -2440,5 +2558,10 @@ white-space: nowrap;
     -webkit-animation:none !important; 
     animation:none !important; 
 }
+.ct-searchtable .dragEnterHover {
+  border: 1px dashed #e03333 !important;
+    color: #e03333 !important;
+    /* box-shadow: 0 15px 20px rgba(0, 0, 0, 0.3); */
+}
 </style>
 

package/src/centaline/dynamicTree/index.js

@@ -1,11 +1,11 @@
-import dynamicTree from './src/dynamicTreeList'
+import dynamicSearchTree from './src/dynamicSearchTree'
 
-dynamicTree.install = function (Vue) {
-  Vue.component(dynamicTree.name, dynamicTree);
+dynamicSearchTree.install = function (Vue) {
+  Vue.component(dynamicSearchTree.name, dynamicSearchTree);
 }
 
 if (typeof window !== 'undefined' && window.Vue) {
-  window.Vue.use(dynamicTree);
+  window.Vue.use(dynamicSearchTree);
 }
 
-export default dynamicTree;
+export default dynamicSearchTree;