centaline-data-driven 1.6.36 → 1.6.38

package/package.json

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

package/release-log.md

@@ -1,3 +1,21 @@
+# v1.6.38
+2024-03-21
+
+优化
+
+上传组件，多个时，去掉提示
+
+iti控件清除X居中处理
+
+多选带搜索控件在查询列表修改为直接传code1到api
+
+# v1.6.37
+2024-02-14
+
+优化
+
+列表添加行样式字段rowStyle，支持自定义行样式、行字体样式
+
 # v1.6.36
 2024-01-17
 

package/src/SearchList.vue

@@ -31,11 +31,14 @@
 
     <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/sunexpensemanage/sunexpenserecordlist/getLayoutOfSearch'"  :searchDataApi="'/sunexpensemanage/sunexpenserecordlist/getList'"></ct-searchlist> -->
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/workwxmanage/WorkWXApplicationList/getLayoutOfSearch'"  :searchDataApi="'/workwxmanage/WorkWXApplicationList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/UrgentResponsiblePersonList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/UrgentResponsiblePersonList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/MyCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/MyCustomerList/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/CustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/CustomerList/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/EntranceNoticeInfoList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/EntranceNoticeInfoList/getList'"></ct-searchlist> -->

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -52,8 +52,7 @@
               <tr v-for="(row,rowindex) in model.listData" :key="rowindex"
                   v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
                   :ref="'rows.'+rowindex" @click="rowClickHandle($event,rowindex)"
-                  class="ct-tr"
-                  :style="row.$style">
+                  class="ct-tr">
                 <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass]" align="center">
                   <label v-if="!model.rightMulti || row[model.rightMulti] == 1" class="el-checkbox is-checked"><span class="el-checkbox__input" :class="rowCheckClass(row)">
                     <span class="el-checkbox__inner"></span>

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -903,19 +903,7 @@ export default {
           window.uploads = { count: 0, length: uploads.length };
         }
         if (uploads.length > 1) {
-          window.uploads.count = window.uploads.count + 1;
-          window.uploads.length = uploads.length;
-
-          if (window.uploads.count == window.uploads.length) {
-            window.uploads = null;
-
-            self.$message({
-              message: "存在多个上传组件，请点击上传！",
-              type: 'info',
-              showClose: true,
-            });
-            return false;
-          }
+         
         }
         else if (uploads.length == 1) {
           window.uploads = null;

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

@@ -1065,11 +1065,12 @@
             fun(submitData, title, self.model);
           }
         }
+          
+        if(typeof field.onClick !== 'undefined'){
+          self.$common.excute.call(self.model.scripts, field.onClick)
+        }
 
         if (field.isSubmit && field.flagVerifyData) {
-          if(typeof field.onClick !== 'undefined'){
-            self.$common.excute.call(self.model.scripts, field.onClick)
-          }
           if(!self.validExcute()){
             return;
           }

package/src/centaline/dynamicIti/src/dynamicIti.vue

@@ -13,13 +13,7 @@
            class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
           <input style="text-align:left;width:100%" class="el-range-input" :placeholder="model.attrs.placeholder1"
                  v-model="model.value" @change="changeHandler($event)" @input="onInputHandler($event);isShowClear('input2')" @focus="focusHandler" @blur="blurHandler('value','decimals')"
-                 :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>
-           
-           <!-- <span  class="el-input__suffix el-input--mini"  v-if="showClear.input1">
-            <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,'input1','value')"></i>
-            </span>
-         </span> -->
+                 :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>           
           </div>
           <span style="width:5%" class="el-range-separator">-</span>
           <div :style="{'width':model.unitName && model.unitName.length == 1 ? '45%':(model.unitName &&  model.unitName.length == 3) ?'50%':(model.unitName && model.unitName.length == 5) ?'60%': ''}" class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
@@ -27,7 +21,7 @@
                  v-model="model.value1" @change="changeHandler($event);" @input="onInputHandler($event);isShowClear('input2')" @focus="focusHandler" @blur="blurHandler('value1','decimals1')"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>
           </div>
-          <span  class="el-input__suffix el-input--mini is-show-Span"  v-if="showClear.input2">
+          <span class="el-input__suffix el-input--mini is-show-Span" v-if="showClear.input2">
             <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,'input2')"></i>
             </span>
