centaline-data-driven 1.5.69 → 1.5.71

package/src/centaline/dynamicCalendar/src/index.css

@@ -64,70 +64,43 @@
 }
 
 .canlendar {
-	--color-primary-text: #4178be;
+	--color-primary-text: #333333;
 	--color-primary-light: #5cb4ff;
 	--color-canlender-bg: #f2f8fe;
-	--color-light-white: #f0f0f0;
-	border: 1px solid var(--color-light-white);
+	--color-light-gray: #E0E0E0;
+	border: 1px solid var(--color-light-gray);
 	background-color: #fff;
 	border-radius: 6px;
 }
-
 .canlendar.dark {
 	--color-primary-text: #8fa9d0;
 	--color-primary-light: #a6559d;
 	--color-canlender-bg: #f2f8fe;
-	--color-light-white: #F2F8FE;
-	border: 1px solid var(--color-light-white);
+	--color-light-gray: #F2F8FE;
+	border: 1px solid var(--color-light-gray);
 	border-radius: 6px;
 }
 
-.canlendar .canlendar_button {
-	padding: 5px;
-	border: 1px solid var(--color-light-white);
-	cursor: pointer;
-	user-select: none;
-}
-
-.canlendar .canlendar_button:hover {
-	background: var(--color-canlender-bg);
-}
-.canlendar.dark .canlendar_button:hover {
-	color: white;
-}
-
-.canlendar .canlendar_title {
-	padding: 15px;
-	width: 100%;
-	position: relative;
-}
-
-.canlendar .canlendar_title .year {
-	margin: 0 30px;
-	font-size: 20px;
-	font-family: Arial;
-}
-
-.canlendar .canlendar_title img {
-	cursor: pointer;
-}
-
 .canlendar .canlendar_content {
 	position: relative;
 	width: 100%;
+	padding:10px;
 }
 
 .canlendar_content .item {
 	box-sizing: border-box;
-	border: 1px solid var(--color-light-white);
+	border: 1px solid var(--color-light-gray);
 	width: 14.28%;
-	height: 55px;
+	height: 60px;
 	cursor: pointer;
 	transition: all 0.3s;
+	position: relative;
+	color: var(--color-primary-text);;
+	font-size: 12px;
 }
 
 .canlendar_content .item-disabled {
-	/* background: var(--color-light-white); */
+	/* background: var(--color-light-gray); */
 	background: #fff;
 	color: #fff;
 }
@@ -138,9 +111,12 @@
 
 .canlendar_content .header-item {
 	box-sizing: border-box;
-	border: 1px solid var(--color-light-white);
+	border: 1px solid var(--color-light-gray);
 	width: 14.28%;
 	height: 50px;
+	font-size: 12px;
+    font-weight: 600;
+    color: var(--color-primary-text);;
 }
 
 .canlendar_content .item:hover,
@@ -159,14 +135,14 @@
 }
 
 .canlendar .canlendar_today {
-	background: var(--color-primary-light);
-	color: white;
+	/* background: var(--color-primary-light); */
+	/* color: var(--chinaRed); */
 	border-radius: 12%;
 	text-align: center;
 }
 
 .canlendar .canlendar_today:hover {
-	background: var(--color-primary-light);
+	/* background: var(--color-primary-light); */
 }
 
 .canlendar_content .item .rounded {
@@ -179,3 +155,32 @@
 	text-align: center;
 	color: white;
 }
+
+.memuItem {
+	text-decoration: none;  /* 默认情况下，移除下划线 */
+	line-height: 26px;
+  }
+  
+  .memuItem:hover {
+	cursor:pointer;
+	text-decoration: underline;  /* 鼠标悬停时，添加红色下划线 */
+	color: var(--btnHoverRed);  /* 同时更改文本颜色为红色 */
+  }
+
+  .date-text{
+   position: absolute;
+   top: 0;
+   right: 4px;
+   font-weight: 600;
+  }
+  .box-menu {
+	width: 150px;
+	position: absolute;
+	z-index: 1000;
+	background-color: #fff;
+	box-shadow: 0px 0px 10px #ccc, 0px 0px 20px #ccc, 0px 0px 30px #ccc;
+	padding: 10px;
+  }
+  .canlendar .canlendar_today .date-text{
+	color:  var(--chinaRed);
+  }

