centaline-data-driven 1.1.43 → 1.1.47

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -81,7 +81,7 @@
     border-radius: 4px;
     /*border: 1px solid #dcdfe6;*/
     line-height: 40px;
-    padding-left: 15px;
+    /* padding-left: 15px; */
   }
     .ct-Seg .ct-radios:hover {
       border-color: #c0c4cc;
@@ -91,7 +91,7 @@
     }*/
     .ct-Seg .ct-radios .el-radio {
       margin-left: 0px;
-      margin-right: 10px;
+      margin-right: 15px;
     }
 
   .ct-Seg .ct-radios .ct-Seg-label {

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
-    <div style="width:100%;display:flex">
-      <div style="flex:1" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+    <div style="width:100%;display:flex;">
+      <div style="flex:1;margin-right:5px" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
@@ -32,8 +32,8 @@
         </span>
       </transition>
       <div v-if="!model.lock && model.popupSearchListType === 1">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" class="h26" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
       </div>
     </div>
   </div>
@@ -62,7 +62,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         showClear:false
       }
     },
@@ -99,7 +99,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -186,10 +186,7 @@
         self.$emit('popupSearchList', true, self.model, self.model.moreActionRouter, (option) => {
           self.model.value = option[self.model.optionAttrs.value];
           self.model.text = option[self.model.optionAttrs.label];
-          self.model.options.push({
-            code: self.model.value,
-            name: self.model.text
-          });
+          self.model.options.push(option);
 
           self.soChange();
         });
@@ -254,7 +251,7 @@
       color: #606266;
       display: inline-block;
       font-size: inherit;
-      line-height: 28px;
+      line-height: 26px;
       outline: 0;
       padding: 0 15px;
       padding-right: 30px;
@@ -327,4 +324,7 @@
   .ct-so .ct-close > .el-select__caret.is-show-close:hover {
     color: #909399;
   }
+  .h26{
+    height: 26px;
+  }
 </style>

package/src/centaline/dynamicSos/src/dynamicSos - /345/244/215/345/210/266.vue"

@@ -54,7 +54,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         showClear: false,
         searchText: ""
       }
@@ -92,7 +92,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div style="width:100%;display:flex">
-      <div style="flex:1" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+      <div style="flex:1;margin-right:5px" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
        ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
@@ -35,8 +35,8 @@
         </span>
       </transition>
       <div v-if="!model.lock && model.popupSearchListType === 1">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+        <el-button v-if="!model.moreActionBtnName" size="mini" class="h26" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
       </div>
     </div>
   </div>
@@ -65,7 +65,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         showClear: false,
         searchText: ""
       }
@@ -103,7 +103,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -196,10 +196,7 @@
           if (option) {
             self.model.value = option[self.model.optionAttrs.value];
             self.model.text = option[self.model.optionAttrs.label];
-            self.model.options.push({
-              Code: self.model.value,
-              Name: self.model.text
-            });
+            self.model.options.push(option);
 
             self.soChange();
           }
@@ -262,4 +259,7 @@
   }
 </script>
 <style>
+.h26{
+  height: 26px;
+}
 </style>

package/src/centaline/dynamicTags/src/dynamicTags - /345/244/215/345/210/266.vue"

@@ -64,7 +64,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         tagsWidth: 175,
         showClear: false,
         searchText: "",
@@ -104,7 +104,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -303,7 +303,7 @@
       color: transparent;
       display: inline-block;
       font-size: inherit;
-      line-height: 28px;
+      line-height: 26px;
       outline: 0;
       padding: 0 15px;
       padding-right: 30px;

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div class="ct-tags" style="width:100%;display:flex">
-      <div style="flex:1;display:flex" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
+      <div style="flex:1;display:flex;margin-right: 5px;" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
     ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div style="flex:1;position: relative;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
@@ -17,7 +17,7 @@
                 </span>
               </span>
             </div>
-            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType === 2 || model.lock) ? 'manual' : 'click'">
+            <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'">
               <div>
                 <div>
                   <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -46,8 +46,8 @@
       </div>
 
       <div v-if="model.popupSearchListType === 1 && !model.lock">
-        <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
-        <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+        <el-button v-if="!model.moreActionBtnName" class="h26" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
       </div>
     </div>
   </div>