@@ -58,7 +52,6 @@
       return {
         isFocus: false,
         showClear:{input1:false,input2:false},
-
       }
     },
     created() {
@@ -145,13 +138,12 @@
       mouseOutHandle: function (id) {
         this.showClear[id]=false;
       },
-      isShowClear(id)
-      {
+      isShowClear(id){
          if ((this.model['value'] !== '' || this.model['value1'] !== '') && this.model.clearable) {
           this.showClear[id]=true;
         }
         else {
-           this.showClear[id]=false;
+          this.showClear[id]=false;
         }
       },
       search() {
@@ -163,7 +155,7 @@
 <style scoped>
 .el-input__suffix {
   right: -4px;
-  top:-1px;
+  top:-7px;
 }
 
 span.ct-unitname.el-input__suffix.el-input__suffix-inner {

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

@@ -75,7 +75,7 @@
             <!--可视区域的行数据-->
             <tr v-for="(row, rowindex) in model.listData" :key="rowindex"
               v-if="from == 'form' || pageRowMin <= rowindex && rowindex <= pageRowMax" :ref="'rows.' + rowindex"
-              @click="rowClickHandle($event, rowindex)" class="ct-tr" :style="row.$style">
+              @click="rowClickHandle($event, rowindex)" class="ct-tr" :style="row.rowStyle">
               <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td"
                 :class="[model.tdClass, rowindex === model.selectIndex ? 'select' : null,]" align="center">
                 <label v-if="!model.rightMulti || $common.getDataOfUpperLower(row, model.rightMulti) == 1"
@@ -2537,6 +2537,10 @@ export default {
   background-color: #ddd !important;
 }
 
+.ct-searchtable .ct-tr{
+  background-color: #ffffff; 
+}
+
 .ct-searchtable .ct-tr>.ct-td {
   /*border: 1px solid #e7e8eb;
     border-bottom: 1px solid #e7e8eb;
@@ -2544,7 +2548,7 @@ export default {
     border-left: 1px solid #e7e8eb;*/
   padding: 2px 20px;
   cursor: default;
-  background-color: #ffffff;
+  /* background-color: #ffffff; */
   // color: var(--centalineBlack);
 }
 
@@ -2694,10 +2698,12 @@ export default {
 
 .ct-table .left-fixation {
   position: sticky;
+  background-color: inherit;
 }
 
 .ct-table .right-fixation {
   position: sticky;
+  background-color: inherit;
 }
 
 .ct-table .left-fixation-th {

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -25,7 +25,7 @@
                 <ctSelectOptionVertical :model="model" @click="selectOption($event)" @dataUpdated="dataUpdated()"></ctSelectOptionVertical>
               </div>
               <input slot="reference" v-bind="model.attrs" :placeholder="tagsPlaceholder"
-                     ref="ct-input" class="" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
+                     ref="ct-input" class="" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px','font-size': 'small'}"
                      :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'"
                      @focus="focusHandle" @blur="blurHandle" @click="clickHandle"
                      :disabled="model.lock" />
@@ -461,6 +461,7 @@
   }
   .ct-tags-value-label {
     /* padding-left: 15px; */
+    font-size: small;
   }
   .h26{
   height: 26px;

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

@@ -421,6 +421,9 @@ const Base = function (source) {
     get lazyLoad() {
       return source.lazyLoad;
     },
+    get vueComponentName() {
+      return source.vueComponentName;
+    },
   };
 
   return rtn;

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

@@ -435,6 +435,9 @@ const Router = function (source) {
     get flagAsync() {
       return source.flagAsync;
     },
+    get vueComponentName() {
+      return source.vueComponentName;
+    },
   };
   return rtn;
 }

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

@@ -770,11 +770,11 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
       //判断控件是否需要单独处理searchValue1
       isHandle(type){
         let result=false;
-        switch (type) 
-        {
+        switch (type) {
           case Enum.ControlType.CheckBoxList://复选列表
-          result=true;
-          break;
+          case Enum.ControlType.MultiSelectWithSearch:
+            result=true;
+            break;
           default:
             result=false;
             break;

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

@@ -789,11 +789,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       //设置行样式
       setStyleRow(rows) {
         rows.forEach((row) => {
-          if (!row.$style) {
-            row.$style = {};
-          }
           if (rtn.rowColorColumn && row[rtn.rowColorColumn]) {
-            row.$style.color = row[rtn.rowColorColumn];
+            row.rowStyle = row.rowStyle + ";color:" + row[rtn.rowColorColumn] + ";";
           }
         });
       },

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -295,6 +295,16 @@ const Enum = {
     ///  月份区间
     /// </summary>
     MonthRange: 59,
+    
+    /// <summary>
+    ///  数值输入框带+/-按钮
+    /// </summary>
+    NumberWithPlusAndMinus: 60,
+    
+    /**
+    * VUE 前端子定义组件，组件名在 Field.vueComponentName 属性里定义
+    */
+    VueCustomizedComponent:61,
 
   },
 
@@ -638,6 +648,14 @@ const Enum = {
      * 在系统弹层打开
      */
     LayerInSystem:120,
+    /**
+     * 在弹层打开 前端的VUE组件， 组件名称放在action参数里
+     */
+    OpenVueComponentInLayer:121,
+    /**
+     * 在tab页打开 前端的VUE组件， 组件名称放在action参数里
+     */
+    OpenVueComponentInTab:122,
   },
 
   /// <summary>

package/src/main.js

@@ -75,8 +75,8 @@ Vue.use(centaline, {
         EstateInfo: '{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"}',
         estateId: '',
 
-        authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"588NJK","time":1733886962541,"sign":"7cb413ac60ed50fe406c9b91c8d4a836","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImVjMmUyY2Q1LWYzNmItNDc1YS04N2FjLWRjM2VkMjE1MzJjZSJ9.Uu8mB1VxYvTcDzkCXH0WrUOd9YdlJLGvW3Ae1i67fcnWrU8HhLKoXHgvFPDuzo8rp5QDM0LdQMLgXkER5zrWaw',
+        authObject: '{"currentEstate":{},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"FLNd7t","time":1742453755758,"sign":"dcf9d289a261a3a63bfb8f29a699ac1e","systemSource":"CCESU","empNo":"maopp","empId":"2411120940038E8B1C87525447179987","clientVersion":"24.11.4.1","empName":"%E6%AF%9B%E7%AE%A1%E7%90%86","roleName":"%E9%9B%86%E5%9B%A2IT%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImNkMTM3NTZjLTE2YWQtNGZjNi05OWRjLTFlMjljOTllYjcyZiJ9.QXAIvKUIg-Rdc9wZibPxuJlJZeVTQQCR7U8eiNJzqdcVD1mb45GL6xgTfdYBQ6sdw673VyzFrhSErEj1mCQeKQ',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作