centaline-data-driven 1.2.97 → 1.2.98

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

@@ -8,6 +8,9 @@
         </template>
         <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
       </div>
+      <!-- <div class="ct-ptb5" v-if="model.shortcutForm">
+        <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut"></ct-form>
+      </div> -->
       <el-popover class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-model="highScreen" trigger="click" visible-arrow="false">
         <div style="width:100%">
           <template v-for="(col, index) in highScreenRow" v-if="col.show !== false">
@@ -93,7 +96,6 @@
       },
       loadScreen() {
         var self = this;
-        console.log(self.model)
         var hasParent = self.model.screen.filter((v) => {
           return typeof v.parentName !== 'undefined';
         });
@@ -163,6 +165,10 @@
           }
         });
       },
+      saveShortcut(){
+        var self=this;
+        
+      },
     }
   }
 </script>

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

@@ -6,6 +6,7 @@ import common from '../../../common';
 import Vue from 'vue';
 const SearchScreen = function (source, callBack, screenPara) {
   var init = function (source) {
+    console.log(source.content)
     var rtn = {
       $vue: null,
       get source() {
@@ -48,6 +49,9 @@ const SearchScreen = function (source, callBack, screenPara) {
         this._sourceFieldsArr = [];
 
         for (let key in source.content.fields) {
+          if(source.content.fields[key].controlType===Enum.ControlType.From ){
+            continue;
+          }
           if((source.content.fields[key].controlType===Enum.ControlType.DateRange 
             || source.content.fields[key].controlType===Enum.ControlType.DateTimeRange)
             && source.content.fields[key].code2==undefined){
@@ -131,11 +135,11 @@ const SearchScreen = function (source, callBack, screenPara) {
         return rtnscreens;
       },
       get shortcutForm() {
-        var screens = rtn.sourceFieldsArr.filter((v, i) => {
-          return v.controlType!==Enum.ControlType.From;
+        var screens = source.content.fields.filter((v, i) => {
+          return v.controlType===Enum.ControlType.From;
         });
         if(screens && screens.length>0){
-          return screens[0];
+          return screens[0];          
         }
         return null;
       },

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -61,7 +61,7 @@
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
           appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'manual',//触发方式，传值可查看Popper UI组件trigger属性
-          placement: 'bottom-start',//方向，传值可查看Popper UI组件placement属性
+          placement: 'left-start',//方向，传值可查看Popper UI组件placement属性
         },
       }
     },