centaline-data-driven 1.6.19 → 1.6.21

package/package.json

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

package/release-log.md

@@ -1,4 +1,23 @@
- 
+# v1.6.21
+2024-09-14
+
+BUG
+
+查询条件必填验证bug处理，必须先判断有没有查询条件
+
+# v1.6.20
+2024-09-13
+
+BUG
+
+分片上传，API强制报错，删除当前文件
+
+保存按钮浮动样式修复
+
+优化
+
+同步下载模式按钮增加加载状态圆圈
+
 # v1.6.19
 2024-09-05
 

package/src/SearchList.vue

@@ -37,7 +37,8 @@
     <!-- <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="'/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/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/EntranceNoticeInfoList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/EntranceNoticeInfoList/getList'"></ct-searchlist> -->
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -105,6 +106,8 @@
     
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist> -->
 
+    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterList/getListOfSearchModel'"></ct-searchlist>
+
 
     <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
 :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
@@ -149,7 +152,7 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          "type":"left"
+          "name":"安全中心访问配置","code":"011.001","paramName":"安全中心访问配置","paramKey":"SecurityCenterConfig"
         },
       }
     },

package/src/SearchTree.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-                 :searchConditionApi="'/DepartmentList/getLayoutOfSearch'"
-                 :searchDataApi="'/DepartmentList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
+                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
+                 :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/centaline/css/common.css

@@ -952,3 +952,9 @@ color: var(--centalinePlaceholder);
 border-top-left-radius: 6px;
 border-bottom-left-radius: 6px;
 }
+
+.max .el-icon-loading{
+  color: red;
+  font-weight: 800;
+}
+

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -81,7 +81,7 @@
       </el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
-  <el-button v-else class="max"
+  <el-button v-else class="max" :loading="model.loading"
              :type="model.isHyperLink ? 'text' : 'primary'"
              v-bind="model.attrs" @click="clickHandle"
              :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
@@ -91,7 +91,7 @@
       <img :src="model.imgUrl" :height="model.buttonHeight+'px'" />
       <div style="margin-top:5px;" class="labelText" v-html="model.label"></div>
     </div>
-    <div v-else>
+    <div v-else :style="{display:model.loading?'inline-block':''}">
       <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'" />
       <span v-else v-html="model.label"></span>
     </div>

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

@@ -708,6 +708,9 @@ export default {
               type: 'error',
               showClose: true,
             });
+            file.source = { "actionType": 2 };
+          this.model.deleteFile(file, false);
+          this.selfValidExcute("remove");
             return false;
           }
           const Progress = Math.min(100, Math.floor(1E4 * parseInt(res.content.nextOffSet) / parseInt(file.size)) / 100);

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

@@ -1508,6 +1508,7 @@
     /* bottom: 6px; */
     bottom: 0;
     left: 0;
+    right: 0;
     border-radius: 0 0 4px 4px;
     position: absolute;
     line-height: 34px;

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -789,54 +789,56 @@ import dynamicElement from '../../mixins/dynamicElement';
         var rtnBool = true;
         var i = 0;
 
