centaline-data-driven 1.5.82 → 1.5.83

package/package.json

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

package/release-log.md

@@ -1,3 +1,10 @@
+# v1.5.83
+2023-11-30
+优化
+列表计算高度，自定义页面需减去TOP值时，from为hasTop
+
+时间插件change事件修复
+
 # v1.5.82
 2023-11-28
 优化

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="'/salemanage/ContractByPoint/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/service-api/salemanage/ContractByPoint/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "commissionMode":2,"contractId":"231120113744BAFD48D1D476422E8FAD","propertyId":"23111716432930CDE3FCA10A4EAE863F","searchFields":{"fields":[{"fieldName1":"CompanyPath","groupName":"CompanyPath","operation":1,"searchDataType":1,"searchValue1":"009"},{"fieldName1":"EmpID","groupName":"EmpID","operation":1,"searchDataType":1,"searchValue1":"202110201430497BB5FE89123A054CCA"},{"fieldName1":"DeptPath","groupName":"DeptPath","operation":1,"searchDataType":1,"searchValue1":"009.108"},{"fieldName1":"type","groupName":"type","operation":1,"searchDataType":1,"searchValue1":"left"},{"fieldName1":"EstateID","groupName":"EstateID","operation":2,"searchDataType":3,"searchValue1":"20210729104021C49F04B55C50F6AF58"}]},"actionType":3
+          "estateId":"23112217144782E4C3D5F8164CB2AE3E","propertyId":"2311221734023A5414C450CA4B9CA072","actionType":2,"commissionMode":"2"
         },
         topHeight:10,
       }

package/src/centaline/dynamicD/src/dynamicD.vue

@@ -6,7 +6,7 @@
           {{model.label}}
         </div>
         <el-date-picker :class="[model.showLabel?'ct-date-editor':'']" v-model="model.value" v-bind="model.attrs"
-                        @input="inputHandler($event)" @change="changeHandler($event)" @blur="dateBlur"
+                        @input="inputHandler($event)" @change="change($event)" @blur="dateBlur"
                         :picker-options="pickerOptions" :disabled="model.lock">
         </el-date-picker>
       </div>
@@ -38,8 +38,9 @@
       isAutoSearch(){
         if(this.model.autoSearch) this.$emit('click');
       },
