centaline-data-driven 1.6.24 → 1.6.26

package/package.json

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

package/release-log.md

@@ -1,3 +1,19 @@
+# v1.6.26
+2024-11-04
+
+优化
+
+上传组件添加测试
+
+# v1.6.25
+2024-11-04
+
+优化
+
+上传组件，上传增加动态图标
+
+本组件隐藏，子组件必须隐藏;本组件显示，子组件根据值来显示隐藏;排除隐藏控件
+
 # v1.6.24
 2024-10-24
 

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="'/callcustomer/callcustpoolimport/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/api/finance/collection-money/detail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "type":"top"
+          "actionType":2,"originalTraId":"1849003143319056385","pageStyle":2,"pageTitle":"新增代收款","pageOnly":true
         },
         topHeight:10,
       }

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

@@ -37,16 +37,20 @@
           </div>
         </div>
 
-        <span class="Public-classification" style="color: #fff;border-radius: 0px 0px 4px 4px;text-align: left;line-height: 26px;display: inline-flex;overflow: hidden;"  v-if="(model.lock) || model.paramName">
+        <span class="Public-classification"
+          style="color: #fff;border-radius: 0px 0px 4px 4px;text-align: left;line-height: 26px;display: inline-flex;overflow: hidden;"
+          v-if="(model.lock) || model.paramName">
           <!--锁定-->
           <span v-if="model.lock" class="el-dropdown-link">
-            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName
+            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
+              model.mediaLabe.mediaLabelName
               }}</span>
           </span>
           <!--复杂分类-->
           <span v-else-if="model.isComplexClassify" class="el-dropdown-link"
             @click.stop="classifyFormClickHandle(model.mediaLabe)">
-            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName
+            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
+              model.mediaLabe.mediaLabelName
               }}</span>
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
@@ -56,7 +60,8 @@
 
 
             <span class="el-dropdown-link" @click.stop="classifyClickHandle">
-              <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName
+              <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
+                model.mediaLabe.mediaLabelName
                 }}</span>
               <i class="el-icon-arrow-down el-icon--right" style="color: #fff;"></i>
             </span>
@@ -73,7 +78,10 @@
         <div slot="file" slot-scope="{ file }" :title="file.fileName">
           <div class="cover-list-item">
             <div @click="viewerfile(file)">
-              <el-image fit="fill"
+              <div v-if="file.progressFlag"  v-loading="file.progressFlag"  style="width: 100px; height: 100px" 
+              element-loading-spinner="el-icon-loading">
+              </div> 
+              <el-image v-else fit="fill"
                 :src="file.url ? file.url : file.mediaUrl ? file.mediaUrl + '/100/100' : require('../../../assets/blank.png')"
                 style="width: 100px; height: 100px" :z-index="previewZIndex">
               </el-image>
@@ -172,15 +180,19 @@
             </div>
           </div>
         </div>
-        <span class="Public-classification" style="color: #fff;border-radius: 0px 0px 4px 4px;text-align: left;line-height: 26px;display: inline-flex;overflow: hidden;"  v-if="(model.lock) || model.paramName">
+        <span class="Public-classification"
+          style="color: #fff;border-radius: 0px 0px 4px 4px;text-align: left;line-height: 26px;display: inline-flex;overflow: hidden;"
+          v-if="(model.lock) || model.paramName">
           <!--锁定-->
           <span v-if="model.lock" class="el-dropdown-link">
-            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName}}</span>
+            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
+              model.mediaLabe.mediaLabelName}}</span>
           </span>
           <!--复杂分类-->
           <span v-else-if="model.isComplexClassify" class="el-dropdown-link"
             @click.stop="classifyFormClickHandle(model.mediaLabe)">
-            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName}}</span>
+            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
+              model.mediaLabe.mediaLabelName}}</span>
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <!--简单分类-->
@@ -189,7 +201,8 @@
 
 
             <span class="el-dropdown-link" @click.stop="classifyClickHandle">
