centaline-data-driven 1.3.64 → 1.3.67

package/package.json

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

package/src/SearchList.vue

@@ -4,17 +4,17 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <ct-searchlist :apiParam="para"
+    <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
       :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
       :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" 
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
-    </ct-searchlist>
-
-    <!-- <ct-searchlist :searchConditionApi="'/api/agenttrans/transactionList/getLayoutOfSearch'" 
-      :searchDataApi="'/api/agenttrans/transactionList/getTableList'">
     </ct-searchlist> -->
 
+    <ct-searchlist :searchConditionApi="'/api/workflow/layout'" 
+      :searchDataApi="'/api/workflow/list'">
+    </ct-searchlist>
+
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"

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/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -625,9 +625,9 @@ export default {
             if (self.model.tags1 && self.model.tags1[i]) {
               self.listKey = self.listKey + 1;
               self.model.searchConditionApiTags1 =
-                self.model.tags1[i].searchConditionApiUrl || "";
+                self.model.tags1[i].searchConditionAction || "";
               self.model.searchDataApiTags1 =
-                self.model.tags1[i].searchDataApiUrl || "";
+                self.model.tags1[i].searchDataAction || "";
               self.model.paramDataTags1 = self.model.tags1[i].paramData || "";
             }
           }
@@ -732,9 +732,9 @@ export default {
       if (this.model.tags1 && this.model.tags1[i]) {
         this.listKey = this.listKey + 1;
         this.model.searchConditionApiTags1 =
-          this.model.tags1[i].searchConditionApiUrl || "";
+          this.model.tags1[i].searchConditionAction || "";
         this.model.searchDataApiTags1 =
-          this.model.tags1[i].searchDataApiUrl || "";
+          this.model.tags1[i].searchDataAction || "";
         this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
@@ -746,8 +746,8 @@ export default {
       this.dropDownSelected = true;
       if (dropDownData && dropDownData[i]) {
         this.listKey = this.listKey + 1;
-        this.model.searchConditionApiTags1 = dropDownData[i].searchConditionApiUrl || "";
-        this.model.searchDataApiTags1 = dropDownData[i].searchDataApiUrl || "";
+        this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
+        this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
         this.model.paramDataTags1 = dropDownData[i].paramData || "";
         window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
       }

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -652,8 +652,8 @@ export default {
             self.model.activeIndex1 = i.toString();
             if (self.model.tags1 && self.model.tags1[i]) {
               self.listKey = self.listKey + 1;
-              self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionApiUrl || "";
-              self.model.searchDataApiTags1 = self.model.tags1[i].searchDataApiUrl || "";
+              self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionAction || "";
+              self.model.searchDataApiTags1 = self.model.tags1[i].searchDataAction || "";
               self.model.paramDataTags1 = self.model.tags1[i].paramData || "";
             }
           }
@@ -759,9 +759,9 @@ export default {
       if (this.model.tags1 && this.model.tags1[i]) {
         this.listKey = this.listKey + 1;
         this.model.searchConditionApiTags1 =
-          this.model.tags1[i].searchConditionApiUrl || "";
+          this.model.tags1[i].searchConditionAction || "";
         this.model.searchDataApiTags1 =
-          this.model.tags1[i].searchDataApiUrl || "";
+          this.model.tags1[i].searchDataAction || "";
         this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
@@ -775,8 +775,8 @@ export default {
       if (dropDownData && dropDownData[i]) {
         this.listKey = this.listKey + 1;
         this.model.searchConditionApiTags1 =
-          dropDownData[i].searchConditionApiUrl || "";
-        this.model.searchDataApiTags1 = dropDownData[i].searchDataApiUrl || "";
+          dropDownData[i].searchConditionAction || "";
+        this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
         this.model.paramDataTags1 = dropDownData[i].paramData || "";
         window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
       }

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -51,7 +51,7 @@
         <div ref="contact" id="contact" style="margin-top: 16px;" v-if="model.contactApiRouter!==null">
           <ct-contact :key="refreshKey" :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
         </div>
-        <div ref="routers" style="margin-top: 16px;display: flex;">
+        <div ref="routers" v-if="model.actionRoutersSimple!==null" style="margin-top: 16px;display: flex;">
           <component v-for="(router, index) in model.actionRoutersSimple.slice(0,showIndex>0?showIndex:model.actionRoutersSimple.length)" :key="index"
                      :ref="'routers'+index"
                      v-if="!router.rightField || (model.fields1Dic[router.rightField] && model.fields1Dic[router.rightField].value == 1)"
@@ -161,8 +161,8 @@
               self.model.activeIndex1 = i.toString();
               if (self.model.tags1 && self.model.tags1[i]) {
                 self.listKey = self.listKey + 1;
-                self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionApiUrl || '';
-                self.model.searchDataApiTags1 = self.model.tags1[i].searchDataApiUrl || '';
+                self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionAction || '';
+                self.model.searchDataApiTags1 = self.model.tags1[i].searchDataAction || '';
                 self.model.paramDataTags1 = self.model.tags1[i].paramData || '';
               }
             }
@@ -188,18 +188,20 @@
           if(self.$refs.routers){
             totalWidth=self.$refs.routers.offsetWidth;
           }
-          self.model.actionRoutersSimple.forEach((v,i) => {
-            if(!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)){
-              if(self.$refs['routers'+i] && self.$refs['routers'+i].length>0 && self.$refs['routers'+i][0] && self.$refs['routers'+i][0].$el){
-                if(sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+moreWidth+10>totalWidth && self.showIndex===0){
-                  self.showIndex=i;
-                }
-                else{
-                  sumWidth=sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+(i>0?10:0);
+          if(self.model.actionRoutersSimple!==null){
+            self.model.actionRoutersSimple.forEach((v,i) => {
+              if(!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)){
+                if(self.$refs['routers'+i] && self.$refs['routers'+i].length>0 && self.$refs['routers'+i][0] && self.$refs['routers'+i][0].$el){
+                  if(sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+moreWidth+10>totalWidth && self.showIndex===0){
+                    self.showIndex=i;
+                  }
+                  else{
+                    sumWidth=sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+(i>0?10:0);
+                  }
                 }
               }
-            }
-          });
+            });
+          }
         });
       },
       refreshPage(){
@@ -262,8 +264,8 @@
         this.model.activeIndex1=i;
         if(this.model.tags1 && this.model.tags1[i]){
           this.listKey = this.listKey + 1;
-          this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionApiUrl || '';
-          this.model.searchDataApiTags1 = this.model.tags1[i].searchDataApiUrl || '';
+          this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionAction || '';
+          this.model.searchDataApiTags1 = this.model.tags1[i].searchDataAction || '';
           this.model.paramDataTags1 = this.model.tags1[i].paramData || '';
           window.localStorage.setItem("simpletagkey", this.model.tags1[i].appID);//存储
         }
@@ -467,8 +469,8 @@
           if(v.appID=='Follow'){
             self.model.activeIndex1=i.toString();
             self.listKey=self.listKey+1;
-            self.model.searchConditionApiTags1=v.searchConditionApiUrl||'';
-            self.model.searchDataApiTags1=v.searchDataApiUrl||'';
+            self.model.searchConditionApiTags1=v.searchConditionAction||'';
+            self.model.searchDataApiTags1=v.searchDataAction||'';
             self.model.paramDataTags1 = v.paramData || '';
           }
         });

package/src/centaline/dynamicIti/src/dynamicIti.vue

@@ -9,7 +9,8 @@
              v-bind:class="[model.attrs.size?'el-range-editor--'+model.attrs.size:'',
          model.showLabel?'ct-iti-editor':'',isFocus?'isfocus':'',model.lock ? 'ct-is-disabled' : '']">
 
