centaline-data-driven 1.3.52 → 1.3.55

package/package.json

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

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="'/commissionmanage/apply'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/Worklist/getLayoutOfAudit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          
+          worklistID: "1562596656002764800", actionType: 2
         },
         topHeight:10,
       }

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

@@ -262,7 +262,7 @@
           return v.id === field.id;
         });
         if(router==undefined){
-            router = this.model.links.find((v) => {
+          router = this.model.links.find((v) => {
             return v.id === field.id;
           });
         }
@@ -699,7 +699,8 @@
           self.$message.warning(checkMsg);
           return;
         }
-
+        
+        submitData = router.getActionPara(submitData).para;
         var dialogOption = {
           title: router.pageTitle,
           pane: self.$common.getParentPane(self),

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

@@ -159,11 +159,17 @@
             return false;
           }
         }
+
         //是否是取消操作
         if (!isCancel) {
-          if (app.model.currentRow.isNew) app.model.tableData.splice(index, 1);
-          return row.isSet = !row.isSet;
+          if (app.model.currentRow.isNew) {
+            app.model.tableData.splice(index, 1);
+          }
+          row.isSet = !row.isSet;
+          app.itemKey = Math.random();
+          return ;
         }
+
         //提交数据
         if (row.isSet) {//保存
           if (app.fieldsValidExcute()) {
@@ -194,7 +200,7 @@
           app.model.currentRow.isNew = false;
           app.model.currentRow.index = index;
           app.model.currentRow.isSet = true;
-          row.isSet = true;          
+          row.isSet = true;
           app.itemKey = Math.random();
         }
       },

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

@@ -122,9 +122,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             source.links.forEach((v) => {
               var button = Router(v);
               button.is = "ct-btn";
-              if (button.show) {
-                rtn._links.push(button);
-              }
+              rtn._links.push(button);
             });
           }
           return rtn._links;

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

@@ -250,7 +250,8 @@ const Router = function (source) {
             jsonData: data
           }
         };
-      } else {
+      } 
+      else {
         data.actionType = rtn.actionType;
         data = Object.assign(data, rtn.queryPara);
         if (rtn.isDropdown && rtn.selectOptionCode) {

package/src/main.js

@@ -12,11 +12,11 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.13:7070/v1/form/router",
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.25:9999/v1/form/router",
   // baseUrl: "http://10.88.22.40:8080/", 
-  baseUrl: "http://tjcptest.centaline.com.cn/", 
-  flagRouterSelf: true,
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,8 +41,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '2a10f2e1-de17-4ceb-a3cf-b33a7b18515e',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEKg0AQRP9laxe8u3X31i6epslHyMkpmCpEhYSQf48h2tnnFa8YBmZeMC0dlCAbeKCdVjfwQDutMaRiuMGTSkBicuhN8BiIA53rxoWqhgz6xw1Kw5w7ESeUwRjnX2A112-wTP390j__ce46j-vsIAN5ch1alrSWhTCqRiRbJEtc-MQM7w8AAAD__w.dYqgv0MHo3uvKDGcRKsCZt4UCdSl1qVTNQt628giu6k',
+        oldToken: '77791819-ac7d-4a5d-bd16-5278b9f0b5d7',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOgzAQRO-yNSt58Xpt6BJDmhwCATYSqSI-UqIod4-jQEefV4xGr5l5wbx2UILdwIPYaYoNPIidhogLS1LjqbAeWVijI-_Qs3i-VLX25woyiI87lCRCbNnYPIOxXX5CO0dfsc5xusbnP87dljHN6hCCUkGhtDxg-tljF1MzuTJ5P3RGWoL3BwAA__8.FzLOuskp7kNb-SJX74wAXbH9D0zkINhgIIGiew1y8XU',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         estateId: '20210729104021C49F04B55C50F6AF58',