-              <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName}}</span>
+              <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{
+                model.mediaLabe.mediaLabelName}}</span>
               <i class="el-icon-arrow-down el-icon--right" style="color: #fff;"></i>
             </span>
             <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
@@ -203,11 +216,14 @@
 
         <div slot="file" slot-scope="{ file }" :title="file.fileName">
           <div class="cover-list-item">
-            <div @click="viewerfile(file)">
-              <el-image fit="fill"
-                :src="file.url ? file.url : file.mediaUrl ? file.url : require('../../../assets/blank.png')"
-                style="width: 100px; height: 100px" :z-index="previewZIndex">
-              </el-image>
+            <div @click="viewerfile(file)" :sssss="JSON.stringify(file)">
+              <div v-if="file.progressFlag"  v-loading="file.progressFlag"  style="width: 100px; height: 100px" 
+              element-loading-spinner="el-icon-loading">
+              </div> 
+                <el-image v-else fit="fill"
+                  :src="file.url ? file.url : file.mediaUrl ? file.url : require('../../../assets/blank.png')"
+                  style="width: 100px; height: 100px" :z-index="previewZIndex">
+                </el-image>
             </div>
             <span class="cover-list-item-span-Default"
               v-if="(model.lock && file.flagDefault) || (model.rightDefault && model.rightDefault == 1 && file.mediaTypeID == 2)">