-        self.$refs.Fields.forEach((f) => {
-          if (f.model && typeof f.validExcute !== 'undefined') {
-            if (!f.validExcute()) {
-              if (i === 0) {
-                if (f.model.is == "ct-file"||f.model.is == "ct-repeat"||f.model.is == "ct-form-list-table") {
-                  self.$message({
-                    message: f.validMessage,
-                    type: 'error',
-                    showClose:true,
-                  });
-                }
-                else {
-                  if (f.validMessage) {
-                    if (f.validMessage == '必填' && (f.model.label || (f.model.attrs && f.model.attrs.placeholder))) {
-                      let m=f.model.label;
-                      if(!m && f.model.attrs && f.model.attrs.placeholder){
-                        m=f.model.attrs.placeholder;
+        if(self.$refs && self.$refs.Fields){
+          self.$refs.Fields.forEach((f) => {
+            if (f.model && typeof f.validExcute !== 'undefined') {
+              if (!f.validExcute()) {
+                if (i === 0) {
+                  if (f.model.is == "ct-file"||f.model.is == "ct-repeat"||f.model.is == "ct-form-list-table") {
+                    self.$message({
+                      message: f.validMessage,
+                      type: 'error',
+                      showClose:true,
+                    });
+                  }
+                  else {
+                    if (f.validMessage) {
+                      if (f.validMessage == '必填' && (f.model.label || (f.model.attrs && f.model.attrs.placeholder))) {
+                        let m=f.model.label;
+                        if(!m && f.model.attrs && f.model.attrs.placeholder){
+                          m=f.model.attrs.placeholder;
+                        }
+                        self.$message({
+                          message: '【' + m + '】' + f.validMessage,
+                          type: 'error',
+                          showClose:true,
+                        });
+                      }
+                      else {
+                        self.$message({
+                          message: f.validMessage,
+                          type: 'error',
+                          showClose:true,
+                        });
                       }
-                      self.$message({
-                        message: '【' + m + '】' + f.validMessage,
-                        type: 'error',
-                        showClose:true,
-                      });
                     }
                     else {
-                      self.$message({
-                        message: f.validMessage,
-                        type: 'error',
-                        showClose:true,
-                      });
-                    }
-                  }
-                  else {
-                    if (f.model.label) {
-                      self.$message({
-                        message: '【' + f.model.label + '】不能为空！',
-                        type: 'error',
-                        showClose:true,
-                      });
+                      if (f.model.label) {
+                        self.$message({
+                          message: '【' + f.model.label + '】不能为空！',
+                          type: 'error',
+                          showClose:true,
+                        });
+                      }
                     }
                   }
                 }
+                i++;
+                rtnBool = false;
               }
-              i++;
-              rtnBool = false;
             }
-          }
-        });
+          });
+        }
         return rtnBool;
       },
     }

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

@@ -1462,7 +1462,16 @@ export default {
                 }
               }
               else {
+                field.loading=true;
+                if(!field.alert && field.alertMsg){
+                  self.$message({
+                    message: field.alertMsg,
+                    type: 'info',
+                    showClose: true,
+                  });
+                }
                 field.doBlobAction(submitData, (data, headers) => {
+                  field.loading=false;
                   if (data.type == "application/json") {
                     const reader = new FileReader();
                     reader.readAsText(data, 'utf-8');
@@ -1485,6 +1494,13 @@ export default {
                         else {
                         }
                       }
+                      if(data.rtnMsg){
+                        self.$message({
+                          message: data.rtnMsg,
+                          type: 'info',
+                          showClose: true,
+                        });
+                      }
                     };
                   }
                   else {
@@ -1697,7 +1713,7 @@ export default {
           fun(submitData, title, self.$parent);
         }
       };
-
+      
       if (field.alert) {
         self.$common.confirm(field.alertMsg, field.alertCaption, {
           confirmButtonText: field.alertOKButtonText,

package/src/centaline/dynamicSearchList/src/dynamicTableToolbar.vue

@@ -1,32 +1,29 @@
 <template>
-  <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
-  
-<div v-if="buttonsLeft&&buttonsLeft.length>0" class="bool_btn_l">
-  <ul>
-   <li v-for="btn in buttonsLeft" class="ct-ToolbarButton max-ToolbarButton"  :class="{btn_r:btn.isRight}">
-        <component :is="btn.is" :vmodel="btn"
-                   @click="clickHandler(btn,$event)"
-                   @importComplete="importComplete"
-                   v-if="btn.show"
-                  :optionApi="optionApi"
-                   :fileData="getFileData(btn)"></component>
-      </li>
-   </ul>
-</div>
+  <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">  
+    <div v-if="buttonsLeft&&buttonsLeft.length>0" class="bool_btn_l">
+      <ul>
+        <li v-for="btn in buttonsLeft" class="ct-ToolbarButton max-ToolbarButton"  :class="{btn_r:btn.isRight}">
+            <component :is="btn.is" :vmodel="btn"
+                      @click="clickHandler(btn,$event)"
+                      @importComplete="importComplete"
+                      v-if="btn.show"
+                      :optionApi="optionApi"
+                      :fileData="getFileData(btn)"></component>
+        </li>
+      </ul>
+    </div>
      <div v-if="buttonsright&&buttonsright.length>0" class="bool_btn_r">
-  <ul>
-   <li v-for="btn in buttonsright" class="ct-ToolbarButton max-ToolbarButton"  :class="{btn_r:btn.isRight}">
-        <component :is="btn.is" :vmodel="btn"
-                   @click="clickHandler(btn,$event)"
-                   @importComplete="importComplete"
-                   v-if="btn.show"
-                  :optionApi="optionApi"
-                   :fileData="getFileData(btn)"></component>
-      </li>
-   </ul>
-</div>
-
-   
+      <ul>
+        <li v-for="btn in buttonsright" class="ct-ToolbarButton max-ToolbarButton"  :class="{btn_r:btn.isRight}">
+            <component :is="btn.is" :vmodel="btn"
+                      @click="clickHandler(btn,$event)"
+                      @importComplete="importComplete"
+                      v-if="btn.show"
+                      :optionApi="optionApi"
+                      :fileData="getFileData(btn)"></component>
+        </li>
+      </ul>
+    </div>   
   </div>
 </template>
 <script>

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

@@ -4,7 +4,8 @@ import Enum from './lib/Enum';
 const Router = function (source) {
   var rtn = {
     disabled: source.selectedMode && source.selectedMode === Enum.ListSelectMode.Multiple ? true : false,
-    code1:'',
+    code1:'',    
+    loading: false,
     get source() {
       return source;
     },

package/src/main.js

@@ -21,6 +21,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:6060/onecard-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
+  baseUrl: "http://10.28.21.164:9004/max-uplink-api/",
   // baseUrl: "http://10.25.10.63:9999/service-api/",
   // baseUrl: "http://10.25.10.67:9999/service-api/",
   // baseUrl: "http://10.25.10.69:8080/",
@@ -65,14 +66,14 @@ Vue.use(centaline, {
       return {
         oldToken: 'c48263f0-1b23-4599-96de-323f4507dc61',
         token:'1080-1762727915918856192',
-        // authObject: '{EmpID:"Token_6be80085-263f-4520-89bc-d789cb4717fb",MachineCode:"9c0cdf10-9296-4647-bd39-28eac046cf19",SSO_Token:"SSOToken_6be80085-263f-4520-89bc-d789cb4717fb",Platform:"WEB"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOiv5s2t76YztNBwiioMjhQqRRAIh7g4R0NEzxSummXcX81rETqgP8GO-dEFxNHazLBmQOAMHdJACsdbeZU6-8zaaNpCGjMYDmryHEFSEnDKlyJJaVqIR9XoWO-W0NQ6JZCOmfnkL7b3axDrXy6He_nHutEyv7NEWPRhlgWyRgAOO4PsRQRuWfXGjHGsVjycAAAD__w.Qknnm6TUNucBNAg_xMRzDifR5WHBjlHG4GN65hzN1Hk"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
         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":{"estateId":"20110926153136B3A34CC82D3D48FA7E","estateName":"%E6%98%9F%E6%B2%B3%E4%B8%B9%E5%A0%A4%E8%8A%B1%E5%9B%AD","estDeptPath":"009.007.003"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"3THBPx","time":1725429918833,"sign":"63188c3fbc0b7141ee6d9aee47588ef2","systemSource":"CCESU","empNo":"24988","empId":"202110201430497BB5FE89123A054CCA"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjlkMDg2NDczLWZlMzItNGU5OS04ZmIyLWNmMzgxMDdiODcxNiJ9.AWKNVDiQ9IwZkwQKRU67O6ZG31NJsJqhMPgx_nbADd-EzSyEbdkTONxjKfQmgW6qGFcgn4BdBOhaT8lGTmFE_g',
+        // authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"YSLnFY","time":1726133598476,"sign":"e08cc3c4257654dcc6b8063e3cb9b1b3","systemSource":"CCESU","empNo":"24988","empId":"202110201430497BB5FE89123A054CCA"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImJiY2MyNDFmLTA3NTYtNDViYy04NWEwLWViOWM0NmYxZWQyNCJ9.p799X66qZJjJlnSNp6KcYSRS9xVX_T6BXikb7Y80Fcwj0NgjOdbFTGN-n_ir1qIuKGTnjYAAhdqLR3n_acf8cA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作