package/src/centaline/dynamicD/src/dynamicD.vue

@@ -35,6 +35,12 @@
       }
     },
     methods: {
+      isAutoSearch(){
+        if(this.model.autoSearch) this.$emit('click');
+      },
+      changeHandler(){
+       this.isAutoSearch()
+      },
       getPickerOptions() {
         let self = this
         return {
@@ -82,6 +88,7 @@
             this.$emit('input', this.model.value);
           }
         }
+        this.isAutoSearch()
       }
     },
     created() {

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -90,7 +90,6 @@
   import dynamicElement from '../../mixins/dynamicElement'
   import dynamicFormListTalbe from './dynamicFormListTable'
   import { setTimeout } from 'timers';
-  //import dynamicFormList from './dynamicFormList'
   export default {
     name: 'ct-form',
     mixins: [dynamicElement],

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -7,14 +7,14 @@
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div inputNumbe-line-feed" :class="[model.labelClass]">
           {{model.label}}
         </div>
+        <div v-if="model.preLabel">
+          <span v-html="model.preLabel"></span>
+        </div>
         <div style="flex:1" v-bind="model.attrs" class="el-date-editor ct-input__inner">
           <input style="text-align:left;width:100%" class="el-range-input" :placeholder="model.attrs.placeholder1"
                  v-model="model.value" @change="onChangeHandler($event)" @input="onInputHandler($event);isShowClear()"
                  @blur="onBlurHandler($event)"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" />{{model.rowKey}}
-          <!--<span v-if="!model.lock" class="cover-list-item-span">
-    <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
-  </span>-->
           <span class="el-input__suffix el-input--mini" v-if="showClear">
             <span class="el-input__suffix-inner ct-close">
               <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>

package/src/centaline/dynamicLH/index.js

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

package/src/centaline/dynamicLH/src/dynamicLH.vue

@@ -0,0 +1,62 @@
+<template>
+  <div class="field-top">
+    <div class="ct-text" style="width:100%;display:flex" v-if="model !== null">
+      <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
+          <div slot="prepend" class="label-ellipsis" :class="[model.labelClass]" :title="model.label">
+            {{model.label}}
+          </div>
+        </div>
+        <div style="display:inline-flex;color: var(--centalineBlue);padding-left:5px;">
+          <div v-html="model.labelValue"></div>
+        </div> 
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement';
+  export default {
+    name: 'ct-labelHtml',
+    mixins: [dynamicElement],
+    props: {
+      vmodel: Object
+    },
+    data() {
+      return {
+	    }
+    },
+    created() {
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.LH(this.source);
+      }
+      else {
+        this.model = this.vmodel;
+      }
+      this.model.self=this;
+    },
+	  methods: {
+	  }
+}
+</script>
+<style scoped>
+.isWidth {
+  display: inline-flex;
+}
+.isEllipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  word-break:break-all;
+}
+.text-justify{
+  display: flex;
+  align-items: center;
+}
+.label-ellipsis{
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

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

@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100%" class="ct-searchtable" ref="searchTable"
-       :style="{ 'margin-top': isLayout ? '0' : '', padding: isLayout ? '0' : '' }">
+       :style="{ 'margin-top': isMarginTop ? '0' : '10px', padding: isLayout ? '0' : '' }">
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header" v-if="!isLoading && model && searchStatsApi"
                    :api="searchStatsApi" @searchStats="searchStats" @setTableHeight="setTableHeight" :flagDisabled="disabledStats"
                    :searchModel="model.searchModel">
@@ -100,7 +100,7 @@
                   column.fixed === 'left' ? 'left-fixation' : null,
                   column.width === undefined ? 'ct-table-auto' : null,
                   column.fixed === 'right' ? 'right-fixation' : null,
-                ]" v-bind="column.attrs">
+                ]" v-bind="column.attrs" :style="getrowselectColor(rowindex === model.selectIndex)" >
                 <!--操作列-->
                 <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" style="float: left;">
                   <template v-for="(router, rowRouterIndex) in getRowRouterShow(row)" >
