centaline-data-driven 1.6.40 → 1.6.42

package/package.json

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

package/release-log.md

@@ -1,3 +1,17 @@
+# v1.6.42
+2024-05-07
+
+优化
+
+附件上传添加上传文件大小的限制[code2,单位M]，默认不限制
+
+# v1.6.41
+2024-05-07
+
+优化
+
+样式使用 ::v-deep 替代 >>>
+
 # v1.6.40
 2024-04-10
 

package/src/SearchList.vue

@@ -36,7 +36,7 @@
     <!-- <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/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> -->
@@ -46,6 +46,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/employeelist/getLayoutOfSearch'"  :searchDataApi="'/employeelist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/system/AreaList/getLayoutOfSearch'"  :searchDataApi="'/system/AreaList/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist>
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"

package/src/centaline/dynamicDetail/src/dynamicEstateBuildingDetail.vue

@@ -1610,11 +1610,11 @@ export default {
   background-clip: content-box;
   cursor: pointer;
 }
->>>.el-tabs__nav-prev {
+::v-deep.el-tabs__nav-prev {
   display: none;
 }
 
->>>.el-tabs__nav-next {
+::v-deep.el-tabs__nav-next {
   display: none;
 }
 
@@ -1647,10 +1647,10 @@ export default {
   border-bottom: 3px solid var(--chinaRed);
 }
 
->>>.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
->>>.el-tabs--bottom .el-tabs__item.is-top:last-child,
->>>.el-tabs--top .el-tabs__item.is-bottom:last-child,
->>>.el-tabs--top .el-tabs__item.is-top:last-child {
+::v-deep.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+::v-deep.el-tabs--bottom .el-tabs__item.is-top:last-child,
+::v-deep.el-tabs--top .el-tabs__item.is-bottom:last-child,
+::v-deep.el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 15px;
 }
 

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -1835,11 +1835,11 @@ export default {
   background-clip: content-box;
   cursor: pointer;
 }
->>>.el-tabs__nav-prev {
+::v-deep.el-tabs__nav-prev {
   display: none;
 }
 
->>>.el-tabs__nav-next {
+::v-deep.el-tabs__nav-next {
   display: none;
 }
 
@@ -1872,10 +1872,10 @@ export default {
   border-bottom: 3px solid var(--chinaRed);
 }
 
->>>.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
->>>.el-tabs--bottom .el-tabs__item.is-top:last-child,
->>>.el-tabs--top .el-tabs__item.is-bottom:last-child,
->>>.el-tabs--top .el-tabs__item.is-top:last-child {
+::v-deep.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+::v-deep.el-tabs--bottom .el-tabs__item.is-top:last-child,
+::v-deep.el-tabs--top .el-tabs__item.is-bottom:last-child,
+::v-deep.el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 15px;
 }
 

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -1853,10 +1853,10 @@ export default {
   cursor: pointer;
 }
 
->>> .el-tabs__nav-prev {
+::v-deep .el-tabs__nav-prev {
   display: none;
 }
->>> .el-tabs__nav-next {
+::v-deep .el-tabs__nav-next {
   display: none;
 }
 .more-dropdown {
@@ -1884,10 +1884,10 @@ export default {
   color: var(--chinaRed);
   border-bottom: 3px solid var(--chinaRed);
 }
->>> .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
->>> .el-tabs--bottom .el-tabs__item.is-top:last-child,
->>> .el-tabs--top .el-tabs__item.is-bottom:last-child,
->>> .el-tabs--top .el-tabs__item.is-top:last-child {
+::v-deep .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+::v-deep .el-tabs--bottom .el-tabs__item.is-top:last-child,
+::v-deep .el-tabs--top .el-tabs__item.is-bottom:last-child,
+::v-deep .el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 15px;
 }
 .svgIcon {

package/src/centaline/dynamicDragSort/src/dynamicDragSort.vue

@@ -233,7 +233,4 @@ export default {
     overflow-x: hidden;
 }
 
-/* .checkbox-common>>>span.el-checkbox__label {
-    padding-left: 30px;
-} */
 </style>

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

@@ -490,6 +490,10 @@ export default {
     handleDownload(file) {
     },
     handleChange(file, fileList) {
+      if (this.model.maxSize && file.size > this.model.maxSize) {
+        this.$message.error(`文件大小不能超过 ${this.model.maxSize / (1024 * 1024)}MB`);
+        fileList.pop(); // 移除不符合要求的文件
+      }
       this.changeHandler(this.model.value);
     },
     //上传之前的钩子

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

@@ -612,7 +612,13 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           configurable: true
         });
         return rtnFormObj;
-      }
+      },      
+      get maxSize() {
+        if(source.code2){
+          return source.code2 * 1024 * 1024;
+        }
+        return null;
+      },
     };
     rtn = base.copy(Base(data), rtn);
     rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -349,6 +349,11 @@ const Enum = {
     /// 
     /// </summary>
     Data: 4,
+    
+    /**
+    * url
+    **/
+    Url:5,
   },
 
   /// <summary>

package/src/main.js

@@ -76,7 +76,7 @@ Vue.use(centaline, {
         estateId: '',
 
         authObject: '{"currentEstate":{"estateId":"241113105409757BFF2887A7472E99D2","estateName":"U%E7%89%88%E6%A5%BC%E7%9B%98%E6%8C%89%E7%82%B9%E4%BD%8D","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"jijlB","time":1744183725353,"sign":"528fb9ea127871dacfda5d2e56abe364","systemSource":"CCESU","empNo":"maopp","empId":"2411120940038E8B1C87525447179987","clientVersion":"12.5","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.eyJsb2dpbl91c2VyX2tleSI6ImY1MGUyMTk2LTA3MjUtNDc3NS1iMjU0LTA1MmEyM2I3NWIwZiJ9.wOVpO974fdap7nW1JZeG3rGaMGDY6ktlRzHWwJPXXtYxpXeBtDaRgBRwnol9x5jGlEHmsGckEIBgfksSivbOYg',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjI1ZjYwYTJkLWEwNmMtNGRmNy1iNTQ1LTY1YTAwNjk5ZGI2OSJ9.8J9_ATCF2DYDE1wVr5cGoJgT9kNf1kajqkYtcr2se6s44PPMWOGaIzmpzVQTm1_Q9WD9laGM2BtKcfK2n2_aiw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作