centaline-data-driven 1.5.46 → 1.5.47

package/package.json

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

package/release-log.md

@@ -1,3 +1,14 @@
+## v1.5.47
+2023-08-09
+
+优化
+
+表单列表列宽度自定义
+
+表单列表有滚动条操作按钮右侧固定
+
+表单列表添加 被冻结的列（固定在左边）
+
 ## v1.5.46
 2023-08-08
 

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="'/api/third-dept-tran/transaction/task'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/distribution/commission_presentiment/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "stepId":"1686982560817586178","businessId":"1686982455918043138","actionType":1,"pageStyle":2,"pageOnly":true
+          "transactionId":["1661661776303677441","1667002679704797185"],"actionType":2,"pageStyle":2,"pageTitle":"新增预结","pageOnly":true
         },
         topHeight:10,
       }

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

@@ -17,7 +17,7 @@
           <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border 
             style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
              <!--数据列-->
-            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false && v.type!==13" :render-header="renderHeader" :min-width="tableColumnWith">
+            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" :width="v.width" :fixed="model.frozenColumns.includes(v.id)" v-if="v.show !== false && v.type!==13" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot="header" slot-scope="scope">
                 <div :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
                   {{v.label}}
@@ -44,7 +44,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :render-header="renderHeader" :min-width="tableColumnWith">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}
@@ -167,10 +167,11 @@
         model: null,
         foucus: false,
         itemKey: Math.random(),
-		    tableColumnWith: 0
+		    tableColumnWith: 0,
+        fixedButtons:false,
       }
     },
-    created() {      
+    created() {
       let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;
@@ -181,6 +182,17 @@
         self.model.refFieldsLabel = this.$refs.FieldsLabel;
       });
     },