@@ -263,6 +263,7 @@ export default {
       currentTh: null,
       isLoading: true,
       isLayout: false,
+      isMarginTop:false,
       searchLoading: true,
       tableLoading: false, //表格等待
       operationLoading: false, //操作等待
@@ -299,6 +300,7 @@ export default {
       theadTitleLeft:0,
       theadTitleWidth:0,
       updateTableColumnsKey:0,
+       backgroundColor: "#ecf5ff",
     };
   },
   deactivated(){
@@ -310,6 +312,17 @@ export default {
     });
   },
   methods: {
+    getrowselectColor(flagSelect){ 
+      if(flagSelect)
+      {
+         return {
+          backgroundColor: this.backgroundColor
+         }
+        }
+        else{
+          return {};
+        }
+    },
     theadTitleHover(ev){
      if ( !this.model.columnWidthSaveAction) {
       return
@@ -365,6 +378,36 @@ export default {
       });
       if (self.model.cellLayout) {
         self.isLayout = true;
+      } 
+      if (this.model.selectedRowBackColor) {
+      self.backgroundColor=this.model.selectedRowBackColor ;
+      }
+      if (
+        (self.model.searchModel.screen &&
+          self.model.searchModel.screen.length > 0) ||
+        (self.model.searchModel.btnScreen &&
+          self.model.searchModel.btnScreen.length > 0)
+      ) {
+        let showField = self.model.searchModel.screen.find((v) => {
+          return v.show !== false;
+        });
+        if (!showField) {
+          showField = self.model.searchModel.btnScreen.find((v) => {
+            return v.show !== false;
+          });
+          if (!showField) {
+            self.isMarginTop = true;
+          }
+        }
+      } else if (self.model.shortcutForm) {
+        self.isMarginTop = false;
+      } else if (
+        self.model.searchModel.highScreen &&
+        self.model.searchModel.highScreen.length <= 0
+      ) {
+        self.isMarginTop = true;
+      } else {
+        self.isMarginTop = false;
       }
       self.isLoading = false;
       self.$forceUpdate();
@@ -2225,7 +2268,7 @@ export default {
 }
 
 .ct-table .ct-td.select {
-  background-color: #ecf5ff !important;
+  background-color: var(backgroundColor) !important;
 }
 .ct-table .ct-tr:hover .ct-td.select {
   background-color: #ecf5ff !important;

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -7,7 +7,9 @@
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
-
+      <div v-if="model.preLabel">
+        <span v-html="model.preLabel"></span>
+      </div>
 
       <el-popover v-if="model.autoFill && model.paramName" placement="bottom-start" v-model="showDrop" :trigger="'manual'" class="autoFill">
         <div>
@@ -46,7 +48,7 @@
             </span>
           </span>
         </el-input>  
-        <span v-if="this.minText" class="textarea-tip">{{this.minText}}</span> 
+        <span v-if="model.inputType === 'textarea' && this.minText" class="textarea-tip" v-html="minText"></span> 
         <span v-if="model.showWordLimit" class="textarea-count">{{model.value.length}}/{{ model.max }}</span>
         <span v-if="!model.forbiddenWords" class="textarea-icon"></span>
       </div>   
@@ -90,7 +92,7 @@
     data() {
       return {
         showClear: false,
-        minText:'',
+        minText:'&nbsp;&nbsp;&nbsp;&nbsp;',
         minTextLeft:0,
         forbiddenWordsValue:'',
         forbiddenWordsWidth:0,
@@ -116,9 +118,9 @@
         if(this.model.max && this.model.max>0 && this.model.min && this.model.min > 0){
           this.minText='需要'+this.model.min+'-'+this.model.max+'个字';
         }
-        else if(this.model.max && this.model.max>0){
-          this.minText='至多'+this.model.max+'个字';
-        }
+        // else if(this.model.max && this.model.max>0){
+        //   this.minText='至多'+this.model.max+'个字';
+        // }
         else if(this.model.min && this.model.min > 0){
           this.minText='至少需要'+this.model.min+'个字';
         }

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -89,7 +89,8 @@ export default {
       }
     },
   setsearchtreeHeight(){
-     if(self.$refs.tree_left.$el)
+     let self = this;
+     if(self.$refs.tree_left&&self.$refs.tree_left.$el)
         {
         self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
       }

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

@@ -29,48 +29,100 @@ const Canlendar = function (source, param,flagSearch,callBack) {
         }
         return source.columns;
       },
-   
-      set columns(v) {
-        this._columns = [];
-        source.content.columns = v;
-      },
-      get modelCanlendar() {
-        var canlendarData = [];
-        source.content.rows.forEach(v => {
-          v.day = rtn.rowRouterKey("day");
-          v.date = rtn.rowRouterKey("date");
-          v.labelName = rtn.rowRouterKey("labelName");
-          canlendarData.push(v);
-        });
-        return canlendarData;
-      },
-      rowRouterKey(key) {
-        var obj = { action: "" };
-        if (rtn.rowRouter) {
-          var rowRouter = rtn.rowRouter;
-          for (var i = 0; i < rowRouter.length; i++) {
-            if (rowRouter[i].id == key) {
-              obj = rowRouter[i];
-              break;
-            }
+      _buttons: null,
+      get buttons() {
+        if (rtn._buttons !== null) {
+          return rtn._buttons;
+        }
+        else {
+          rtn._buttons = [];
+          if (source.buttons) {
+            source.buttons.forEach((v) => {
+              var button = Router(v);
+              button.is = "ct-btn";
+              rtn._buttons.push(button);
+            });
           }
-          return obj;
+          return rtn._buttons;
         }
       },
-      _tabs: null,
-      get tabs() {
-        if (this._tabs !== null) {
-          return this._tabs;
+      // get actionRouters() {
+      //   if (!source.actionRouters) {
+      //     source.actionRouters = [];
+      //   }
+      //   return source.actionRouters;
+      // },
+      doAction(response,newData,currentNode,currentData) {
+        switch (response.actionType) {
+          case Enum.ActionType.Delete://删除
+          case Enum.ActionType.CloseTabThenDelete://删除
+          rtn.$vue.remove(newData);//删除树节点
+            break;
+          case Enum.ActionType.New://新增
+          case Enum.ActionType.CloseTabThenNew://新增 
+          rtn.$vue.add(newData)//新增树节点
+            break;
+          case Enum.ActionType.Update://修改
+          case Enum.ActionType.CloseTabThenUpdate://修改
+          rtn.$vue.update(newData)//修改树节点 
+            break;
+          default:
+            break;
+        }  
+    },
+    _actionRouter: null,
+    get actionRouter() {   
+      if (rtn._actionRouter !== null) {
+        return rtn._actionRouter;
+      }
+      else {
+        rtn._actionRouter = [];
+        if (source.actionRouters) {
+          source.actionRouters.forEach((v) => {
+            var router = Router(v);
+            //router.is = "ct-btn";
+            //router.attrs = { size: "mini" }
+            rtn._actionRouter.push(router);
+          });
         }
-
-        this._tabs = [];
-        source.Tabs.forEach(v => {
-          var tab = Router(v);
-          this._tabs.push(tab);
-        });
-
-        return this._tabs;
+        return rtn._actionRouter;
       }
+    },
+      // get rowRouter() {
+      //   if (rtn._rowRouter !== null) {
+      //     return rtn._rowRouter;
+      //   }
+      //   else {
+      //     rtn._rowRouter = [];
+      //     if (rtn.actionRouter) {
+      //       rtn.actionRouter.forEach((v) => {
+      //         if (v.show) {
+      //           rtn._rowRouter.push(v);
+      //         }
+      //       });
+      //     }
+      //     return rtn._rowRouter;
+      //   }
+      // },  
+      // get optionApi() {
+      //   return source.parameterAction;
+      // },
+   
+   
+      // rowRouterKey(key) {
+      //   var obj = { action: "" };
+      //   if (rtn.rowRouter) {
+      //     var rowRouter = rtn.rowRouter;
+      //     for (var i = 0; i < rowRouter.length; i++) {
+      //       if (rowRouter[i].id == key) {
+      //         obj = rowRouter[i];
+      //         break;
+      //       }
+      //     }
+      //     return obj;
+      //   }
+      // },
+    
     };
 
     //valid.InitForm(rtn);

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

@@ -513,6 +513,10 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             }
             );
         },
+        execRouter(routerKey) {
+          let field={id:routerKey};
+          this.form.self.fieldClickHandler(field);
+        },
         //消息提示 type主题:success/warning/info/error。 center是否居中true/flase。  duration 显示时间, 毫秒。设为 0 则不会自动关闭。 
         //showClose 是否显示关闭按钮。dangerouslyUseHtmlString 属性设置为 true ,message 就会被当做 HTML 片段处理。
         message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {

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

@@ -0,0 +1,23 @@
+import base from '../../index';
+import Base from './Base';
+const T = function (source) {
+  var rtn = {
+    get labelValue() {
+      return source.code1;
+    },
+    get show() {
+      let flagShow = true;
+      if (typeof source.show !== "undefined") {
+        flagShow = source.show;
+      }
+      if(!rtn.labelValue && !rtn.label){
+        flagShow = false;
+      }
+      return flagShow;
+    },
+  };
+  rtn = base.copy(Base(source), rtn);
+  return rtn;
+};
+
+export default T;

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

@@ -5,6 +5,12 @@ const Router = function (source) {
   var rtn = {
     disabled: source.selectedMode && source.selectedMode === Enum.ListSelectMode.Multiple ? true : false,
     code1:'',
+    get source() {
+      return source;
+    },
+    set source(v) {
+      source = v;
+    },
     get id() {
       return source.key;
     },
@@ -386,6 +392,9 @@ const Router = function (source) {
     get locked() {
       return source.locked;
     },
+    set locked(v) {
+      source.locked = v;
+    },
     get flagVerifyData() {
       //提交表单时是否校验数据
       if (source.flagVerifyData != undefined) {

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

@@ -553,7 +553,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.page.flagMoreData !== 'undefined') {
                 self.flagMoreData = response.page.flagMoreData;
               }
-              if (response.content.updateTableColumns) {
+              if (response.content.updateTableColumns&&response.page.pageIndex<=1) {
                 self.columns = response.content.columns;
                 if (self.template) {
                   var tempLoader = template.loader(self.template).default;
@@ -687,7 +687,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.content.bottomText !== 'undefined') {
                 self.listFooter = response.content.bottomText;
               }
-              if (response.content.updateTableColumns) {
+              if (response.content.updateTableColumns&&response.page.pageIndex<=1) {
                 self.columns = response.content.columns;
                 if (self.template) {
                   var tempLoader = template.loader(self.template).default;

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

@@ -266,6 +266,11 @@ const Enum = {
     /// </summary>
     PhoneDial: 53,
 
+    /// <summary>
+    /// html 标签（支持自动换行）
+    /// </summary>
+    HtmlLabel: 54,
+
   },
 
   //返回状态码

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

@@ -37,8 +37,7 @@ import RichText from '../RichText';
 import DragSort from '../DragSort';
 import Container from '../Container';
 import Contact from '../Contact';
-import  Canlendar from '../Canlendar';
-
+import LH from '../LH';
 
 const LibFunction = {
   install(Vue) {},
@@ -254,6 +253,10 @@ const LibFunction = {
         item = L(field);
         item.is = 'ct-labelText';
         break;
+      case Enum.ControlType.HtmlLabel://html 标签（支持自动换行）
+        item = LH(field);
+        item.is = 'ct-labelHtml';
+        break;
       case Enum.ControlType.CheckBox: //复选框
         item = Cb(field);
         item.is = 'ct-cb';

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

@@ -44,6 +44,7 @@ const loader = {
   CellLayout: require("./ctl/CellLayout.js").default,
   Container: require("./ctl/Container.js").default,
   Canlendar: require("./ctl/Canlendar.js").default,
+  LH: require("./ctl/LH.js").default,
 };
 
 export default loader;