centaline-data-driven 1.2.95 → 1.2.96

package/package.json

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

package/src/centaline/dynamicCompound/src/dynamicCompound.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container  v-if="model.fields.length > 0">
-    <div v-for="(col, index) in model.fields" :key="index" v-if="col.show !== false" :class="index>0&&col.label==''?'complex-left-10':''" :style="{'width':(col.width!='0'?col.width+'px':'100%'),'flex':(col.width!='0'?'0 0 '+col.width+'px':'100%')}">
+    <div 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':''" :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>

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

@@ -25,7 +25,8 @@
                   </div>
                 </div>
                 <div v-if="model.fields1Dic.PropertyDepict" v-html="model.fields1Dic.PropertyDepict.value" 
-                  style="color: blue;font-size: 16px;font-weight: bold;margin-top: 14px;">
+                  style=" color: rgb(25, 137, 250);font-size: 13px;margin-top: 10px;background: rgb(236, 249, 255);
+ flex: 1;align-items: center;padding: 5px;border-radius: 5px;">
                 </div>
             </div>           
             <div class="head-but">
@@ -1213,7 +1214,7 @@
             // align-items: center;
             border-bottom: 1px solid #e0e0e0;
             .t-item {
-              padding: 0 16px;
+              padding: 5px 16px;
               font-size: 14px;
               flex: 1;
               position: relative;

package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+  <el-container v-if="model.visibility!='0'" :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
     <component v-for="(item, index) in model.fields" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
   </el-container>
 </template>

package/src/centaline/dynamicLayout/src/dynamicLayoutChildrenFor.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container :direction="model.orientation" :style="model.styleObject">
+  <el-container v-if="model.visibility!='0'" :direction="model.orientation" :style="model.styleObject">
       <ct-layoutchildren v-for="(item, index) in model.fields" :key="index" :rowindex="rowindex" :forrowindex="model.forrowindex" :vmodel="item" :forname="model.forname" @click="clickHandler"></ct-layoutchildren>
   </el-container>
 </template>

package/src/centaline/dynamicLayout/src/dynamicLayoutImage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="model.routerKey">
+  <div v-if="model.routerKey&&model.visibility!='0'">
     <div v-if="model.rightRouter&&model.value!=''" :ref="'router'+forname+forrowindex" :style="model.styleObject">
       <el-popover class="Stats-popover" :placement="option.placement?option.placement:'left'"
                   v-model="visible" :trigger="option.trigger?option.trigger:''">
@@ -11,7 +11,7 @@
       </el-popover>
     </div>
   </div>
-  <div v-else-if="model.value!=''" :style="model.styleObject">
+  <div v-else-if="model.value!=''&&model.visibility!='0'" :style="model.styleObject">
     <el-image :src="model.value"
               fit="fit"></el-image>
   </div>

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -1,12 +1,12 @@
 <template>
-  <div v-if="model.routerKey">
+  <div v-if="model.routerKey&&model.visibility!='0'">
     <div v-if="model.rightRouter&&model.value!=''" :style="model.styleObject">
       <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem">
         {{model.value}}
       </a>
     </div>
   </div>
-  <div v-else-if="model.value!=''" :style="model.styleObject" v-html="model.value">
+  <div v-else-if="model.value!=''&&model.visibility!='0'" :style="model.styleObject" v-html="model.value">
   </div>
 </template>
 

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

@@ -8,22 +8,8 @@
         </template>
         <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
       </div>
-      <!--<el-row>
-        <el-col v-for="(col, index) in model.screen" :key="index" :span="col.colspan" style="padding:10px" v-if="col.show !== false">
-          <component :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
-        </el-col>-->
-        <!--搜索后面跟的按钮,直接挨个排序-->
-        <!--<el-col style="padding:5px" v-if="model.btnScreen && model.btnScreen[0]" :span="model.btnScreen[0].colspan">
-          <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
-        </el-col>
-      </el-row>-->
       <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%">
-          <!--<el-row v-if="highScreenRow.length > 0">
-            <el-col v-for="(col, index) in highScreenRow" :key="index" :span="col.colspan" style="padding:10px" v-if="col.show !== false">
-              <component :is="col.is" :vmodel="col" :api="model.optionApi" :popShow="highScreen" @click="clickHandler(col)"></component>
-            </el-col>
-          </el-row>-->
           <template v-for="(col, index) in highScreenRow" v-if="col.show !== false">
             <br v-if="col.is === 'ct-linefeed'" />
             <component v-else class="list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
@@ -107,6 +93,7 @@
       },
       loadScreen() {
         var self = this;
+        console.log(self.model)
         var hasParent = self.model.screen.filter((v) => {
           return typeof v.parentName !== 'undefined';
         });

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

@@ -25,6 +25,14 @@ const CellLayout = function (source) {
     get orientation() {
       return source.orientation;
     },
+    get visibility() {
+      if (source.visibility == 'gone' || source.visibility == 'hidden' || source.visibility == 'false' || source.visibility == '0' || source.visibility == '0.0') {
+        return '0';
+      }
+      else {
+        return source.visibility;
+      }
+    },
     get placeholder() {
       return source.placeholder;
     },
@@ -177,6 +185,9 @@ const CellLayout = function (source) {
       if (typeof source.weight !== 'undefined') {
         self._styleObject.flex = source.weight;
       }
+      if (typeof source.lineHeight !== 'undefined') {
+        self._styleObject.lineHeight = source.lineHeight+'px';
+      }
       if (typeof source.maxLines !== 'undefined') {
         self._styleObject.WebkitLineClamp = source.maxLines;
         self._styleObject.WebkitBoxOrient = "vertical";

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

@@ -68,7 +68,7 @@ const SearchScreen = function (source, callBack, screenPara) {
           return v.controlType === Enum.ControlType.ButtonSearch;
         });
         var screens = rtn.sourceFieldsArr.filter((v, i) => {
-          return advIndex === -1 || i < advIndex;
+          return (advIndex === -1 || i < advIndex) && v.controlType!==Enum.ControlType.From;
         });
 
         rtnscreens = this.initScreen(screens);
@@ -93,7 +93,7 @@ const SearchScreen = function (source, callBack, screenPara) {
 
         if (buttonSearchIndex > -1) {
           var screens = rtn.sourceFieldsArr.filter((v, i) => {
-            return buttonSearchIndex <= i && (buttonAdvancedSearchIndex === -1 || i <= buttonAdvancedSearchIndex);
+            return buttonSearchIndex <= i && (buttonAdvancedSearchIndex === -1 || i <= buttonAdvancedSearchIndex) && v.controlType!==Enum.ControlType.From;
           });
 
           rtnscreens = this.initScreen(screens);
@@ -121,7 +121,7 @@ const SearchScreen = function (source, callBack, screenPara) {
           });
         }
         var screens = rtn.sourceFieldsArr.filter((v, i) => {
-          return advIndex !== -1 && i > advIndex;
+          return (advIndex !== -1 && i > advIndex) && v.controlType!==Enum.ControlType.From;
         });
         rtnscreens = this.initScreen(screens);
         rtnscreens.forEach((v)=>{
@@ -130,6 +130,15 @@ const SearchScreen = function (source, callBack, screenPara) {
         this._highScreen = rtnscreens;
         return rtnscreens;
       },
+      get shortcutForm() {
+        var screens = rtn.sourceFieldsArr.filter((v, i) => {
+          return v.controlType!==Enum.ControlType.From;
+        });
+        if(screens && screens.length>0){
+          return screens[0];
+        }
+        return null;
+      },
       setBtnLoading(loading) {
         this.btnScreen.forEach(btn => {
           btn.disabled = loading;

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

@@ -233,6 +233,10 @@ const Enum = {
     /// 复合控件
     /// </summary>
     Compound: 48,
+    /// <summary>
+    /// 表单
+    /// </summary>
+    From: 49,
   },
 
   //返回状态码