+    mounted() {
+      this.$nextTick(function () {
+        let domT=document.querySelector('#listTable');
+        if(domT){
+          let domB=domT.querySelector('.el-table__body-wrapper');
+          if(domB && domB.scrollWidth>domB.offsetWidth){
+            this.fixedButtons='right';
+          }
+        }
+      });
+    },
     methods: {
       getHeadClass(v) {
         if (v.is === "ct-inputNumber") {

package/src/centaline/loader/src/ctl/Base.js

@@ -178,11 +178,13 @@ const Base = function (source) {
     set locked(v) {
       source.locked = v;
     },
+    get width() {
+      return source.width;
+    },
     get listBind() {
       let bind = {};
       bind = {
         style: {
-          //width: 200 + 'px',
           'width': source.width + 'px',
           display: 'inline-table'
         }

package/src/centaline/loader/src/ctl/FormList.js

@@ -718,6 +718,9 @@ const FormList = function (source, master) {
     get pageColumns() {
       return source.pageColumns || 1;
     },
+    get frozenColumns() {
+      return source.frozenColumns || [];
+    },
   };
   return rtn;
 };

package/src/main.js

@@ -14,14 +14,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:17070/max-uplink-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:9999/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  // baseUrl: "http://10.88.22.39:8080/",
+  baseUrl: "http://10.88.22.16:8080/",
   // baseUrl: "http://10.58.2.108:8080/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -56,7 +56,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'cd6060fd-36e5-47f1-8cb9-7fc6f61e645c',
+        oldToken: '681f7eeb-e659-4c3b-a8c4-88d60c36a518',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
         authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy9p6aPvlY2-wuJHkAIlwckIJBrjv6tRN3fPcIeznHtT6z6oWkVuNEpnQdqyAoxUQdMRQxBmHUqyGLj3H-DHfOmNQU_GtdB4EkCHFtgIg6AT7GJrJURVqHw5qdo4b5CRNBZqSdtbWM_2JfY1nw_5-o9zx215Zj2lZFEbGGbUgKUfIc2ZIdPoHI5I05TV_QEAAP__.JcB2iXcfHNcB2eJQ_kEIhID-UXCMx-HDoIuv9ZIA33I"}',
 

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

@@ -1051,11 +1051,13 @@ var Base = function Base(source) {
     set locked(v) {
       source.locked = v;
     },
+    get width() {
+      return source.width;
+    },
     get listBind() {
       var bind = {};
       bind = {
         style: {
-          //width: 200 + 'px',
           'width': source.width + 'px',
           display: 'inline-table'
         }
@@ -24382,7 +24384,8 @@ var ctSpan = { //临时的span组件对象，用于vue双向绑定，强制更
       model: null,
       foucus: false,
       itemKey: Math.random(),
-      tableColumnWith: 0
+      tableColumnWith: 0,
+      fixedButtons: false
     };
   },
   created: function created() {
@@ -24396,6 +24399,17 @@ var ctSpan = { //临时的span组件对象，用于vue双向绑定，强制更
       self.model.refFieldsLabel = this.$refs.FieldsLabel;
     });
   },
+  mounted: function mounted() {
+    this.$nextTick(function () {
+      var domT = document.querySelector('#listTable');
+      if (domT) {
+        var domB = domT.querySelector('.el-table__body-wrapper');
+        if (domB && domB.scrollWidth > domB.offsetWidth) {
+          this.fixedButtons = 'right';
+        }
+      }
+    });
+  },
 
   methods: {
     getHeadClass: function getHeadClass(v) {
@@ -34721,6 +34735,9 @@ var FormList = function FormList(source, master) {
     },
     get pageColumns() {
       return source.pageColumns || 1;
+    },
+    get frozenColumns() {
+      return source.frozenColumns || [];
     }
   };
   return rtn;
@@ -50950,7 +50967,7 @@ exports.push([module.i, ".el-collapse{border-top:none}.ct-collapse-item-title .e
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicFormListTable_vue__ = __webpack_require__(189);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_c2704ecc_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__ = __webpack_require__(488);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_e0fbf59e_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__ = __webpack_require__(488);
 function injectStyle (ssrContext) {
   __webpack_require__(486)
 }
@@ -50970,7 +50987,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_dynamicFormListTable_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_c2704ecc_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_e0fbf59e_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -50991,7 +51008,7 @@ var content = __webpack_require__(487);
 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)("f92e1bb6", content, true, {});
+var update = __webpack_require__(2)("3a18e164", content, true, {});
 
 /***/ }),
 /* 487 */
@@ -51012,7 +51029,7 @@ exports.push([module.i, ".el-table-add-row{margin-top:10px;width:100%;height:34p
 /***/ (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',{directives:[{name:"focus",rawName:"v-focus",value:(_vm.foucus),expression:"foucus"}],staticClass:"ct-form-list",class:{'tableDisabled':_vm.model.tableDisabled}},[(_vm.model.title)?_c('div',{staticClass:"list-title"},[_c('h5',[_vm._v(_vm._s(_vm.model.title))])]):(_vm.model.create || (_vm.model.selectRouter && _vm.model.selectRouter.id))?_c('div',{staticClass:"list-title"}):_vm._e(),_vm._v(" "),_c('div',{staticClass:"list-button"},[(_vm.model.selectRouter!==null)?_c(_vm.model.selectRouter.is,{tag:"component",attrs:{"vmodel":_vm.model.selectRouter},on:{"click":_vm.popupSearchListHandle}}):_vm._e(),_vm._v(" "),(_vm.model.create)?_c('el-button',{staticClass:"max-btn-add",staticStyle:{"width":"auto"},attrs:{"disabled":_vm.model.disabled,"type":"success","size":"mini","icon":"el-icon-circle-plus-outline"},on:{"click":_vm.addRow}},[_vm._v("\n      "+_vm._s(_vm.model.createText)+"\n    ")]):_vm._e()],1),_vm._v(" "),_c('div',{attrs:{"id":"listTable"}},[_c('el-row',[_c('el-col',{attrs:{"span":24}},[_c('el-table',{key:_vm.itemKey,staticClass:"max-table--border",staticStyle:{"width":"100%"},attrs:{"size":"mini","data":_vm.model.tableData,"border":"","highlight-current-row":"","show-summary":_vm.model.showSummary,"summary-method":_vm.getSummaries}},[_vm._l((_vm.model.rows[0].field),function(v,i){return (v.show !== false && v.type!==13)?_c('el-table-column',{key:i,attrs:{"prop":v.id,"label":v.label,"render-header":_vm.renderHeader,"min-width":_vm.tableColumnWith},scopedSlots:_vm._u([{key:"header",fn:function(scope){return [_c('div',{class:[{'ct-table-required':v.required&&_vm.model.rows[0].edit&& _vm.model.rows[0].delete&&!_vm.model.tableDisabled},_vm.getHeadClass(v)]},[_vm._v("\n                "+_vm._s(v.label)+"\n              ")])]}},{key:"default",fn:function(scope){return [(scope.row.isSet)?_c('span',[_c(_vm.model.currentRow.data[v.id].locked || _vm.model.currentRow.data[v.id].is!==v.is?_vm.model.currentRow.data[v.id].is:v.is,{key:_vm.model.currentRow.data[v.id].rowKey,ref:"Fields",refInFor:true,tag:"component",attrs:{"vmodel":_vm.model.currentRow.data[v.id],"api":_vm.model.OptApi},on:{"change":function($event){_vm.changeHandler(_vm.model.currentRow.data[v.id], _vm.model.currentRow.data.$sourceIndex)},"input":function($event){_vm.inputHandler(_vm.model.currentRow.data[v.id], _vm.model.currentRow.data.$sourceIndex)}}})],1):(v.is=='ct-sensitiveeye')?_c('span',[_c(v.is,{ref:"Fields",refInFor:true,tag:"component",attrs:{"vmodel":scope.row[v.id],"vrowmodel":scope.row,"api":_vm.model.OptApi}})],1):(v.router)?_c('span',{class:'cell',staticStyle:{"display":"flex"}},[_c('span',[_vm._v(_vm._s(scope.row.isSet))]),_vm._v(" "),_c('ct-tablecurrency',{attrs:{"router":v.router,"colValue":scope.row[v.id].code1,"rowData":scope.row},on:{"click":_vm.rolRouterClickHandler}})],1):_c('ct-span',{key:scope.row[v.id].rowKey,ref:"FieldsLabel",refInFor:true,attrs:{"vmodel":scope.row[v.id],"rowNum":scope.row.$sourceIndex,"rowData":scope.row}})]}}])}):_vm._e()}),_vm._v(" "),(_vm.model.rows[0].edit || _vm.model.rows[0].delete || _vm.model.buttons.length > 0)?_c('el-table-column',{attrs:{"label":"操作","render-header":_vm.renderHeader,"min-width":_vm.tableColumnWith},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(scope.row.edit || scope.row.isSet)?_c('span',{staticClass:"el-tag el-tag--info el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.saveRow(scope.row,scope.$index,true)}}},[_vm._v("\n                "+_vm._s(scope.row.isSet?'保存':"修改")+"\n              ")]):_vm._e(),_vm._v(" "),(scope.row.delete && !scope.row.isSet)?_c('span',{staticClass:"el-tag el-tag--danger el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.deleteRow(scope.$index, scope.row.$sourceIndex)}}},[_vm._v("\n                删除\n              ")]):(scope.row.isSet)?_c('span',{staticClass:"el-tag  el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.saveRow(scope.row,scope.$index,false)}}},[_vm._v("\n                取消\n              ")]):_vm._e(),_vm._v(" "),_vm._l((_vm.model.buttons),function(v,i){return (!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 ))?_c('span',{staticClass:"el-tag el-tag--info el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.buttonClick(scope.row, v)}}},[_vm._v("\n                "+_vm._s(v.label)+"\n              ")]):_vm._e()})]}}])}):_vm._e()],2)],1)],1)],1),_vm._v(" "),(_vm.model.description)?_c('div',{domProps:{"innerHTML":_vm._s(_vm.model.description)}}):_vm._e()])}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"focus",rawName:"v-focus",value:(_vm.foucus),expression:"foucus"}],staticClass:"ct-form-list",class:{'tableDisabled':_vm.model.tableDisabled}},[(_vm.model.title)?_c('div',{staticClass:"list-title"},[_c('h5',[_vm._v(_vm._s(_vm.model.title))])]):(_vm.model.create || (_vm.model.selectRouter && _vm.model.selectRouter.id))?_c('div',{staticClass:"list-title"}):_vm._e(),_vm._v(" "),_c('div',{staticClass:"list-button"},[(_vm.model.selectRouter!==null)?_c(_vm.model.selectRouter.is,{tag:"component",attrs:{"vmodel":_vm.model.selectRouter},on:{"click":_vm.popupSearchListHandle}}):_vm._e(),_vm._v(" "),(_vm.model.create)?_c('el-button',{staticClass:"max-btn-add",staticStyle:{"width":"auto"},attrs:{"disabled":_vm.model.disabled,"type":"success","size":"mini","icon":"el-icon-circle-plus-outline"},on:{"click":_vm.addRow}},[_vm._v("\n      "+_vm._s(_vm.model.createText)+"\n    ")]):_vm._e()],1),_vm._v(" "),_c('div',{attrs:{"id":"listTable"}},[_c('el-row',[_c('el-col',{attrs:{"span":24}},[_c('el-table',{key:_vm.itemKey,staticClass:"max-table--border",staticStyle:{"width":"100%"},attrs:{"size":"mini","data":_vm.model.tableData,"border":"","highlight-current-row":"","show-summary":_vm.model.showSummary,"summary-method":_vm.getSummaries}},[_vm._l((_vm.model.rows[0].field),function(v,i){return (v.show !== false && v.type!==13)?_c('el-table-column',{key:i,attrs:{"prop":v.id,"label":v.label,"width":v.width,"fixed":_vm.model.frozenColumns.includes(v.id),"render-header":_vm.renderHeader,"min-width":_vm.tableColumnWith},scopedSlots:_vm._u([{key:"header",fn:function(scope){return [_c('div',{class:[{'ct-table-required':v.required&&_vm.model.rows[0].edit&& _vm.model.rows[0].delete&&!_vm.model.tableDisabled},_vm.getHeadClass(v)]},[_vm._v("\n                "+_vm._s(v.label)+"\n              ")])]}},{key:"default",fn:function(scope){return [(scope.row.isSet)?_c('span',[_c(_vm.model.currentRow.data[v.id].locked || _vm.model.currentRow.data[v.id].is!==v.is?_vm.model.currentRow.data[v.id].is:v.is,{key:_vm.model.currentRow.data[v.id].rowKey,ref:"Fields",refInFor:true,tag:"component",attrs:{"vmodel":_vm.model.currentRow.data[v.id],"api":_vm.model.OptApi},on:{"change":function($event){_vm.changeHandler(_vm.model.currentRow.data[v.id], _vm.model.currentRow.data.$sourceIndex)},"input":function($event){_vm.inputHandler(_vm.model.currentRow.data[v.id], _vm.model.currentRow.data.$sourceIndex)}}})],1):(v.is=='ct-sensitiveeye')?_c('span',[_c(v.is,{ref:"Fields",refInFor:true,tag:"component",attrs:{"vmodel":scope.row[v.id],"vrowmodel":scope.row,"api":_vm.model.OptApi}})],1):(v.router)?_c('span',{class:'cell',staticStyle:{"display":"flex"}},[_c('span',[_vm._v(_vm._s(scope.row.isSet))]),_vm._v(" "),_c('ct-tablecurrency',{attrs:{"router":v.router,"colValue":scope.row[v.id].code1,"rowData":scope.row},on:{"click":_vm.rolRouterClickHandler}})],1):_c('ct-span',{key:scope.row[v.id].rowKey,ref:"FieldsLabel",refInFor:true,attrs:{"vmodel":scope.row[v.id],"rowNum":scope.row.$sourceIndex,"rowData":scope.row}})]}}])}):_vm._e()}),_vm._v(" "),(_vm.model.rows[0].edit || _vm.model.rows[0].delete || _vm.model.buttons.length > 0)?_c('el-table-column',{attrs:{"label":"操作","fixed":_vm.fixedButtons,"width":'100%',"render-header":_vm.renderHeader,"min-width":_vm.tableColumnWith},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(scope.row.edit || scope.row.isSet)?_c('span',{staticClass:"el-tag el-tag--info el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.saveRow(scope.row,scope.$index,true)}}},[_vm._v("\n                "+_vm._s(scope.row.isSet?'保存':"修改")+"\n              ")]):_vm._e(),_vm._v(" "),(scope.row.delete && !scope.row.isSet)?_c('span',{staticClass:"el-tag el-tag--danger el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.deleteRow(scope.$index, scope.row.$sourceIndex)}}},[_vm._v("\n                删除\n              ")]):(scope.row.isSet)?_c('span',{staticClass:"el-tag  el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.saveRow(scope.row,scope.$index,false)}}},[_vm._v("\n                取消\n              ")]):_vm._e(),_vm._v(" "),_vm._l((_vm.model.buttons),function(v,i){return (!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 ))?_c('span',{staticClass:"el-tag el-tag--info el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.buttonClick(scope.row, v)}}},[_vm._v("\n                "+_vm._s(v.label)+"\n              ")]):_vm._e()})]}}])}):_vm._e()],2)],1)],1)],1),_vm._v(" "),(_vm.model.description)?_c('div',{domProps:{"innerHTML":_vm._s(_vm.model.description)}}):_vm._e()])}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);