centaline-data-driven 1.5.38 → 1.5.40

package/package.json

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

package/release-log.md

@@ -1,4 +1,14 @@
 
+## v1.5.39
+2023-07-19
+优化
+form表单固定按钮位置优化，兼容ccai
+
+bug修复
+
+表格表头刷新时闪动问题修复
+
+图片编辑打开不显示图片兼容性修复
 ## v1.5.38
 2023-07-18
 

package/src/centaline/css/ccai.css

@@ -6,6 +6,8 @@
    /* bottom: 26px; */
    width: calc(100% - 52px);
    margin-bottom: 20px;
+   left: -11px;
+   right: 1px;
 }
 .btnPadBom {
    padding-bottom: 4px !important;

package/src/centaline/dynamicEditPictures/src/dynamicEditPictures.vue

@@ -51,6 +51,7 @@
                    :width="150" :height="150" class="file-cirle"></el-progress>
     </div>
     <div class="mask" v-if="progressFlag"></div>
+    <div style="position: fixed;top: 48%;left: 48%;z-index: 9999;" v-loading="isloading"></div>
   </div>
 </template>
 <script>
@@ -69,6 +70,7 @@
     },
     data() {
       return {
+        isloading:true,
         flagOriginal: false,
         progressFlag: false,
         loadProgress: 0,
@@ -196,8 +198,8 @@
           _this.imgObj.setAttribute("crossOrigin", 'Anonymous')
           _this.imgObj.onload = function (e) {
             //获取原始宽高
-            let naturalWidth = (e.path)[0].naturalWidth
-            let naturalHeight = (e.path)[0].naturalHeight
+            let naturalWidth=_this.imgObj.width;
+            let naturalHeight=_this.imgObj.height
 
             _this.canvas.width = naturalWidth;
             _this.canvas.height = naturalHeight;
@@ -219,6 +221,7 @@
               _this.scale = scalew;
             }
             _this.scaleDomSize(_this.canvas);
+            _this.isloading=false;
           }
           this.canvas.addEventListener("pointerdown", _this.startDraw, false);
           this.canvas.addEventListener("pointermove", _this.draw, false);

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

@@ -1150,6 +1150,7 @@
     /* bottom: 6px; */
     bottom: 0;
     left: 0;
+    right: 0;
     border-radius: 0 0 4px 4px;
     position: absolute;
     line-height: 34px;

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

@@ -457,9 +457,7 @@ export default {
           self.currentTh = null;
           document.removeEventListener("mouseup", MouseUpHandle, false);
           document.removeEventListener("mousemove", MouseMoveHandle, false);
-          
-       
-   
+          col.width=ev.target.clientWidth;
           //保存列宽
           if(oldWidth!=col.width&&self.model.columnWidthSaveAction&&self.model.columnWidthSaveAction.length>0)
           {

package/src/main.js

@@ -58,7 +58,7 @@ Vue.use(centaline, {
       return {
         oldToken: 'e9e9bcf4-4350-451d-9d5c-0fd175ca07b1',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazbh7vbudum4BRo_goBcgZURSDTGfxejdva-YoqXTGbusGwjVNBwXZJ2DrW1HqmJHusuMiZlLpONjhL38gF_xJfeGJJoQou1REUK5JCNMioFpa5pnaYGCsjXM1QmsEQrHKSAeVjfYm_QS2xLvhzy7R_nTuu8z46Dszse2R4HJOKIo_cTlpInZslhYgOPJwAAAP__.VLM-RxaUmmH_AhQXgSLI1Tjo8NWgqBmPn8J_rShqYm8"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ22v08WbpOEQkfOTQoVIIoEQdwcEdPRM8Ypp5t1g3XsooeZKkbQWpTEOqQ4OqzYwJmFWyQRLibv4AX_Ml05rikH7BqsYBMmTRdbCKOSF2rqxkmooYLqcoNSeI2sfoypgydtbBKvcS-zrdD5M13-cO27LM5sds86B0Bo3Ig0Ukb3N2Gfj5mFUZg4O7g8AAAD__w.HflXdzrl_bPMLnbiJfIQCXukU2WW-FZRrz-JR2q7eTE"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',

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

@@ -5328,7 +5328,7 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABX
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicForm_vue__ = __webpack_require__(188);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_81c690b6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(489);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_75bb333d_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(489);
 function injectStyle (ssrContext) {
   __webpack_require__(483)
 }
@@ -5348,7 +5348,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_dynamicForm_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_81c690b6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_75bb333d_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -16683,7 +16683,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_dynamicSearchTable_vue__ = __webpack_require__(164);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_6ad1856b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(455);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1a0d5a66_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(455);
 function injectStyle (ssrContext) {
   __webpack_require__(417)
 }
@@ -16703,7 +16703,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_dynamicSearchTable_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_6ad1856b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1a0d5a66_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -17188,7 +17188,7 @@ var Component = normalizeComponent(
           self.currentTh = null;
           document.removeEventListener("mouseup", MouseUpHandle, false);
           document.removeEventListener("mousemove", MouseMoveHandle, false);
-
+          col.width = ev.target.clientWidth;
           //保存列宽
           if (oldWidth != col.width && self.model.columnWidthSaveAction && self.model.columnWidthSaveAction.length > 0) {
             var submitData = { 'columnName': col.id, columnWidth: col.width };
@@ -29578,6 +29578,7 @@ if (typeof window !== "undefined" && "Vue" in window) {
 //
 //
 //
+//
 
 
 
@@ -29594,6 +29595,7 @@ if (typeof window !== "undefined" && "Vue" in window) {
   },
   data: function data() {
     return {
+      isloading: true,
       flagOriginal: false,
       progressFlag: false,
       loadProgress: 0,
@@ -29713,8 +29715,8 @@ if (typeof window !== "undefined" && "Vue" in window) {
         _this.imgObj.setAttribute("crossOrigin", 'Anonymous');
         _this.imgObj.onload = function (e) {
           //获取原始宽高
-          var naturalWidth = e.path[0].naturalWidth;
-          var naturalHeight = e.path[0].naturalHeight;
+          var naturalWidth = _this.imgObj.width;
+          var naturalHeight = _this.imgObj.height;
 
           _this.canvas.width = naturalWidth;
           _this.canvas.height = naturalHeight;
@@ -29733,6 +29735,7 @@ if (typeof window !== "undefined" && "Vue" in window) {
             _this.scale = scalew;
           }
           _this.scaleDomSize(_this.canvas);
+          _this.isloading = false;
         };
         _this2.canvas.addEventListener("pointerdown", _this.startDraw, false);
         _this2.canvas.addEventListener("pointermove", _this.draw, false);
@@ -49009,7 +49012,7 @@ var content = __webpack_require__(418);
 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__(2)("0e08db6a", content, true, {});
+var update = __webpack_require__(2)("534f023a", content, true, {});
 
 /***/ }),
 /* 418 */
@@ -50263,7 +50266,7 @@ var content = __webpack_require__(484);
 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__(2)("0b9898c5", content, true, {});
+var update = __webpack_require__(2)("5a32f1fd", content, true, {});
 
 /***/ }),
 /* 484 */
@@ -50274,7 +50277,7 @@ exports = module.exports = __webpack_require__(1)(false);
 
 
 // module
-exports.push([module.i, ".el-collapse{border-top:none}.ct-collapse-item-title .el-collapse-item__header{color:#303133!important;line-height:normal}.el-collapse-saveLine .ct-collapse-item-title:last-child .el-collapse-item__wrap{border-bottom:none}.button-initial{margin-top:8px}.button-absolute{z-index:100;bottom:0;left:0;border-radius:0 0 4px 4px;position:absolute;line-height:34px;background-color:#fff;width:100%;margin:auto;-webkit-box-shadow:0 2px 20px 0 rgb(0 0 0/10%);box-shadow:0 2px 20px 0 rgb(0 0 0/10%)}", ""]);
+exports.push([module.i, ".el-collapse{border-top:none}.ct-collapse-item-title .el-collapse-item__header{color:#303133!important;line-height:normal}.el-collapse-saveLine .ct-collapse-item-title:last-child .el-collapse-item__wrap{border-bottom:none}.button-initial{margin-top:8px}.button-absolute{z-index:100;bottom:0;left:0;right:0;border-radius:0 0 4px 4px;position:absolute;line-height:34px;background-color:#fff;width:100%;margin:auto;-webkit-box-shadow:0 2px 20px 0 rgb(0 0 0/10%);box-shadow:0 2px 20px 0 rgb(0 0 0/10%)}", ""]);
 
 // exports
 
@@ -54658,7 +54661,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_dynamicEditPictures_vue__ = __webpack_require__(197);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_4e71e145_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicEditPictures_vue__ = __webpack_require__(527);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_7923bcf0_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicEditPictures_vue__ = __webpack_require__(527);
 function injectStyle (ssrContext) {
   __webpack_require__(524)
 }
@@ -54678,7 +54681,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_dynamicEditPictures_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_4e71e145_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicEditPictures_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_7923bcf0_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicEditPictures_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -54699,7 +54702,7 @@ var content = __webpack_require__(525);
 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__(2)("fd81c912", content, true, {});
+var update = __webpack_require__(2)("05ea246d", content, true, {});
 
 /***/ }),
 /* 525 */
@@ -54727,7 +54730,7 @@ exports.push([module.i, ".picedit-stage{position:absolute;left:0;right:0;bottom:
 /***/ (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',{staticClass:"picedit-modal",staticStyle:{"width":"100%","height":"100%","background-color":"#1e1e1e"}},[_c('div',{staticClass:"picedit-stage"},[(_vm.croppShow)?_c('div',{staticStyle:{"width":"100%","height":"100%"}},[_c('vue-cropper',{ref:"cropper",attrs:{"img":_vm.options.img,"output-size":_vm.options.size,"output-type":_vm.options.outputType,"info":_vm.options.info,"full":_vm.options.full,"canScale":_vm.options.canScale,"can-move":_vm.options.canMove,"can-move-box":_vm.options.canMoveBox,"fixed":_vm.options.fixed,"fixed-box":_vm.options.fixedBox,"original":_vm.options.original,"auto-crop":_vm.options.autoCrop,"auto-crop-width":_vm.options.autoCropWidth,"auto-crop-height":_vm.options.autoCropHeight,"center-box":_vm.options.centerBox,"high":_vm.options.high,"info-true":_vm.options.infoTrue,"max-img-size":_vm.options.maxImageSize,"enlarge":_vm.options.enlarge,"mode":_vm.options.mode,"maxImgSize":_vm.options.maxImgSize}})],1):_c('canvas',{ref:"canvas",staticStyle:{"position":"absolute"},attrs:{"id":"drawCanvas"}})]),_vm._v(" "),(_vm.flagOriginal)?_c('div',{staticClass:"picedit-Original"},[_c('el-row',[_c('el-button',{attrs:{"type":"success"},on:{"click":function($event){_vm.Original()}}},[_vm._v("原图")])],1)],1):_vm._e(),_vm._v(" "),(_vm.croppShow)?_c('div',{staticClass:"picedit-cropper"},[_c('el-row',[_c('el-button',{attrs:{"type":"success"},on:{"click":function($event){_vm.sureCropper()}}},[_c('i',{staticClass:"el-icon-check"})]),_vm._v(" "),_c('el-button',{attrs:{"type":"primary"},on:{"click":function($event){_vm.cancelCropper()}}},[_c('i',{staticClass:"el-icon-close"})])],1)],1):_c('div',{staticClass:"picedit-footer"},[_c('div',{staticClass:"picedit-toolbar"},_vm._l((_vm.bntList),function(item,index){return _c('a',{key:index,class:['magnify-btn', index==_vm.bntindex ? 'active' : '' ],attrs:{"title":item.name},on:{"click":function($event){_vm.handleClick(item.key,index)}}},[_c('span',{class:item.ico})])}))]),_vm._v(" "),(_vm.progressFlag)?_c('div',{staticClass:"stream-total-tips"},[_c('el-progress',{staticClass:"file-cirle",attrs:{"type":"circle","percentage":typeof _vm.loadProgress !== 'undefined' && _vm.loadProgress !== null ? _vm.loadProgress : 0.00,"width":150,"height":150}})],1):_vm._e(),_vm._v(" "),(_vm.progressFlag)?_c('div',{staticClass:"mask"}):_vm._e()])}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"picedit-modal",staticStyle:{"width":"100%","height":"100%","background-color":"#1e1e1e"}},[_c('div',{staticClass:"picedit-stage"},[(_vm.croppShow)?_c('div',{staticStyle:{"width":"100%","height":"100%"}},[_c('vue-cropper',{ref:"cropper",attrs:{"img":_vm.options.img,"output-size":_vm.options.size,"output-type":_vm.options.outputType,"info":_vm.options.info,"full":_vm.options.full,"canScale":_vm.options.canScale,"can-move":_vm.options.canMove,"can-move-box":_vm.options.canMoveBox,"fixed":_vm.options.fixed,"fixed-box":_vm.options.fixedBox,"original":_vm.options.original,"auto-crop":_vm.options.autoCrop,"auto-crop-width":_vm.options.autoCropWidth,"auto-crop-height":_vm.options.autoCropHeight,"center-box":_vm.options.centerBox,"high":_vm.options.high,"info-true":_vm.options.infoTrue,"max-img-size":_vm.options.maxImageSize,"enlarge":_vm.options.enlarge,"mode":_vm.options.mode,"maxImgSize":_vm.options.maxImgSize}})],1):_c('canvas',{ref:"canvas",staticStyle:{"position":"absolute"},attrs:{"id":"drawCanvas"}})]),_vm._v(" "),(_vm.flagOriginal)?_c('div',{staticClass:"picedit-Original"},[_c('el-row',[_c('el-button',{attrs:{"type":"success"},on:{"click":function($event){_vm.Original()}}},[_vm._v("原图")])],1)],1):_vm._e(),_vm._v(" "),(_vm.croppShow)?_c('div',{staticClass:"picedit-cropper"},[_c('el-row',[_c('el-button',{attrs:{"type":"success"},on:{"click":function($event){_vm.sureCropper()}}},[_c('i',{staticClass:"el-icon-check"})]),_vm._v(" "),_c('el-button',{attrs:{"type":"primary"},on:{"click":function($event){_vm.cancelCropper()}}},[_c('i',{staticClass:"el-icon-close"})])],1)],1):_c('div',{staticClass:"picedit-footer"},[_c('div',{staticClass:"picedit-toolbar"},_vm._l((_vm.bntList),function(item,index){return _c('a',{key:index,class:['magnify-btn', index==_vm.bntindex ? 'active' : '' ],attrs:{"title":item.name},on:{"click":function($event){_vm.handleClick(item.key,index)}}},[_c('span',{class:item.ico})])}))]),_vm._v(" "),(_vm.progressFlag)?_c('div',{staticClass:"stream-total-tips"},[_c('el-progress',{staticClass:"file-cirle",attrs:{"type":"circle","percentage":typeof _vm.loadProgress !== 'undefined' && _vm.loadProgress !== null ? _vm.loadProgress : 0.00,"width":150,"height":150}})],1):_vm._e(),_vm._v(" "),(_vm.progressFlag)?_c('div',{staticClass:"mask"}):_vm._e(),_vm._v(" "),_c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.isloading),expression:"isloading"}],staticStyle:{"position":"fixed","top":"48%","left":"48%","z-index":"9999"}})])}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);