centaline-data-driven 1.5.21 → 1.5.23

package/build/centaline/centaline.path.js

@@ -59,6 +59,7 @@ const paths = {
     "dynamicDragSort": "./src/centaline/dynamicDragSort/index.js", //上下拖拽排序组件
     "dynamicEditPictures": "./src/centaline/dynamicEditPictures/index.js", //图片编辑组件
     "dynamicMapBaidu": "./src/centaline/dynamicMapBaidu/index.js", //地图
+    "dynamicContainer": "./src/centaline/dynamicContainer/index.js", //容器控件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js", //调用API插件

package/package.json

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

package/release-log.md

@@ -1,3 +1,50 @@
+## v1.5.23
+2023-06-12
+
+优化
+
+表单保存时，根据保存按钮的actionType来关闭Tab
+
+bug修复
+
+合并行刷新bug处理
+
+## v1.5.22
+2023-06-09
+
+优化
+
+容器控件
+
+右侧表单
+
+右侧列表
+
+右侧楼盘详情页
+
+弹层列表修改标题
+
+新增浏览器存取表格列宽
+
+文本框标题实现可换行效果以及checkbox 点击文字可以选择和取消
+
+Layout组件优化
+
+优化盘源和楼盘列表页抽屉组件样式
+
+优化盘源和楼盘列表页右边栏按钮的布局和逻辑以及更多的逻辑展示
+
+表单列表弹层新增时，可以取到表单的关联值
+
+bug修复
+
+BUG修复图片选择 无标签时，设置默认项消失
+
+统计切换没有刷新右侧处理
+
+重置弹层引用列表样式居上高度
+
+
 ## v1.5.21
 2023-05-25
 

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="'/PropertyTranToActive/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/data-driven-file/downTemplate'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "chanceID":"10155931","actionType":2
+          "key":"excel:12be9cb7-fd3a-4f82-a583-d7e240dc7aab"
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -9,6 +9,11 @@
       :searchDataApi="'/api/third-dept-tran/tran-list'">
     </ct-searchlist> -->
 
+    <!-- <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
+      :searchDataApi="'/api/transaction/adjustRecord/getTableList'">
+    </ct-searchlist> -->
+
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/wf/todo/wx/layout'" 
       :searchDataApi="'/wf/todo/wx/list'">
@@ -50,9 +55,19 @@
       :searchStatsApi="'/PropertyOFIList/getListStats'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'"
       :searchDataApi="'/EstateList/getListOfSearchModel'">
-    </ct-searchlist>
+    </ct-searchlist> -->
+    
+    <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'"
+      :searchDataApi="'/EstateBuildingList/getListOfSearchModel'">
+    </ct-searchlist> -->
+
+    <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'"
+      :searchDataApi="'/DistrictList/getListOfSearchModel'">
+    </ct-searchlist> -->
+    
+    <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist>
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/css/common.css

@@ -600,7 +600,7 @@ html {
 
 .ct-searchtable{
   margin-top: 10px;
-  padding: 20px 10px 0 10px;
+  padding: 10px 10px 0 10px;
   background: #fff;
   -webkit-box-sizing: border-box;
   border-radius:6px;
@@ -811,7 +811,7 @@ color: var(--centalinePlaceholder);
 }
 /* 重置弹层引用列表样式居上高度 */
 .ct-dialog_content .ct-searchtable{
-  margin-top: 0px!important;
+  /* margin-top: 0px!important; */
 }
 .ct-table-content .checkbox-td .el-checkbox{
   min-width: initial;

package/src/centaline/dynamicCb/src/dynamicCb.vue

@@ -2,7 +2,7 @@
   <div class="field-top">
     <div v-if="model !== null" class="ct-checkbox checkboxHeight">
       <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 line-feed" :class="[model.labelClass]">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend line-feed" :class="[model.labelClass]" @click="toggleCheckbox">
           {{model.label}}
         </div>
         <div class="ct-radios">
@@ -51,6 +51,9 @@
       load(data) {
         this.model = data;
       },
+      toggleCheckbox() {
+    this.model.value = !this.model.value;
+  },
       changeCheckBoxHandler: function (event) {
         this.changeHandler();
         if(this.model.autoSearch) this.$emit('click');
@@ -73,6 +76,7 @@
   }
  .ct-form .line-feed {
   white-space: normal;
+  cursor: pointer;
 }
 .ct-checkbox .ct-radios .el-checkbox {
     min-width: 0px;

package/src/centaline/dynamicContainer/index.js

@@ -0,0 +1,14 @@
+import dynamicContainer from './src/dynamicContainer'
+import api from '../api/index'
+
+dynamicContainer.install = function (Vue) {
+  Vue.component(dynamicContainer.name, dynamicContainer);
+
+  Vue.use(api);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicContainer);
+}
+
+export default dynamicContainer;

package/src/centaline/dynamicContainer/src/dynamicContainer.vue

@@ -0,0 +1,151 @@
+<template>
+  <el-container v-if="model.fields.length > 0" class="ct-container">
+    <el-aside class="lable" width="160px"><span v-html="model.label"></span></el-aside>
+    <el-main class="main">
+      <el-row>
+        <el-col v-for="(col, index) in model.fields" :key="index" v-if="col.show !== false"
+          :class="[index>0&&(col.label==''||col.is=='ct-btn')?'complex-left-10':'','containerCol']" 
+          :style="{'width':(col.width!='0'?col.width+'px':'100%'),'flex':(col.width!='0'?'0 0 '+col.width+'px':'100%')}">
+          <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
+                    @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
+                    @input="inputHandler(col,$event)"></component>
+        </el-col>
+      </el-row>
+    </el-main>
+  </el-container>
+</template>
+
+<script>
+  export default {
+    name: 'ct-container',
+    components: {
+    },
+    props: {
+      vmodel: Object,
+      api: String,
+      parentModel: Object,
+    },
+    data() {
+      return {
+        model: null,
+        foucus: false,
+        itemKey: Math.random(),
+        validMessage:'',
+      }
+    },
+    created() {
+      this.model = this.vmodel;
+      this.model.OptApi = this.api;
+    },
+    methods: {
+      fieldsValidExcute() {
+        var self = this;
+        var rtnBool = true;
+        if (typeof self.$refs.Fields !== 'undefined') {
+          self.$refs.Fields.forEach((f) => {
+            if (typeof f.validExcute !== 'undefined') {
+              if (!f.validExcute()) {
+                rtnBool = false;
+                if(self.validMessage=='')self.validMessage='【' + f.model.label + '】' +f.validMessage;
+              }
+            }
+          });
+        }
+        return rtnBool;
+      },
+      validExcute() {
+        var self = this;
+        var rtnBool = true;
+        if (!self.fieldsValidExcute()) {
+          rtnBool = false;
+        } 
+        return rtnBool;
+      },
+      changeHandler(field) {
+        var self = this;
+       
+        self.model.isChanged = true;
+        self.model.hiddenHandle(field);
+        self.model.requiredHandle(field);
+        //self.model.validMrf(field);
+
+        if (field.onAfterChanged) {
+          var router = self.model.actionRouters.find((v) => {
+            return v.id === field.onAfterChanged;
+          });
+          self.$parent.$parent.$parent.$parent.clickHandler(router);
+        }
+
+        self.$forceUpdate();
+      },
+      enterHandler(field) {
+        var self = this;
+       
+        self.model.isChanged = true;
+        self.model.hiddenHandle(field);
+        self.model.requiredHandle(field);
+        //self.model.validMrf(field);
+
+        if (field.routerKeyForEnterKey) {
+          var router = self.model.actionRouters.find((v) => {
+            return v.id === field.routerKeyForEnterKey;
+          });
+          self.$parent.$parent.$parent.$parent.clickHandler(router);
+        }
+
+        self.$forceUpdate();
+      },
+      inputHandler(field) {
+        var self = this;
+        this.model.input = field.input;//当前小组件事件作为大组件事件
+        self.$emit('input');
+
+      },
+      fieldClickHandler(field) {
+        let submitData = null;
+        var router = this.model.buttons.find((v) => {
+          return v.id === field.id;
+        });
+        if (router == undefined) {
+          router = this.model.links.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if (router == undefined) {
+          router = this.model.actionRouters.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if (router && field.isSubmitDataFromSelf) {
+          submitData = {};
+          router.submitFormField.forEach((v) => {
+            submitData[v] = field.list[field.listIndex].code;
+          });
+        }
+        this.$parent.$parent.$parent.$parent.clickHandler(router, submitData);
+      },
+    }
+  }
+</script>
+<style>
+.complex-left-10 {
+  padding-left: 10px;
+}
+.ct-container{
+  border: 1px solid #e0e0e0;
+}
+.ct-container main{
+  padding: 6px 0;
+}
+.containerCol{
+  padding: 5px;
+}
+.ct-container .lable{
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  flex-wrap: wrap;
+  background: #f3f3f3;
+  padding-left: 16px;
+}
+</style>

package/src/centaline/dynamicDetail/src/dynamicAlbums.vue

@@ -5,10 +5,10 @@
       <template v-if="carouselMediaAlbums.length > 0">
         <el-carousel
           arrow="hover"
-          height="199px"
+          :height="imgHeight+'px'"
           :autoplay="false"
           indicator-position="none"
-          :initial-index="getinitialIndex(carouselMediaAlbums)" @change="changeAlbumsIndex" ref="mediaAlbumsCarousel"
+          :initial-index="getinitialIndex(carouselMediaAlbums)" @change="changeAlbumsIndex" ref="mediaAlbumsCarousel" style="border-radius: 4px;"
         >
           <template v-for="(item, index) in carouselMediaAlbums">
             <el-carousel-item :key="index">
@@ -27,7 +27,7 @@
         <div class="page">{{page}}</div>
         <div
           class="hous-img"
-          style="position: absolute; bottom: 0; z-index: 9"
+          style="position: absolute; bottom: 4px; z-index: 9"
           v-if="newMediaAlbums.length > 1"
         >
           <div class="img-i">
@@ -184,7 +184,7 @@ export default {
   }
  .page{
      position: absolute;
-    bottom: 20px;
+    bottom: 7px;
     text-align: right;
     right: 0px;
    background-color: rgb(14 12 24 / 38%);
@@ -199,7 +199,7 @@ export default {
     overflow-x: hidden;
     overflow-y: hidden;
     white-space: nowrap;
-    background-color: rgb(255 255 255);
+    // background-color: rgb(255 255 255);
     opacity: 0.8;
     .img-i {
       width: auto;

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

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div :style="{position:pageType=='Form'?'relative':''}">
       <ct-PropertyDetailOFI v-if="pageType=='PropertyDetailOFI'"  :api="api" :apiParam="apiParam" :parentModel="parentModel" :top="top" class="ct-PropertyDetailOFI"
       @loaded="loaded" @scrollHandle="scrollHandle" ></ct-PropertyDetailOFI>
 
@@ -11,13 +11,22 @@
       @loaded="loaded" @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       @closeSideHandler="closeSideHandler" :drowerClose="drowerClose"></ct-PropertySimpleDetailRET>
       
-      <ct-EstateSimpleDetail v-if="pageType=='EstateSimpleDetail'" :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-EstateSimpleDetail"  
+      <ct-EstateSimpleDetail v-if="pageType=='EstateSimpleDetail' || pageType=='EstateBuildingSimpleDetail'" :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-EstateSimpleDetail"  
       @loaded="loaded" @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       @closeSideHandler="closeSideHandler" :drowerClose="drowerClose"></ct-EstateSimpleDetail>
 
       <ct-EstateBuildingDetail v-if="pageType=='EstateBuildingDetail'" :api="api" :apiParam="apiParam" :parentModel="parentModel" :top="top" class="ct-EstateBuildingDetail" 
       @loaded="loaded" @scrollHandle="scrollHandle" ></ct-EstateBuildingDetail>      
 
+      <ct-SearchList v-if="pageType=='SearchList'" :searchConditionApi="searchConditionApi" :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" 
+      :apiParam="apiParam" :pageHeight="listHeight+'px'" @tableLoaded="loaded">
+      </ct-SearchList>
+
+      <div v-if="pageType=='Form'" style="overflow: auto;" :style="{height:listHeight+'px'}">
+        <ct-form :api="api" :apiParam="apiParam" @loaded="loaded">
+        </ct-form>
+      </div>
+
     </div>
 </template>
 
@@ -27,6 +36,8 @@
   import dynamicPropertySimpleDetailRET from './dynamicPropertySimpleDetailRET'
   import dynamicEstateSimpleDetail from './dynamicEstateSimpleDetail'
   import dynamicEstateBuildingDetail from './dynamicEstateBuildingDetail'
+  import dynamicSearchList from '../../dynamicSearchList/src/dynamicSearchList.vue';
+  import dynamicForm from '../../dynamicForm/src/dynamicForm.vue';
   export default {
     name: 'ct-Detail',
     components: {
@@ -35,6 +46,8 @@
       'ct-PropertySimpleDetailRET': dynamicPropertySimpleDetailRET,
       'ct-EstateSimpleDetail': dynamicEstateSimpleDetail,
       'ct-EstateBuildingDetail': dynamicEstateBuildingDetail,
+      'ct-SearchList': dynamicSearchList,
+      'ct-form': dynamicForm,
     },
     props: {
       vmodel: Object,
@@ -46,6 +59,10 @@
       rowCount:Number,
       top:Number,
       drowerClose:String,
+      searchConditionApi: String,
+      searchStatsApi: String,
+      searchDataApi: String,
+      listHeight:Number,
     },
     data() {
       return {