centaline-data-driven 1.5.69 → 1.5.70

package/package.json

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

package/release-log.md

@@ -1,3 +1,20 @@
+## v1.5.70
+2023-10-27
+
+BUG
+
+列表更新列属性，只有第一页才更新表头
+
+列表自定义行选中颜色，滚动翻页后，原选中行 自定义颜色失效
+
+优化
+
+列表页有无查询条件时不同的样式优化
+
+多行文本不显示只有最大值的提示
+
+formData添加execRouter方法
+
 ## v1.5.69
 2023-10-25
 

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/distribution/transactionCommAdjust/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/EmployeeAttendanceBillApply/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,9 @@
     data() {
       return {
         apiParam:{
-          transactionId: "1699302916360077313", actionType: "1", pageStyle: "2", pageOnly: "true"
+          actionType
+: 
+2
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -93,7 +93,11 @@
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportMonthAttendanceList/getLayoutOfSearch'" :searchDataApi="'/ReportMonthAttendanceList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PersonHolidayList/getLayoutOfSearch'" :searchDataApi="'/PersonHolidayList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PersonHolidayList/getLayoutOfSearch'" :searchDataApi="'/PersonHolidayList/getListOfSearchModel'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearch'" :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModel'"></ct-searchlist> -->
+
+    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/HolidayTypeList/getLayoutOfSearch'" :searchDataApi="'/HolidayTypeList/getListOfSearchModel'"></ct-searchlist>
 
 
     <ct-dialog-list></ct-dialog-list>

package/src/centaline/css/common.css

@@ -926,3 +926,7 @@ color: var(--centalinePlaceholder);
 .ct-searchcategory .el-radio-button__inner:hover {
   color: var(--chinaRed);
 }
+.sidebar{
+border-top-left-radius: 6px;
+border-bottom-left-radius: 6px;
+}

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

@@ -90,7 +90,6 @@
   import dynamicElement from '../../mixins/dynamicElement'
   import dynamicFormListTalbe from './dynamicFormListTable'
   import { setTimeout } from 'timers';
-  //import dynamicFormList from './dynamicFormList'
   export default {
     name: 'ct-form',
     mixins: [dynamicElement],

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -7,14 +7,14 @@
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div inputNumbe-line-feed" :class="[model.labelClass]">
           {{model.label}}
         </div>
+        <div v-if="model.preLabel">
+          <span v-html="model.preLabel"></span>
+        </div>
         <div style="flex:1" v-bind="model.attrs" class="el-date-editor ct-input__inner">
           <input style="text-align:left;width:100%" class="el-range-input" :placeholder="model.attrs.placeholder1"
                  v-model="model.value" @change="onChangeHandler($event)" @input="onInputHandler($event);isShowClear()"
                  @blur="onBlurHandler($event)"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />{{model.rowKey}}
-          <!--<span v-if="!model.lock" class="cover-list-item-span">
-    <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
-  </span>-->
           <span class="el-input__suffix el-input--mini" v-if="showClear">
             <span class="el-input__suffix-inner ct-close">
               <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>

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

@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100%" class="ct-searchtable" ref="searchTable"
-       :style="{ 'margin-top': isLayout ? '0' : '', padding: isLayout ? '0' : '' }">
+       :style="{ 'margin-top': isMarginTop ? '0' : '10px', padding: isLayout ? '0' : '' }">
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header" v-if="!isLoading && model && searchStatsApi"
                    :api="searchStatsApi" @searchStats="searchStats" @setTableHeight="setTableHeight" :flagDisabled="disabledStats"
                    :searchModel="model.searchModel">
@@ -100,7 +100,7 @@
                   column.fixed === 'left' ? 'left-fixation' : null,
                   column.width === undefined ? 'ct-table-auto' : null,
                   column.fixed === 'right' ? 'right-fixation' : null,
-                ]" v-bind="column.attrs">
+                ]" v-bind="column.attrs" :style="getrowselectColor(rowindex === model.selectIndex)" >
                 <!--操作列-->
                 <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" style="float: left;">
                   <template v-for="(router, rowRouterIndex) in getRowRouterShow(row)" >
@@ -263,6 +263,7 @@ export default {
       currentTh: null,
       isLoading: true,
       isLayout: false,
+      isMarginTop:false,
       searchLoading: true,
       tableLoading: false, //表格等待
       operationLoading: false, //操作等待
@@ -299,6 +300,7 @@ export default {
       theadTitleLeft:0,
       theadTitleWidth:0,
       updateTableColumnsKey:0,
+       backgroundColor: "#ecf5ff",
     };
   },
   deactivated(){
@@ -310,6 +312,17 @@ export default {
     });
   },
   methods: {
+    getrowselectColor(flagSelect){ 
+      if(flagSelect)
+      {
+         return {
+          backgroundColor: this.backgroundColor
+         }
+        }
+        else{
+          return {};
+        }
+    },
     theadTitleHover(ev){
      if ( !this.model.columnWidthSaveAction) {
       return
@@ -365,6 +378,36 @@ export default {
       });
       if (self.model.cellLayout) {
         self.isLayout = true;
+      } 
+      if (this.model.selectedRowBackColor) {
+      self.backgroundColor=this.model.selectedRowBackColor ;
+      }
+      if (
+        (self.model.searchModel.screen &&
+          self.model.searchModel.screen.length > 0) ||
+        (self.model.searchModel.btnScreen &&
+          self.model.searchModel.btnScreen.length > 0)
+      ) {
+        let showField = self.model.searchModel.screen.find((v) => {
+          return v.show !== false;
+        });
+        if (!showField) {
+          showField = self.model.searchModel.btnScreen.find((v) => {
+            return v.show !== false;
+          });
+          if (!showField) {
+            self.isMarginTop = true;
+          }
+        }
+      } else if (self.model.shortcutForm) {
+        self.isMarginTop = false;
+      } else if (
+        self.model.searchModel.highScreen &&
+        self.model.searchModel.highScreen.length <= 0
+      ) {
+        self.isMarginTop = true;
+      } else {
+        self.isMarginTop = false;
       }
       self.isLoading = false;
       self.$forceUpdate();
@@ -2225,7 +2268,7 @@ export default {
 }
 
 .ct-table .ct-td.select {
-  background-color: #ecf5ff !important;
+  background-color: var(backgroundColor) !important;
 }
 .ct-table .ct-tr:hover .ct-td.select {
   background-color: #ecf5ff !important;

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -7,7 +7,9 @@
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
-
+      <div v-if="model.preLabel">
+        <span v-html="model.preLabel"></span>
+      </div>
 
       <el-popover v-if="model.autoFill && model.paramName" placement="bottom-start" v-model="showDrop" :trigger="'manual'" class="autoFill">
         <div>
@@ -46,7 +48,7 @@
             </span>
           </span>
         </el-input>  
-        <span v-if="this.minText" class="textarea-tip">{{this.minText}}</span> 
+        <span v-if="model.inputType === 'textarea' && this.minText" class="textarea-tip" v-html="minText"></span> 
         <span v-if="model.showWordLimit" class="textarea-count">{{model.value.length}}/{{ model.max }}</span>
         <span v-if="!model.forbiddenWords" class="textarea-icon"></span>
       </div>   
@@ -90,7 +92,7 @@
     data() {
       return {
         showClear: false,
-        minText:'',
+        minText:'&nbsp;&nbsp;&nbsp;&nbsp;',
         minTextLeft:0,
         forbiddenWordsValue:'',
         forbiddenWordsWidth:0,
@@ -116,9 +118,9 @@
         if(this.model.max && this.model.max>0 && this.model.min && this.model.min > 0){
           this.minText='需要'+this.model.min+'-'+this.model.max+'个字';
         }
-        else if(this.model.max && this.model.max>0){
-          this.minText='至多'+this.model.max+'个字';
-        }
+        // else if(this.model.max && this.model.max>0){
+        //   this.minText='至多'+this.model.max+'个字';
+        // }
         else if(this.model.min && this.model.min > 0){
           this.minText='至少需要'+this.model.min+'个字';
         }

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

@@ -513,6 +513,10 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             }
             );
         },
+        execRouter(routerKey) {
+          let field={id:routerKey};
+          this.form.self.fieldClickHandler(field);
+        },
         //消息提示 type主题:success/warning/info/error。 center是否居中true/flase。  duration 显示时间, 毫秒。设为 0 则不会自动关闭。 
         //showClose 是否显示关闭按钮。dangerouslyUseHtmlString 属性设置为 true ,message 就会被当做 HTML 片段处理。
         message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {

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

@@ -5,6 +5,12 @@ const Router = function (source) {
   var rtn = {
     disabled: source.selectedMode && source.selectedMode === Enum.ListSelectMode.Multiple ? true : false,
     code1:'',
+    get source() {
+      return source;
+    },
+    set source(v) {
+      source = v;
+    },
     get id() {
       return source.key;
     },
@@ -386,6 +392,9 @@ const Router = function (source) {
     get locked() {
       return source.locked;
     },
+    set locked(v) {
+      source.locked = v;
+    },
     get flagVerifyData() {
       //提交表单时是否校验数据
       if (source.flagVerifyData != undefined) {

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

@@ -553,7 +553,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.page.flagMoreData !== 'undefined') {
                 self.flagMoreData = response.page.flagMoreData;
               }
-              if (response.content.updateTableColumns) {
+              if (response.content.updateTableColumns&&response.page.pageIndex<=1) {
                 self.columns = response.content.columns;
                 if (self.template) {
                   var tempLoader = template.loader(self.template).default;
@@ -687,7 +687,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.content.bottomText !== 'undefined') {
                 self.listFooter = response.content.bottomText;
               }
-              if (response.content.updateTableColumns) {
+              if (response.content.updateTableColumns&&response.page.pageIndex<=1) {
                 self.columns = response.content.columns;
                 if (self.template) {
                   var tempLoader = template.loader(self.template).default;

package/src/main.js

@@ -15,6 +15,7 @@ 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.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
@@ -55,7 +56,7 @@ Vue.use(centaline, {
       return {
         oldToken: '11c12506-253c-4995-83fb-84cf51cb23a0',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ71ep4vtpOEQUQiOFCpEEgmEuDsgoKNnildMM-8Gy7aHGrI0ilJnMbXGIWXvsOm8YEwiKhpvKUofPuCP-dJrTcFrbrEJPiExWRSdBBNxoi63NsUMFZTLCWrNwoGtElvBPKxvIZ75JbalnHfl-o9zx3V-Zt1QggTrUJkwIE1qQlGjQ2dkJPGGlRzg_gAAAP__.AvGloBOPe6P0tfZZUrjROEl8nOpm1A0ih43ut1I75w8"}',
+        authObject: '{token:"1080-1717711692902830080"}',
 
         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"}',