-         <div style="width:39%" class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
+         <div :style="{'width':model.unitName.length == 1 ? '38%':(model.unitName.length == 3) ?'32%':(model.unitName.length == 5) ?'28%': ''}"
+           class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
           <input style="text-align:left;width:100%" class="el-range-input" :placeholder="model.attrs.placeholder1"
                  v-model="model.value" @change="changeHandler($event)" @input="onInputHandler($event);isShowClear('input2')" @focus="focusHandler" @blur="blurHandler('value','decimals')"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>
@@ -21,7 +22,7 @@
          </span> -->
           </div>
           <span style="width:5%" class="el-range-separator">-</span>
-          <div style="width:39%" class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
+          <div :style="{'width':model.unitName.length == 1 ? '45%':( model.unitName.length == 3) ?'50%':(model.unitName.length == 5) ?'60%': ''}" class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
           <input style="text-align:left;width:100%;" class="el-range-input" :placeholder="model.attrs.placeholder2"
                  v-model="model.value1" @change="changeHandler($event);" @input="onInputHandler($event);isShowClear('input2')" @focus="focusHandler" @blur="blurHandler('value1','decimals1')"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>
@@ -146,3 +147,14 @@
     }
   }
 </script>
+<style scoped>
+.el-input__suffix {
+  right: -4px;
+  top:-1px;
+}
+
+span.ct-unitname.el-input__suffix.el-input__suffix-inner {
+  right: 15px;
+  top:0;
+}
+</style>

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

