centaline-data-driven 1.4.69 → 1.4.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.69",
+  "version": "1.4.71",
   "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="'/system/menuright/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/PropertyPublish/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "searchFields":{"fields":[]},"actionType":2
+          publishID: "1637690032707997696", actionType: 3
         },
         topHeight:10,
       }

package/src/centaline/api/index.js

@@ -187,7 +187,8 @@ const api = {
         else {
           Vue.prototype.$message({
             message: response.data.rtnMsg,
-            type: 'success'
+            type: 'success',
+            showClose:true,
           });
         }
       }

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

@@ -332,7 +332,11 @@
                                   self.model.pageDisabled = false;
                                   self.$common.closeDialog(dialogOption.dialog);
                                   if (data.rtnMsg) {
-                                    self.$message.success(data.rtnMsg);
+                                    self.$message({
+                                      message: response.data.rtnMsg,
+                                      type: 'success',
+                                      showClose:true,
+                                    });
                                   }
                                   if (data.notification === 17) {
                                     self.clickHandler(self.model.getRtnRouter(data.content), null)
@@ -581,7 +585,11 @@
                             finished(data) {
                               self.$common.closeDialog(dialogOption.dialog);
                               if (data.rtnMsg) {
-                                self.$message.success(data.rtnMsg);
+                                self.$message({
+                                  message: response.data.rtnMsg,
+                                  type: 'success',
+                                  showClose:true,
+                                });
                               }
                               if (field && field.changeCallBackFunName) {
                                 self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);

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

@@ -1030,7 +1030,11 @@ export default {
                         finished(data) {
                           self.$common.closeDialog(dialogOption.dialog);
                           if (data.rtnMsg) {
-                            self.$message.success(data.rtnMsg);
+                            self.$message({
+                              message: response.data.rtnMsg,
+                              type: 'success',
+                              showClose:true,
+                            });
                           }
                           if(!field.isExport)
                           {

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -246,7 +246,7 @@
           let res=this.forbiddenWordsValue.match(reg1)
           if(res && res.length>0){
             flag=false;
-            this.validMessage="输入文字中包含"+res.length+"个违禁词";
+            this.validMessage = (this.validMessage?this.validMessage+"  ":"") + "输入文字中包含"+res.length+"个违禁词";
           }
           this.valid = flag;
         }        

package/src/centaline/mixins/dynamicElement.js

@@ -54,6 +54,7 @@ export default {
       setTimeout(() => {
         self.valid = true;
         self.inputTime = (new Date()).getTime();
+        self.validMessage="";
 
         //通用校验
         if (this.model.validating) {
@@ -61,7 +62,9 @@ export default {
           self.valid = validtemp.valid;
           if (!self.valid) {            
             self.validExcuteMessage(validtemp);
-            return false;
+            if(!self.model.forbiddenWords){
+              return false;
+            }
           }
           
           //组件个性化校验
@@ -72,6 +75,10 @@ export default {
           }
         }
 
+        if(!self.valid){
+          return false;
+        }
+
         if (typeof self.model.value !== 'undefined') {
           self.inputOld = self.model.value;
         }
@@ -95,6 +102,7 @@ export default {
       var self = this;
       setTimeout(() => {
         //通用校验
+        self.validMessage="";
         var time = (new Date()).getTime();
         if (time > (self.inputTime + 500) || self.valid) {
           if (this.model.validating) {
@@ -102,7 +110,9 @@ export default {
             self.valid = validtemp.valid;
             if (!self.valid) {              
               self.validExcuteMessage(validtemp);
-              return false;
+              if(!self.model.forbiddenWords){
+                return false;
+              }
             }
           }
 
@@ -114,6 +124,10 @@ export default {
           }
         }
 
+        if(!self.valid){
+          return false;
+        }
+
         if (typeof self.model.value !== 'undefined') {
           self.changeOld = self.model.value;
         }
@@ -132,6 +146,7 @@ export default {
      */
     validExcute() {
       var self = this;
+      self.validMessage="";
 
       //通用校验
       if (typeof this.model.validating === "function") {
@@ -139,7 +154,9 @@ export default {
         self.valid = validtemp.valid;
         if (!self.valid) {
           self.validExcuteMessage(validtemp);
-          return false;
+          if(!self.model.forbiddenWords){
+            return false;
+          }
         }
       }
 
@@ -150,6 +167,10 @@ export default {
         }
       }
 
+      if(!self.valid){
+        return false;
+      }
+
       self.valid = true;
       return true;
     },

package/src/main.js

@@ -48,7 +48,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uGYke2Y8HzonJg2LQEkIElSIBAmE2DtBLIL2FPe9V5jvQ9gGRxVjJmh3DQHXotBIitCKl1ysoDT5IF2uiKpA2hm0KRIglgrRqnZUyUXjobIXw7W00lrCtANrqABmNqYus2sOmzA9rmGbRD0lQvdNOPfLDyKKfeE-T7f99PzHuctyXmcndRwZCVzRgTVnGI6nI0jseRzFokQP7w8AAAD__w.6TJZpYdC_fgDwgmjurh6Lyktk3Ga2DC1JUu5C6GxktA',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjkEOwjAMBP-SM5YS27EdbmlDLzyialCR4IRoK4EQfyeIR3Ad7c7uyy1bdXuXUMWYCfpDR8AlK3QSPPSScsyWUbo4yhALoiqQDgZ98ASIuYC3ogMVSqJ-LJyyYTM11EwYDmAdZcDIxjREThrdzs2Pm9sH0cQqiLhzl2n9AbJkX7At8_04P_9x7rpe2uy5NepcFYTFt7AgVKQz6EnVq01UQ3TvDwAAAP__.NfZrt1wK0fZT3WdJplCcBlTe7PriWBvxZb0MU_YWWoA',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',