centaline-data-driven 1.5.46 → 1.5.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.5.46",
+  "version": "1.5.48",
   "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/dynamicLayout/src/dynamicLayout.vue

@@ -97,12 +97,16 @@
       getValue(data, val) {
         return val.split('.').reduce((data, currentVal) => {
           var rtn = data[currentVal];
-          if (typeof rtn !== 'undefined' && typeof (rtn) == 'string') {
+          if (typeof rtn !== "undefined" && typeof rtn == "string") {
             rtn = rtn.replace(/"/g, "'");
+            rtn = rtn.replace(/&/g, "&");
             rtn = rtn.replace(/>/g, ">");
             rtn = rtn.replace(/</g, "&lt;");
-          }
-          else {
+          } else if (typeof rtn == "object") {
+            rtn = currentVal;
+          } else if (typeof rtn == "number") {
+            rtn = rtn;
+          } else {
             rtn = "";
           }
           return rtn

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -1,6 +1,6 @@
 <template>
-  <div v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''">
-    <div  class="wb" :style="model.styleObject">
+  <div v-if="model.routerKey&&model.visibility!='0'">
+    <div v-if="model.rightRouter&&model.value!=''" class="wb" :style="model.styleObject">
       <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem">
         {{model.value}}
       </a>

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/CellLayout.js

@@ -75,7 +75,7 @@ const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex)
           return b.id === source.routerKey;
         });
         if (typeof field !== "undefined") {
-          if ((!field.rightField || (typeof rowdata[forname][forrowindex] !== "undefined" && rowdata[forname][forrowindex][field.rightField] == 1)) && field.show) {
+          if ((!field.rightField || (typeof rowdata[forname][forrowindex] !== "undefined" && (!rowdata[forname][forrowindex][field.rightField]||rowdata[forname][forrowindex][field.rightField] == 1)))) {
             forrightRouter = true;
           }
         }

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"}',