@@ -384,15 +400,15 @@ export default {
       var index = MediaAlbum[0].medias.findIndex(
         (v) => (v === file.source)
       );
-      
-      if(self.model.moreActionRouter){
+
+      if (self.model.moreActionRouter) {
         let submitData = {};
         submitData = self.model.form.self.getFileData(self.model.moreActionRouter);
-        submitData.index=index;
+        submitData.index = index;
         submitData = self.model.moreActionRouter.getActionPara(submitData).para;
-        self.$emit('tableButtonClick',self.model.moreActionRouter,submitData);
+        self.$emit('tableButtonClick', self.model.moreActionRouter, submitData);
       }
-      else{
+      else {
         self.$common.viewerfile((this.model.label || "预览媒体"), MediaAlbum, 0, index, self.model.mediaViewPageType);
       }
     },
@@ -462,31 +478,46 @@ export default {
     handleDownload(file) {
     },
     handleChange(file, fileList) {
+      debugger
+      console.log(file, 'handleChange')
+
       this.changeHandler(this.model.value);
     },
     //上传之前的钩子
     beforeUploadProcess(file) {
+      debugger
+      console.log(file, 'beforeUploadProcess')
       return true;
     },
 
     //文件上传时的钩子
     uploadProcess(event, file, fileList) {
+      debugger
+      console.log(file, "++++++++++++++++");
       file.progressFlag = true; // 显示进度条
       file.loadProgress = parseInt(event.percent); // 动态获取文件上传进度
+
+      console.log(file, fileList);
+      
       if (file.loadProgress >= 100) {
         file.loadProgress = 100;
         setTimeout(() => {
+          console.log(file, "---------------");
           file.progressFlag = false;
         }, 1000); // 一秒后关闭进度条
       }
     },
     //上传完成钩子
     handleAvatarSuccess(res, file, fileList) {
+      debugger
+      console.log(file, 'handleAvatarSuccess')
       this.model.handleAvatarSuccess(res, file, fileList);
       this.QRFileList = fileList;
       this.QRCodeLocate();
     },
     handleAvatarError(res, file, fileList) {
+      debugger
+      console.log(file, 'handleAvatarError')
       if (res.status === 404) {
         let m = JSON.parse(res.message);
         if (m.error) {
@@ -709,8 +740,8 @@ export default {
               showClose: true,
             });
             file.source = { "actionType": 2 };
-          this.model.deleteFile(file, false);
-          this.selfValidExcute("remove");
+            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);
@@ -763,8 +794,8 @@ export default {
                 v.mediaDescEN = v.mediaDescEN || null;
                 v.mediaDescCN = v.mediaDescCN || null;
                 v.mediaDataBase64 = v.mediaDataBase64 || null;
-                v.mediaLabelID = v.mediaLabelID ||  self.model.mediaLabe.mediaLabelID || "",
-                  v.mediaLabelName = v.mediaLabelName ||  self.model.mediaLabe.mediaLabelName || "",
+                v.mediaLabelID = v.mediaLabelID || self.model.mediaLabe.mediaLabelID || "",
+                  v.mediaLabelName = v.mediaLabelName || self.model.mediaLabe.mediaLabelName || "",
                   v.mediaCode = v.mediaCode || null;
                 v.groupID = v.groupID || null;
                 self.model.AddSourceList(v);

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

@@ -760,6 +760,11 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 else {
                   field.show = true;
                 }
+
+                //本组件隐藏，子组件必须隐藏
+                rtn.hiddenHandlesource(field,true);
+                if(!item.show && item.type !== Enum.ControlType.Hidden)field.show = false;
+
                 sign = true;
 
                 if (update && rtn.self && sign) {
@@ -771,6 +776,14 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
 
         }
       },
+      hiddenHandlesource(item){
+        let field=rtn.fields.filter((v, i) => {
+          return v.id==item.fieldName1;
+        });
+        if(field && field.length>0){
+          rtn.hiddenHandle(field[0],true);
+        }
+      },
       //验证必填关联组件
       validMrf(item) {
         let field = rtn.fields[item.mrf];

package/src/main.js

@@ -16,7 +16,7 @@ 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.46:9999/service-api/",  
+  // baseUrl: "http://10.88.22.46:9999/service-api/",  
   // baseUrl: "http://10.88.22.46:22324/service-api/v1/form/router",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:6060/onecard-api/",
@@ -26,7 +26,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.25.10.67:9999/service-api/",
   // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
-  // baseUrl: "http://10.88.22.69:8080/api/", 
+  baseUrl: "http://10.88.22.69:8080/", 
   // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38908/service-api/",
   // baseUrl: "http://10.1.245.111:31574/service-api/",
@@ -64,7 +64,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'c48263f0-1b23-4599-96de-323f4507dc61',
+        oldToken: 'da18df1e-9ee2-49fd-a5ca-a3e17c8947e5',
         token:'1080-1762727915918856192',
         // authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOiv5s2t76YztNBwiioMjhQqRRAIh7g4R0NEzxSummXcX81rETqgP8GO-dEFxNHazLBmQOAMHdJACsdbeZU6-8zaaNpCGjMYDmryHEFSEnDKlyJJaVqIR9XoWO-W0NQ6JZCOmfnkL7b3axDrXy6He_nHutEyv7NEWPRhlgWyRgAOO4PsRQRuWfXGjHGsVjycAAAD__w.Qknnm6TUNucBNAg_xMRzDifR5WHBjlHG4GN65hzN1Hk"}',
 
@@ -73,7 +73,7 @@ Vue.use(centaline, {
         estateId: '',
 
         authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"YSLnFY","time":1726133598476,"sign":"e08cc3c4257654dcc6b8063e3cb9b1b3","systemSource":"CCESU","empNo":"24988","empId":"202110201430497BB5FE89123A054CCA"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImZmNzQwNjBjLTk2OTktNDlkNy05MWY4LTg4NTFmNmM4NmIxYyJ9.UWOtxKd_HB9OY4Hy5js0r4RtQoHA53dMtQhhxIVG4DuQC4P6mUQgs4fa_dM00a2Cik3SCmDabMcLILFogWUmYw',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImIzOWQ2MDA3LTg5NGEtNDZlYy04MmYwLTZlZWZiZmIwMDcwOSJ9.kpreU5FhBzEUP-9ODH2UWw5YmYPxuyZjcnXcFBmPHm986Hb_3O8dkcAx9UvXdK6HHLOD-i8k9bMW8J_L0T41ZA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作