centaline-data-driven 1.3.63 → 1.3.66

package/package.json

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

package/src/SearchTree.vue

@@ -10,7 +10,7 @@
 <script>
   import Vue from 'vue'
   export default {
-    name: 'Tree',
+    name: 'DataDrivenSearchTree',
     data() {
       return {
         isShowSearchlist: false,

package/src/centaline/common/index.js

@@ -340,6 +340,9 @@ const common = {
       } 
       else if (parent.$options.name === 'DataDrivendetail') {
         return parent;
+      }  
+      else if (parent.$options.name === 'DataDrivenSearchTree') {
+        return parent;
       } 
       else {
         return this.getParentPane(parent);

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

@@ -481,7 +481,7 @@
               else {
                 submitData = field.getActionPara(submitData).para;
                 field.doAction(submitData, (data) => {
-                  if (data.rtnCode === 200) {
+                  if (data.rtnCode === 200 || data.isSuccess) {
                     if(field && field.changeCallBackFunName){
                       self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
                     }

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

@@ -703,49 +703,47 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       },
       //处理必填关联组件
       requiredHandle(item, update, doMrf) {
-       if (item.id) {
-         let field = null;
-         let value= rtn.getFieldValue(item);
-         for (var i in rtn.source.fields) {
-           if (rtn.source.fields[i].requiredRelationField === item.id) {
-             field = rtn.source.fields[i];
-             let f = rtn.fieldsDic[field.fieldName1];
-
-             if (field) {
-               let hiddenValueArr = field.requiredRelationFieldValue.split(',');
-               if (hiddenValueArr.indexOf(value) > -1) {
-                 field.required = true;
-               }
-               else {
-                 field.required = false;
-               }
-
-               if (f && f.self && f.self.$forceUpdate) {
-                 f.self.$forceUpdate();
-               }
-
-               if (update && rtn.self) {
-                 rtn.self.$forceUpdate();
-               }
-             }
-           }
-         }
-
-         if (doMrf !== false) {
-           rtn.validMrf(item);
-         }
-       }
-     },
-
-     getFieldValue(field)
-     {
-       if(field.type==Enum.ControlType.Switch)
-       {
-         return field.value?'1':'0';
-       }
-       return field.value;
-     },
+        if (item.id) {
+          let field = null;
+          let value= rtn.getFieldValue(item);
+          for (var i in rtn.source.fields) {
+            if (rtn.source.fields[i].requiredRelationField === item.id) {
+              field = rtn.source.fields[i];
+              let f = rtn.fieldsDic[field.fieldName1];
+
+              if (field) {
+                let hiddenValueArr = field.requiredRelationFieldValue.split(',');
+                if (hiddenValueArr.indexOf(value) > -1) {
+                  field.required = true;
+                }
+                else {
+                  field.required = false;
+                }
+
+                if (f && f.self && f.self.$forceUpdate) {
+                  f.self.$forceUpdate();
+                }
 
+                if (update && rtn.self) {
+                  rtn.self.$forceUpdate();
+                }
+              }
+            }
+          }
+
+          if (doMrf !== false) {
+            rtn.validMrf(item);
+          }
+        }
+      },
+      getFieldValue(field)
+      {
+        if(field.type==Enum.ControlType.Switch)
+        {
+          return field.value?'1':'0';
+        }
+        return field.value;
+      },
       //绑定联动参数组件
       getRefFieldPara(refFieldNameArr) {
         let submitData = {};

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

@@ -1,7 +1,6 @@
 import base from '../../index';
 import Base from './Base';
 import valid from '../../../validate/index';
-import Axios from 'axios';
 import common from '../../../common';
 import Vue from 'vue';
 import Enum from './lib/Enum';
@@ -37,12 +36,13 @@ const Tags = function (source, moreActionRouter) {
     get text() {
       return source.code1;
     },
-    set text(v) {
-     
+    set text(v) {     
       //由于tags存的数据都是json对象 所以如果传进来的数据是string类型则 需要转成对象
-      if(typeof v=="string")
-      {
-        v=JSON.parse(v);
+      if(typeof v=="string"){
+        v=[];
+        if(v.length > 0){
+          v=JSON.parse(v);
+        }
       }
 
       if (source.code1 !== '') {

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -104,8 +104,8 @@ export default {
   width: 16px;
   height: 20px;
   text-align: left;
-  top: 4px;
-  right: 6px;
+  top: 3px;
+  right: -4px;
 }
 
 .my-icon-more {

package/src/centaline/validate/index.js

@@ -321,7 +321,7 @@ const valid = {
         }
 
         for (let x in tempValid) {
-          rtnValidate[x].valid = rtnValidate[x].action(model, old1, old2);
+          rtnValidate[x].valid = rtnValidate[x].action(this, old1, old2);
           if (!rtnValidate[x].valid) {
             return rtnValidate[x];
           }

package/src/main.js

@@ -12,7 +12,7 @@ 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/", 
@@ -42,7 +42,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: 'd3513834-dcd1-4056-b094-53c484d7057f',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPsLLOzO3S6YOMhCO5igpURSDTGu6sROnpf8YrX_P-EcT5BBX4BN7TS6gJuaKUlYvUkDe7UR2ThEgPFgJEl8qFuyrivoYD-foWKRCyJU-sLGLrpF4xX9w3z2N-O_eMf5y7T8JkVn3PSzmHuyox8JoOabULjWJMhqyEFeL0BAAD__w.47czHbw7UgnOOWKn9Y0hd1pyImZskX5vJM6iWUy5s20',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ71rpyNOaDhEZCNHChUiiQRC3B0QSZeeKaaY5r0nTEuGGmQFd7TRhxXc0UavNQXR3OEhSERisuh19BiJIx3bzsamhQrK_Qq1ZjaOHHOoYEzzL5AL5huWqdxO5fGPc5d5_MxmMXpI5ozsDSMlozCwVSg5O5ZShqQyvN4AAAD__w.5BtoXWS_DQhRmNrD-HBaYtVay7pKWQLx5NrVBExANME',
         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',