centaline-data-driven 1.3.17 → 1.3.18

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/salemanage/adjust/point/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/finance/collection-money/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,7 +14,7 @@
     data() {
       return {
         apiParam:{
-actionType:2,
+actionType: 2, originalTraId: "1542328321501380609", pageStyle: 2, pageTitle: "新增代收款", pageOnly: true
           }
       }
     },

package/src/centaline/api/index.js

@@ -180,7 +180,7 @@ const api = {
     }
 
     if (data.rtnCode === Enum.ReturnCode.Successful) {
-      if (data.rtnMsg) {
+      if (data.rtnMsg && common.getDataDrivenOpts().showRequestSuccessMessage) {
         if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
           common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
         }

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

@@ -1,10 +1,5 @@
 <template>
-  <div
-    style="width: 100%"
-    v-if="model !== null"
-    class="block ct-file"
-    :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']"
-  >
+  <div style="width: 100%" v-if="model !== null" class="block ct-file" :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
     <el-upload
       :class="disableUpload ? 'ct-upload-display-none' : ''"
       :disabled="model.lock"
@@ -32,73 +27,36 @@
       </div>
       <div slot="file" slot-scope="{ file }" :title="file.fileName">
         <div class="cover-list-item">
-          <el-image
-            fit="fill"
-            :src="file.url"
-            style="width: 100px; height: 100px"
-            :z-index="previewZIndex"
-            @click="viewerfile(file)"
-          >
+          <el-image fit="fill" :src="file.url" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
           </el-image>
-          <span
-            class="cover-list-item-span-delete"
-            v-if="!model.lock && file.rightDel"
-          >
+          <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
             <i class="el-icon-delete" @click="handleRemove(file)"></i>
           </span>
-          <span
-            class="cover-list-item-span"
-            v-if="model.lock || model.paramName"
-          >
+          <span class="cover-list-item-span" v-if="model.lock || model.paramName">
             <!--锁定-->
             <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
-              <span style="width: 80px; height: 26px; display: inline-flex"
-                >&nbsp;{{ file.mediaLabelName }}</span
-              >
+              <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
             </span>
             <!--复杂分类-->
-            <span
-              v-else-if="model.isComplexClassify"
-              class="el-dropdown-link"
-              @click="classifyFormClickHandle(file)"
-            >
-              <span style="width: 80px; height: 26px; display: inline-flex"
-                >&nbsp;{{ file.mediaLabelName }}</span
-              ><i class="el-icon-arrow-down el-icon--right"></i>
+            <span v-else-if="model.isComplexClassify" class="el-dropdown-link" @click="classifyFormClickHandle(file)">
+              <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+              <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <!--简单分类-->
-            <el-dropdown
-              v-else
-              class="el-upload-list__item-preview"
-              trigger="click"
-              placement="top"
-              @command="classifySelectedClickHandle"
-            >
+            <el-dropdown v-else class="el-upload-list__item-preview"  trigger="click" placement="top" @command="classifySelectedClickHandle">
               <span class="el-dropdown-link" @click="classifyClickHandle">
-                <span style="width: 80px; height: 26px; display: inline-flex"
-                  >&nbsp;{{ file.mediaLabelName }}</span
-                ><i class="el-icon-arrow-down el-icon--right"></i>
+                <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+                <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
-              <el-dropdown-menu
-                slot="dropdown"
-                class="el-upload-list__item-preview"
-              >
-                <el-dropdown-item
-                  v-for="(option, index) in model.optionModel.options"
-                  :key="index"
-                  :command="{ option: option, file: file }"
-                >
+              <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
+                <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{ option: option, file: file }">
                   {{ option[model.optionModel.optionAttrs.label] }}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </span>
         </div>
-        <el-progress
-          type="circle"
-          v-if="file.progressFlag"
-          :percentage="file.loadProgress"
-        ></el-progress>
+        <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress"></el-progress>
       </div>
     </el-upload>
   </div>
@@ -149,17 +107,14 @@ export default {
     },
     //删除
     handleRemove(file) {
-      this.$common
-        .confirm("确定删除该附件？", "提示", {
+      this.$common.confirm("确定删除该附件？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           //type: 'warning'
-        })
-        .then(() => {
+        }).then(() => {
           this.model.deleteFile(file, false);
           this.selfValidExcute("remove");
-        })
-        .catch(() => {});
+        }).catch(() => {});
     },
     handlePictureCardPreview(file) {
       if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
@@ -302,7 +257,8 @@ export default {
       if (this.model.max) {
         if (this.model.getfileListLength() >= this.model.max) {
           this.disableUpload = true;
-        } else {
+        } 
+        else {
           this.disableUpload = false;
         }
       }
@@ -310,18 +266,14 @@ export default {
         if (this.model.getfileListLength() < this.model.min) {
           //change时需要判断有没有上传图片如果没有图片则不提示
           if (eventName == "change" && this.model.getfileListLength() > 0) {
-            this.validMessage =
-              "附件数量还差" +
-              (parseInt(this.model.min) - this.model.getfileListLength()) +
-              "张";
+            this.validMessage = "附件数量还差" + (parseInt(this.model.min) - this.model.getfileListLength()) + "张";
             this.valid = false;
-          } else if (eventName == "valid") {
-            this.validMessage =
-              "附件数量还差" +
-              (parseInt(this.model.min) - this.model.getfileListLength()) +
-              "张";
+          } 
+          else if (eventName == "valid") {
+            this.validMessage = "附件数量还差" + (parseInt(this.model.min) - this.model.getfileListLength()) + "张";
             this.valid = false;
-          } else if (eventName == "remove") {
+          } 
+          else if (eventName == "remove") {
             this.valid = true;
           }
           return false;

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

@@ -215,7 +215,6 @@ const box = function (source, fileSourceList, router, optionApi) {
         classify.file.source.mediaLabelID = classify.option[rtn.optionModel.optionAttrs.value];
       },
       handleAvatarSuccess(res, file, fileList) {
-      
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           fileSourceList.push(res.content[0]);
@@ -240,11 +239,15 @@ const box = function (source, fileSourceList, router, optionApi) {
           rtn.fileList = fileList;//无数据会监听不到
         }
         else {
+          for (let i = 0; i < fileList.length; i++) {
+            if (fileList[i].uid === file.uid) {              
+              fileList.splice(i, 1);
+            }
+          }
           Vue.prototype.$message.error(res.rtnMsg);
         }
       },
       deleteFile(file, forceDelete) {
-
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {
@@ -275,7 +278,6 @@ const box = function (source, fileSourceList, router, optionApi) {
             break;
           }
         }
-        console.log(rtn.fileList)
       },
       getFormObj() {
         var rtnFormObj = {};

package/src/main.js

@@ -13,9 +13,9 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://10.88.22.69:8080/", 
-  // flagRouterSelf: true,
+  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  baseUrl: "http://10.88.22.69:8080/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -39,7 +39,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'f6a35199-5dd7-423c-a4e4-e1553c3d76bb',
+        oldToken: 'f38e4a69-23f7-4c8e-b191-4028d08612d7',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImVjODhjOTI1LTU3OTktNDVmNy1iNDI3LWI3M2QwNGVkNWM2NSJ9.fyndFOEg4ThBHv4N2pi3pmPaWWlcD1CVPsYu0G5BKAB1hAgkL_GpOMpCZB5xdjMJLbBVomdoUjnRY7T6JSZb-g',