-      changeHandler(){
-       this.isAutoSearch()
+      change(){
+        this.changeHandler(this.model.value);
+        this.isAutoSearch()
       },
       getPickerOptions() {
         let self = this

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

@@ -775,11 +775,14 @@ 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 h1top = 0;
           var h2 = this.$refs.searchTable.offsetTop | 0;
           if(this.from && this.from=='detail'){
             h2=h2-this.screenTop - 13;
           }
+          if(this.from && this.from=='hasTop'){
+            h1top=this.$refs.searchTable.parentElement.offsetTop| 0;
+            }
           var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
           var h4 = this.$refs.footer.$el.offsetHeight | 0;
           var h5 = this.$refs.listHeader ? (this.$refs.listHeader.$el.offsetHeight + 8) | 0 : 0;
@@ -799,7 +802,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+h1top ;
+          let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 + h9 - 8 +h1top;
           
           this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
           this.$nextTick(() => {

package/src/main.js

@@ -15,14 +15,14 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
-  baseUrl: "http://10.88.22.46:6060/onecard-api/",
+  // baseUrl: "http://10.88.22.46:6060/onecard-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:22026/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  // baseUrl: "http://10.88.22.42:8080/",
+  baseUrl: "http://10.88.22.42:9999/",
   // baseUrl: "http://10.1.245.111:38028/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -56,14 +56,14 @@ Vue.use(centaline, {
       return {
         oldToken: '1f487e18-c090-4d24-b9a7-630de58cfccc',
         // token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"1080-1729370391807397888"}',
+        // authObject: '{token:"1080-1729370391807397888"}',
 
         // 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"}',
+        EstateInfo: ' {"estateId":"23112217144782E4C3D5F8164CB2AE3E","estateName":"%E9%93%B8%E5%B1%B1%E7%85%AE%E6%B5%B7"}',
         estateId: '',
 
-        // authObject: '{"currentEstate":{"estateId":"20210729104021C49F04B55C50F6AF58","estateName":"0%E6%B1%A4%E8%87%A3%E4%B8%80%E5%93%810%E5%A4%A9%E6%B4%A5"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"a47c1cb528904d361a71a2612e9fe8f7","token":"","random":"LMOpUe","time":1700555306773,"sign":"b5fed3c92e2ad6ef33fdf4951eab2ae7"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjZmOGE3YmY5LWJmNTktNDQ5Mi1iYjViLTAwYzg5NzA4YjhkMSJ9.SdsZk29roc03uNTjl8UkURX0uJHog7FH2YdX9xdecUULznkQ0NrMKkuLhTTXXA4XAp47zcmbGUPphoCcCr_AOw',
+        authObject: '{"currentEstate":{"estateId":"23112217144782E4C3D5F8164CB2AE3E","estateName":"%E9%93%B8%E5%B1%B1%E7%85%AE%E6%B5%B7"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"03a1d8ca0f1509b312a49669c4755289","token":"","random":"0u4g7A","time":1701323733472,"sign":"03256aa2a841cf9e2dd92a6606f4c862"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImMxYTFjZmQ5LTE1N2MtNDFiMi05MGYxLTlmMThlMjkwMmYyYSJ9.RHLvLqZv2r4xQC5l4UFZyHlD_sOtfpg1U5j4tFFe3XzcjewBWUxLs1A91pF1Udi0DqIgdiyM_RWLhTnHR0tLPA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作

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

@@ -36401,7 +36401,8 @@ if (typeof window !== 'undefined' && window.Vue) {
     isAutoSearch: function isAutoSearch() {
       if (this.model.autoSearch) this.$emit('click');
     },
-    changeHandler: function changeHandler() {
+    change: function change() {
+      this.changeHandler(this.model.value);
       this.isAutoSearch();
     },
     getPickerOptions: function getPickerOptions() {
@@ -38320,7 +38321,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__(302);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_70e53283_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(606);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_ecf9331a_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(606);
 function injectStyle (ssrContext) {
   __webpack_require__(568)
 }
@@ -38340,7 +38341,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_70e53283_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_ecf9331a_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__,
@@ -39105,11 +39106,14 @@ var Component = normalizeComponent(
       this.$nextTick(function () {
         if (_this3.$refs.searchTable && _this3.$refs.toolbar && _this3.$refs.searchTable.parentElement && !self.isLayout) {
           var h1 = _this3.$refs.searchTable.parentElement.offsetHeight | 0;
-          var h1top = _this3.$refs.searchTable.parentElement.offsetTop | 0;
+          var h1top = 0;
           var h2 = _this3.$refs.searchTable.offsetTop | 0;
           if (_this3.from && _this3.from == 'detail') {
             h2 = h2 - _this3.screenTop - 13;
           }
+          if (_this3.from && _this3.from == 'hasTop') {
+            h1top = _this3.$refs.searchTable.parentElement.offsetTop | 0;
+          }
           var h3 = _this3.$refs.toolbar.$el.offsetHeight | 0;
           var h4 = _this3.$refs.footer.$el.offsetHeight | 0;
           var h5 = _this3.$refs.listHeader ? _this3.$refs.listHeader.$el.offsetHeight + 8 | 0 : 0;
@@ -71366,7 +71370,7 @@ var esExports = { render: render, staticRenderFns: staticRenderFns }
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicD_vue__ = __webpack_require__(296);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_bd7bd708_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicD_vue__ = __webpack_require__(553);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_3ebcb0af_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicD_vue__ = __webpack_require__(553);
 var normalizeComponent = __webpack_require__(1)
 /* script */
 
@@ -71383,7 +71387,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_dynamicD_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_bd7bd708_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicD_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_3ebcb0af_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicD_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -71398,7 +71402,7 @@ var Component = normalizeComponent(
 /***/ (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:"field-top"},[_c('div',{staticClass:"ct-date",class:[_vm.model.attrs.size?'ct-date-'+_vm.model.attrs.size:''],staticStyle:{"width":"100%","display":"flex"}},[_c('div',{class:[_vm.model.showLabel?'el-input-group el-input-group--prepend':'',!_vm.valid?'inputError':''],staticStyle:{"flex":"1"}},[(_vm.model.showLabel && _vm.model.label)?_c('div',{staticClass:"el-input-group__prepend",class:[_vm.model.labelClass]},[_vm._v("\n        "+_vm._s(_vm.model.label)+"\n      ")]):_vm._e(),_vm._v(" "),_c('el-date-picker',_vm._b({class:[_vm.model.showLabel?'ct-date-editor':''],attrs:{"picker-options":_vm.pickerOptions,"disabled":_vm.model.lock},on:{"input":function($event){_vm.inputHandler($event)},"change":function($event){_vm.changeHandler($event)},"blur":_vm.dateBlur},model:{value:(_vm.model.value),callback:function ($$v) {_vm.$set(_vm.model, "value", $$v)},expression:"model.value"}},'el-date-picker',_vm.model.attrs,false))],1),_vm._v(" "),(_vm.model.sufLabel)?_c('span',{staticClass:"spanMessage ct-flex-div-span"},[_vm._v(_vm._s(_vm.model.sufLabel))]):_vm._e(),_vm._v(" "),_c('transition',{attrs:{"name":"el-fade-in"}},[_c('span',{directives:[{name:"show",rawName:"v-show",value:(!_vm.valid),expression:"!valid"}],staticClass:"errorMessage"},[_vm._v("\n        "+_vm._s(_vm.validMessage)+"\n      ")])]),_vm._v(" "),(_vm.model.paramName  && !_vm.model.lock)?_c('ct-quick-input',{attrs:{"pn":_vm.model.paramName,"action":_vm.api},on:{"input":function($event){_vm.model.value=$event}}}):_vm._e()],1)])}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"field-top"},[_c('div',{staticClass:"ct-date",class:[_vm.model.attrs.size?'ct-date-'+_vm.model.attrs.size:''],staticStyle:{"width":"100%","display":"flex"}},[_c('div',{class:[_vm.model.showLabel?'el-input-group el-input-group--prepend':'',!_vm.valid?'inputError':''],staticStyle:{"flex":"1"}},[(_vm.model.showLabel && _vm.model.label)?_c('div',{staticClass:"el-input-group__prepend",class:[_vm.model.labelClass]},[_vm._v("\n        "+_vm._s(_vm.model.label)+"\n      ")]):_vm._e(),_vm._v(" "),_c('el-date-picker',_vm._b({class:[_vm.model.showLabel?'ct-date-editor':''],attrs:{"picker-options":_vm.pickerOptions,"disabled":_vm.model.lock},on:{"input":function($event){_vm.inputHandler($event)},"change":function($event){_vm.change($event)},"blur":_vm.dateBlur},model:{value:(_vm.model.value),callback:function ($$v) {_vm.$set(_vm.model, "value", $$v)},expression:"model.value"}},'el-date-picker',_vm.model.attrs,false))],1),_vm._v(" "),(_vm.model.sufLabel)?_c('span',{staticClass:"spanMessage ct-flex-div-span"},[_vm._v(_vm._s(_vm.model.sufLabel))]):_vm._e(),_vm._v(" "),_c('transition',{attrs:{"name":"el-fade-in"}},[_c('span',{directives:[{name:"show",rawName:"v-show",value:(!_vm.valid),expression:"!valid"}],staticClass:"errorMessage"},[_vm._v("\n        "+_vm._s(_vm.validMessage)+"\n      ")])]),_vm._v(" "),(_vm.model.paramName  && !_vm.model.lock)?_c('ct-quick-input',{attrs:{"pn":_vm.model.paramName,"action":_vm.api},on:{"input":function($event){_vm.model.value=$event}}}):_vm._e()],1)])}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);
@@ -72400,7 +72404,7 @@ var content = __webpack_require__(569);
 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)("68ee4d66", content, true, {});
+var update = __webpack_require__(3)("2697e50b", content, true, {});
 
 /***/ }),
 /* 569 */