@@ -825,6 +825,7 @@ export default {
       let self = this;
       action = action || field.action;
       var clickAcion = function () {
+        self.$emit('doClosePopoverHandle');
         //若不是客户端方法，则直接访问接口
         if (!field.isClientFuntion) {
           // 外部框架tab页打开
@@ -833,12 +834,10 @@ export default {
             if (field.pageStyle) {
               submitData.pageStyle = field.pageStyle;
             }
-            self.$emit('doClosePopoverHandle');
             self.$common.getDataDrivenOpts().handler.openTab(action,submitData,field.pageTitle,self.model,field.dialogWidth);
           } 
           else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
-            self.$emit('doClosePopoverHandle');
             self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
           } 
           else if (field.isBrowserNewTab) {// 浏览器打开

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

@@ -323,7 +323,7 @@ const Detail = function (source, para, callBack) {
           return rtn._searchConditionApiTags1;
         }
         else if (rtn.tags1 && rtn.tags1.length > 0) {
-          rtn._searchConditionApiTags1 = rtn.tags1[0].searchConditionApiUrl;
+          rtn._searchConditionApiTags1 = rtn.tags1[0].searchConditionAction;
           return rtn._searchConditionApiTags1;
         }
       },
@@ -335,7 +335,7 @@ const Detail = function (source, para, callBack) {
           return rtn._searchDataApiTags1;
         }
         else if (rtn.tags1 && rtn.tags1.length > 0) {
-          rtn._searchDataApiTags1 = rtn.tags1[0].searchDataApiUrl;
+          rtn._searchDataApiTags1 = rtn.tags1[0].searchDataAction;
           return rtn._searchDataApiTags1;
         }
       },

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: 22px;
 }
 
 .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,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: 'd3513834-dcd1-4056-b094-53c484d7057f',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPsLLOzO3S6YOMhCO5igpURSDTGu6sROnpf8YrX_P-EcT5BBX4BN7TS6gJuaKUlYvUkDe7UR2ThEgPFgJEl8qFuyrivoYD-foWKRCyJU-sLGLrpF4xX9w3z2N-O_eMf5y7T8JkVn3PSzmHuyox8JoOabULjWJMhqyEFeL0BAAD__w.47czHbw7UgnOOWKn9Y0hd1pyImZskX5vJM6iWUy5s20',
+        oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe_iuZZwYtlJN0jLwiGquM1QJkRbCYS4OyC1W3fe8Ia3_P-CaTGoQVdwRxtdXMEdbXREHJWkxWPUhCzsMVAKmFgSn5vWp1MDFZTHDWoScRJUSSsY87yGA_lfWKZyv5TnP85d5_E76_rBheANsxWP3IugiRESDdGci4Ukw_sDAAD__w.3i21j7m3bYLyBiyw3yyRa30Ic2yb8HIJzfCicS6OXXM',
         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',