centaline-data-driven 1.5.81 → 1.5.82

package/package.json

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

package/release-log.md

@@ -1,3 +1,9 @@
+# v1.5.82
+2023-11-28
+优化
+树组件高度计算优化,边框线去掉
+
+
 # v1.5.81
 2023-11-28
 优化

package/src/SearchList.vue

@@ -107,7 +107,7 @@
 
     <!-- <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-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemLogList/getLayoutOfSearch'" :searchDataApi="'/SystemLogList/getListOfSearchModel'"></ct-searchlist>
 
 
     <ct-dialog-list></ct-dialog-list>

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

@@ -5,7 +5,8 @@
       :api="searchConditionApi"
       :screenPara="screenPara"
       @search="search"
-      @clickHandler="rolRouterClickHandler"
+      @clickHandler="rolRouterClickHandler" 
+      @loaded="screenload"
     ></ct-searchtreescreen>
     <ct-tree
       ref="tree"
@@ -65,6 +66,9 @@ export default {
       try {
         this.$emit("loaded", data);
       } catch (e) {}
+    }, 
+    screenload(data) {
+     this.setTreeHeight();
     },
     rolRouterClickHandler(field) {
       this.routerClickHandler(field, {}, "");

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

@@ -1,6 +1,6 @@
 <template>
   <div id="app-Tree" style="height:100%;">
-    <el-container style="height:  calc(100vh - 98px);border: 1px solid #eee" ref="tree_left">
+    <el-container style="height:  calc(100vh - 98px);" ref="tree_left">
       <el-aside :width="leftWidth?leftWidth+'px':'15%'"
         style="background-color:white;border-radius: 6px;overflow-y:hidden">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" :searchtreeHeight="searchtreeHeight"

package/wwwroot/static/centaline/centaline-data-driven.js

@@ -65621,6 +65621,7 @@ var ctSpan = {
 //
 //
 //
+//
 
 
 
@@ -65672,6 +65673,9 @@ var ctSpan = {
         this.$emit("loaded", data);
       } catch (e) {}
     },
+    screenload: function screenload(data) {
+      this.setTreeHeight();
+    },
     rolRouterClickHandler: function rolRouterClickHandler(field) {
       this.routerClickHandler(field, {}, "");
     },
@@ -81539,7 +81543,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchTree_vue__ = __webpack_require__(411);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_43d14f80_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTree_vue__ = __webpack_require__(865);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_7ba2c64c_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTree_vue__ = __webpack_require__(865);
 var normalizeComponent = __webpack_require__(1)
 /* script */
 
@@ -81556,7 +81560,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchTree_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_43d14f80_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTree_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_7ba2c64c_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTree_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -81658,7 +81662,7 @@ var esExports = { render: render, staticRenderFns: staticRenderFns }
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('ct-searchtreescreen',{ref:"treescreen",attrs:{"api":_vm.searchConditionApi,"screenPara":_vm.screenPara},on:{"search":_vm.search,"clickHandler":_vm.rolRouterClickHandler}}),_vm._v(" "),_c('ct-tree',{ref:"tree",style:({ height: _vm.treeHeight + 'px' }),attrs:{"api":_vm.searchDataApi},on:{"loaded":_vm.loaded}})],1)}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('ct-searchtreescreen',{ref:"treescreen",attrs:{"api":_vm.searchConditionApi,"screenPara":_vm.screenPara},on:{"search":_vm.search,"clickHandler":_vm.rolRouterClickHandler,"loaded":_vm.screenload}}),_vm._v(" "),_c('ct-tree',{ref:"tree",style:({ height: _vm.treeHeight + 'px' }),attrs:{"api":_vm.searchDataApi},on:{"loaded":_vm.loaded}})],1)}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);
@@ -81689,7 +81693,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicTreeList_vue__ = __webpack_require__(413);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_47445022_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicTreeList_vue__ = __webpack_require__(870);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_629313b2_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicTreeList_vue__ = __webpack_require__(870);
 function injectStyle (ssrContext) {
   __webpack_require__(868)
 }
@@ -81709,7 +81713,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicTreeList_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_47445022_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicTreeList_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_629313b2_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicTreeList_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -81730,7 +81734,7 @@ var content = __webpack_require__(869);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(3)("cad958b2", content, true, {});
+var update = __webpack_require__(3)("dceeeb86", content, true, {});
 
 /***/ }),
 /* 869 */
@@ -81751,7 +81755,7 @@ exports.push([module.i, "#app-Tree .el-main{padding:0 0 0 10px}#app-Tree .el-mai
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticStyle:{"height":"100%"},attrs:{"id":"app-Tree"}},[_c('el-container',{ref:"tree_left",staticStyle:{"height":"calc(100vh - 98px)","border":"1px solid #eee"}},[_c('el-aside',{staticStyle:{"background-color":"white","border-radius":"6px","overflow-y":"hidden"},attrs:{"width":_vm.leftWidth?_vm.leftWidth+'px':'15%'}},[_c('ct-searchtree',{attrs:{"flagsearch":true,"searchConditionApi":_vm.searchConditionApi,"searchDataApi":_vm.searchDataApi,"searchtreeHeight":_vm.searchtreeHeight},on:{"loaded":_vm.loaded}})],1),_vm._v(" "),(_vm.isShowMain)?_c('el-main',[(_vm.pageType=='form')?[_c('div',{staticStyle:{"height":"calc(100vh - 120px)"}},[_c('div',{staticClass:"ct-form",style:({'width':(_vm.width?_vm.width+'px':'auto'),'height':(_vm.height?_vm.height+'px':'auto')})},[_c('ct-form',{attrs:{"api":_vm.formApi,"api-param":_vm.apiParam,"width":_vm.width,"height":_vm.height}})],1)])]:[_c('div',{staticStyle:{"height":"calc(100vh - 100px)"}},[_c('ct-searchlist',{attrs:{"searchConditionApi":_vm.searchTableConditionApi,"searchDataApi":_vm.searchTableDataApi,"api-param":_vm.apiParam}})],1)]],2):_vm._e()],1)],1)}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticStyle:{"height":"100%"},attrs:{"id":"app-Tree"}},[_c('el-container',{ref:"tree_left",staticStyle:{"height":"calc(100vh - 98px)"}},[_c('el-aside',{staticStyle:{"background-color":"white","border-radius":"6px","overflow-y":"hidden"},attrs:{"width":_vm.leftWidth?_vm.leftWidth+'px':'15%'}},[_c('ct-searchtree',{attrs:{"flagsearch":true,"searchConditionApi":_vm.searchConditionApi,"searchDataApi":_vm.searchDataApi,"searchtreeHeight":_vm.searchtreeHeight},on:{"loaded":_vm.loaded}})],1),_vm._v(" "),(_vm.isShowMain)?_c('el-main',[(_vm.pageType=='form')?[_c('div',{staticStyle:{"height":"calc(100vh - 120px)"}},[_c('div',{staticClass:"ct-form",style:({'width':(_vm.width?_vm.width+'px':'auto'),'height':(_vm.height?_vm.height+'px':'auto')})},[_c('ct-form',{attrs:{"api":_vm.formApi,"api-param":_vm.apiParam,"width":_vm.width,"height":_vm.height}})],1)])]:[_c('div',{staticStyle:{"height":"calc(100vh - 100px)"}},[_c('ct-searchlist',{attrs:{"searchConditionApi":_vm.searchTableConditionApi,"searchDataApi":_vm.searchTableDataApi,"api-param":_vm.apiParam}})],1)]],2):_vm._e()],1)],1)}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);