@@ -76,7 +76,7 @@
       return {
         focus: false,
         showDrop: false,
-        inputHeight: 28,
+        inputHeight: 26,
         tagsWidth: 175,
         showClear: false,
         searchText: "",
@@ -116,7 +116,7 @@
         get: function () {
           switch (this.model.attrs.size) {
             case 'mini':
-              return 28;
+              return 26;
             case 'small':
               return 32;
             case 'medium':
@@ -205,7 +205,7 @@
       },
       popupSearchListHandle: function () {
         var self = this;
-
+        self.showDrop=false;
         self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
           self.selectOptionArr(optionArr);
         });
@@ -280,9 +280,9 @@
       selectOptionArr(optionArr) {
         var self = this;
         optionArr.forEach((s) => {
-          if (!self.model.value.find((v) => { return v === s.Code })) {
+          if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
             self.model.options.push(s);
-            self.model.value.push(s.Code);
+            self.model.value.push(s[self.model.optionAttrs.value]);
           }
         });
 
@@ -418,4 +418,7 @@
   .ct-tags-value-label {
     padding-left: 15px;
   }
+  .h26{
+  height: 26px;
+}
 </style>

package/src/centaline/formData/index.js

@@ -11,6 +11,7 @@ const formData = {
     common: common,
     Axios: Axios,
     form: null,
+    formTable:null,
     excuteData: null,//fields
     fieldsDic: null,//fieldsDic
     _excuteListData: undefined,
@@ -43,6 +44,7 @@ const formData = {
         var rtn1 = this.fieldsDic[id];
         if (rtn1) {
             rtn1.source[attrKey] = attrValue;
+            console.log(this.form)
             this.form.hatchHandle(id, attrKey, attrValue, rtn1);
             //this.form.hiddenHandle(rtn1);//隐藏关联的
 
@@ -74,21 +76,30 @@ const formData = {
     //获取列表数据
     get excuteListData() {
         if (this._excuteListData) {
-        return this._excuteListData;
+            return this._excuteListData;
         }
         else {
-        if (this.excuteData !== null) {
-            this._excuteListData = this.excuteData.filter((v) => {
-            return typeof v.is !== undefined && v.is === 'ct-form-list-table';
-            });
-        }
+            if (this.excuteData !== null) {
+                this._excuteListData = this.excuteData.filter((v) => {
+                    return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+                });
+            }
         }
         return this._excuteListData;
     },
+    setExcuteListData(fields) {
+        this._excuteListData=null;
+        if (fields !== null) {
+            this.excuteData=fields;
+            this._excuteListData = fields.filter((v) => {
+                return typeof v.is !== undefined && v.is === 'ct-form-list-table';
+            });
+        }
+    },
     //获取列表的Field
     getListField(tableName, rowNum, fiedlId) {
         let listData = this.excuteListData.find((v) => {
-        return v.id === tableName;
+            return v.id === tableName;
         });
         if (listData) {
             let field = null;
@@ -164,7 +175,7 @@ const formData = {
     },
     //设置表格某行某列的值
     setListFieldValue(value, tableName, rowNum, fiedlId, attrName) {
-        value = value.toString();
+        value = value==undefined?"":value.toString();
         tableName = tableName ? tableName : this.form.scripts.$fd;
         let data = this.getListField(tableName, rowNum, fiedlId);
 

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

@@ -1,13 +1,27 @@
 import base from '../../index';
 import Base from './Base';
-import valid from '../../../validate/index';
 import Enum from './lib/Enum';
 import common from '../../../common';
+import Router from './Router';
 import Vue from 'vue';
 const Detail = function (source,para ,callBack) {
   var init = function (data) {
     var rtn = {
-        _fields1Dic: null,//字典，方便取值
+        _fields1Dic: null,//字典，方便取值,属性集合(用户固定部分)
+        _fields2Dic: null,//字典，方便取值,属性集合(用户动态部分)
+        _actionRouterLabel: null,//标签
+        _otherTradeActionRouter: null,//对应另外种交易的 router 如：本盘出售 则可能对应的出租的交易，没有则为空
+        _actionRouters:null,//页面上的动作行为
+        _actionRoutersMoreList:null,//页面上的更多动作行为
+        get fields1() {
+            return data.fields1;
+        },
+        get fields2() {
+            return data.fields2;
+        },
+        get labels() {
+            return data.labels;
+        },
         get fields1Dic() {
             if (rtn._fields1Dic !== null) {
                 return rtn._fields1Dic;
@@ -15,20 +29,131 @@ const Detail = function (source,para ,callBack) {
             rtn._fields1Dic = {};
             if (rtn.fields1) {
                 rtn.fields1.forEach((f) => {
-                    rtn._fields1Dic[f.fieldName1] = Base(f);
+                    let col = {
+                        get label() {
+                            return f.controlLabel + this.labelDelimiter || '';
+                        },
+                        get labelDelimiter() {
+                          return f.labelDelimiter || '';
+                        },
+                        get value() {
+                            return f.code1;
+                        },
+                        get unitName() {
+                            if(this.value===undefined || this.value===''){
+                                return '';
+                            }
+                            return f.unitName1;
+                        },
+                    }
+                    rtn._fields1Dic[f.fieldName1] = base.copy(Base(f), col);
                 });
             }
             return rtn._fields1Dic;
+        }, 
+        get fields2Dic() {
+            if (rtn._fields2Dic !== null) {
+                return rtn._fields2Dic;
+            }
+            if (rtn.fields2) {
+                rtn._fields2Dic = {};
+                rtn.fields2.forEach((f) => {
+                    let col = {
+                        get label() {
+                            return f.controlLabel + this.labelDelimiter || '';
+                        },
+                        get labelDelimiter() {
+                          return f.labelDelimiter || '';
+                        },
+                        get value() {
+                            return f.code1;
+                        },
+                        get unitName() {
+                            if(this.value===undefined || this.value===''){
+                                return '';
+                            }
+                            return f.unitName1;
+                        },
+                    }
+                    rtn._fields2Dic[f.fieldName1] = base.copy(Base(f), col);
+                });
+            }
+            return rtn._fields2Dic;
+        }, 
+        get actionRouterLabel() {
+          if (rtn._actionRouterLabel !== null) {
+            return rtn._actionRouterLabel;
+          }
+          else {
+            rtn._actionRouterLabel = [];
+            if (this.labels) {
+                this.labels.forEach((v) => {
+                var router = Router(v);
+                //router.is = "ct-btn";
+                //router.attrs = { size: "mini" }
+                rtn._actionRouterLabel.push(router);
+              });
+            }
+            return rtn._actionRouterLabel;
+          }
         },
-        get fields1() {
-            return data.fields1;
-        },    
-        get fields2() {
-            return data.fields2;
+        get otherTradeActionRouter() {
+          if (rtn._otherTradeActionRouter !== null) {
+            return rtn._otherTradeActionRouter;
+          }
+          else {
+            if (data.otherTradeActionRouter) {                
+                var router = Router(data.otherTradeActionRouter);
+                router.is = "ct-btn";
+                router.attrs = { size: "mini" }
+                rtn._otherTradeActionRouter=router;
+            }
+            return rtn._otherTradeActionRouter;
+          }
+        },
+        get actionRouters() {
+            if (rtn._actionRouters !== null) {
+                return rtn._actionRouters;
+            }
+            else {
+                if (data.actionRouters) { 
+                    rtn._actionRouters = [];
+                    let indexMore=1;
+                    if(data.actionRouters.length===3){
+                        indexMore=2;
+                    }
+                    data.actionRouters.forEach((v,i) => {
+                        if(i<=indexMore){
+                            var router = Router(v);
+                            router.is = "ct-btn";
+                            router.attrs = { size: "mini" }
+                            rtn._actionRouters.push(router);
+                        }
+                    });
+                }
+                return rtn._actionRouters;
+            }
+        },
+        get actionRoutersMoreList() {
+            if (rtn._actionRoutersMoreList !== null) {
+                return rtn._actionRoutersMoreList;
+            }
+            else {
+                if (data.actionRouters && data.actionRouters.length>3) { 
+                    rtn._actionRoutersMoreList = [];      
+                    data.actionRouters.forEach((v,i) => {
+                        if(i>=2){
+                            var router = Router(v);
+                            router.is = "ct-btn";
+                            router.attrs = { size: "mini" }
+                            rtn._actionRoutersMoreList.push(router);
+                        }
+                    });
+                }
+                return rtn._actionRoutersMoreList;
+            }
         },
     };
-    // rtn = base.copy(Base(data), rtn);
-    // rtn = base.copy(rtn, valid.Init(rtn));
     return rtn;
   }
   if (typeof source === 'string') {

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

@@ -144,7 +144,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           }
         }
       },
-      formData:formData,
+      get formData() {
+        return formData;
+      },
       getFormObj() {
         var rtnFormObj = {};
         rtn.fields.forEach((f) => {

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -344,6 +344,11 @@ const Enum = {
     /// 关闭框架的Tab页并且更新
     /// </summary>
     CloseTabThenUpdate: 16,
+
+    /// <summary>
+    ///  指示前端列表刷新当前行数据
+    /// </summary>
+    RefreshCurrentRow: 17,
   },
 
   /// <summary>

package/src/main.js

@@ -13,6 +13,7 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -33,7 +34,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '2db49cf6-0026-428b-9167-4273376a076f',
+        oldToken: '3007e478-86db-4d5a-8ce0-7253afb746b2',
         estateId: '20210729104021C49F04B55C50F6AF58',
         originalRequestURL: 'http://10.88.22.67:8080',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',