centaline-data-driven 1.2.48 → 1.2.49

package/package.json

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

package/src/centaline/css/common.css

@@ -800,4 +800,7 @@ html {
 }
 .el-input-group{
   line-height: 26px;
-}
+}
+
+
+

package/src/centaline/css/max.css

@@ -108,6 +108,9 @@
     min-height: 26px;
     line-height: 25px;
 }
+.ct-checkbox .lableNaN{
+    padding-left: 3px!important;
+}
 .cover-list-item .el-checkbox{
     margin-right: 10px!important;
 }

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -5,7 +5,7 @@
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
           {{model.label}}
         </div>
-        <div class="ct-checkbox-mian cover-list-item" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
+        <div class="ct-checkbox-mian cover-list-item" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'',model.label?'':'lableNaN']">
           <el-checkbox-group v-model="model.checkedItemArr" @change="changeHandler1">
             <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]">{{item[model.optionAttrs.label]}}</el-checkbox>          
             <span v-if="!model.lock" class="cover-list-item-span max-cover-list-item">

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

@@ -1,23 +1,38 @@
 <template>
-    <div ref="main" class="main" v-if="model!==null">
-      1111111111111111111111
+    <div ref="main" class="main">
+      <div style="height:36px;margin-top: 10px;display: flex;">        
+        <img src="../../../assets/ewmA.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:22px">
+        <span :style="{'width':computedTopWidth}"></span>
+        <img src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px">
+        <img src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px">
+        <div class="el-icon-close"></div>
+      </div>
+      <div v-if="model!==null">
+        11111111111111111111111
+      </div>
     </div>
 </template>
 
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
-  import dynamicContactList from './dynamicContactList.vue';
   export default {
     name: 'ct-PropertySimpleDetailRET',
     mixins: [dynamicElement],
     components: {
-      'ct-contactList': dynamicContactList,
     },
     props: {
       vmodel: Object,
       api: String,
       apiParam: Object,
     },
+    computed: {
+      computedTopWidth(){
+        // debugger
+        // let w=this.$refs.main.clientWidth;
+        // let wt=w-140;
+        return 300+'px';
+      }
+    },
     data() {
       return {
         
@@ -32,7 +47,7 @@
         else if (typeof self.source !== 'undefined') {
           self.loaderObj.Detail(self.source,null,self.load);
         }
-        else if (typeof self.api !== 'undefined') {
+        else if (typeof self.api !== 'undefined' && self.apiParam) {
           self.loaderObj.Detail(self.api,self.apiParam, self.load);
         }
       });

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

@@ -171,7 +171,14 @@
         if(this.$refs.table.model.listData.length>0){
           this.flagSideBar=this.$refs.table.model.flagSideBar;
           this.flagDefaultDisplaySideBar=this.$refs.table.model.flagDefaultDisplaySideBar;
-          if(!this.$refs.table.model.rowSelectRouter)this.flagSideBar=false;
+
+          if(this.$refs.table.model.rowSelectRouter){
+            this.sideBarApi=this.$refs.table.model.rowSelectRouter.action;
+            this.sideBarPageType=this.$refs.table.model.rowSelectRouter.actionSource;
+          }
+          else{
+            this.flagSideBar=false;
+          }
 
           if(this.flagSideBar){
             if(this.flagDefaultDisplaySideBar && !this.sideBarStatus){

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

@@ -25,7 +25,14 @@ const Base = function (source) {
       source.fieldName2 = v;
     },
     get label() {
-      return source.controlLabel + this.labelDelimiter || '';
+      let l='';
+      if(source.controlLabel){
+        l=source.controlLabel;
+      }
+      if(source.labelDelimiter){
+        l=l+source.labelDelimiter;
+      }
+      return l;
     },
     set label(v) {
       source.controlLabel = v;

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

@@ -23,6 +23,9 @@ const Router = function (source) {
     get actionForSearch() {
       return source.actionForSearch;
     },
+    get actionSource() {
+      return source.actionSource;
+    },
     get onClick() {
       return source.onChanged;
     },