centaline-data-driven 1.1.16 → 1.1.20

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

@@ -7,55 +7,55 @@ const box = function (source, callBack) {
   var self = this;
   var init = function (data) {
     var rtn = {
-      get options() {
-        return source.selectItems1;
-      },
+      get options() {
+        return source.selectItems1;
+      },
       checkedIsInit: false,
       get checkedItemArr() {
         if (this._checkedItemArr === null) {
           return this._checkedItemArr;
         }
         else {
-          this._checkedItemArr = this.getCheckedItemArr();
+          this._checkedItemArr = this.getCheckedItemArr();
           //return this._checkedItemArr;
           return this._checkedItemArr;
         }
-      },
-      getCheckedItemArr() {
-        var itemArr = [];
-        var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
-        checked.forEach((v) => {
-          if (v[this.optionAttrs.value]) {
+      },
+      getCheckedItemArr() {
+        var itemArr = [];
+        var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
+        checked.forEach((v) => {
+          if (v[this.optionAttrs.value]) {
             if (!v[this.optionAttrs.flagDeleted]) {
-              itemArr.push(v[this.optionAttrs.value]);
-            }
+              itemArr.push(v[this.optionAttrs.value]);
+            }
           }
-        });
-        return itemArr;
-      },
-      //checkedItemArr1:[],
+        });
+        return itemArr;
+      },
+      //checkedItemArr1:[],
       //手动维护code1值
-      updateCode1() {
-        let self = this;
+      updateCode1() {
+        let self = this;
         var currentOptions = this.options.filter((value) => {
           return self.checkedItemArr.indexOf(value[self.optionAttrs.value]) >= 0;
-        });
-
-        if (source.code1 !== '') {
-          var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
-          checked.forEach((v) => {
-            if (self.checkedItemArr.indexOf(v[this.optionAttrs.value]) > -1) {
+        });
+
+        if (source.code1 !== '') {
+          var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
+          checked.forEach((v) => {
+            if (self.checkedItemArr.indexOf(v[this.optionAttrs.value]) > -1) {
               v[this.optionAttrs.flagDeleted] = false;
-              currentOptions.splice(currentOptions.findIndex((op) => { return op[rtn.optionAttrs.value] === v[rtn.optionAttrs.value] }), 1);
-            }
-            else {
-              v[this.optionAttrs.flagDeleted] = true;
-            }
-          });
-
-          checked = checked.concat(currentOptions);
-          source.code1 = JSON.stringify(checked);
-        }
+              currentOptions.splice(currentOptions.findIndex((op) => { return op[rtn.optionAttrs.value] === v[rtn.optionAttrs.value] }), 1);
+            }
+            else {
+              v[this.optionAttrs.flagDeleted] = true;
+            }
+          });
+
+          checked = checked.concat(currentOptions);
+          source.code1 = JSON.stringify(checked);
+        }
         else {
           if (self.checkedItemArr.length === 0) {
             source.code1 = '';
@@ -66,23 +66,23 @@ const box = function (source, callBack) {
         }
       },
       reset() {
-        this.value = this.defaultValue;
+        this.value = this.defaultValue;
         this.forceUpdate();
       },
       optionAttrs: {
         value: 'code',
-        label: 'name',
-        actionType: 'actionType',
+        label: 'name',
+        actionType: 'actionType',
         flagDeleted: 'flagDeleted'
-      },
-      //用于处理源数据改动,强制更新视图数据(一些无法直接映射的源数据)
-      forceUpdate() {
-        var self = this;
-        Vue.set(self, "checkedItemArr", self.getCheckedItemArr());
-        Vue.set(self, "options", source.selectItems1);
-        if (this.self.$forceUpdate) {
-          this.self.$forceUpdate();
-        }
+      },
+      //用于处理源数据改动,强制更新视图数据(一些无法直接映射的源数据)
+      forceUpdate() {
+        var self = this;
+        Vue.set(self, "checkedItemArr", self.getCheckedItemArr());
+        Vue.set(self, "options", source.selectItems1);
+        if (this.self.$forceUpdate) {
+          this.self.$forceUpdate();
+        }
       }
     };
     rtn = base.copy(Base(data), rtn);

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

@@ -276,7 +276,7 @@ const FormList = function (source, master) {
       return isDuplicated;
     },
     deleteRow(index, callback) {
-      Vue.prototype.$confirm("确定删除？", "提示", {
+      Vue.prototype.$common.confirm("确定删除？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         //type: 'warning'

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

@@ -9,7 +9,8 @@ const box = function (source, callBack) {
     var rtn = {
 
       get clearable() {
-        if (typeof source.clear === 'undefined') {
+        
+        if (typeof source.clear === 'undefined'&&!source.locked) {
           return true;
         }
         if (source.clear) {

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

@@ -5,7 +5,7 @@ const Iti = function (source) {
   var rtn = {
 
     get clearable() {
-      if (typeof source.clear === 'undefined') {
+      if (typeof source.clear === 'undefined'&&!source.locked) {
         return true;
       }
       if (source.clear) {

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

@@ -3,7 +3,7 @@ import common from '../../../common';
 import Enum from './lib/Enum';
 const Router = function (source) {
   var rtn = {
-    disabled: false,
+    disabled: source.selectedMode && source.selectedMode === Enum.ListSelectMode.Multiple ? true : false,
     get id() {
       return source.key;
     },

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

@@ -13,6 +13,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       defaultSearchData: defaultSearchData,
       pageIndex: 1,
       selectIndex: 0,
+      selectAll: 0,
       get source() {
         return source;
       },
@@ -191,7 +192,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
 
             self._columnsArr.push(arr);
-          }
+          }
           return self._columnsArr;
         }
       },
@@ -348,6 +349,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         this.apiData(callback);
         this.selectIndex = 0;
         this._lastRowspan = null;
+        if (index === 1) {
+          this.setButtonsDisabled();
+          this.selectAll = 0;
+        }
       },
       nextPage: function (callback) {
         if (this.flagMoreData && this.flagMoreData !== false) {
@@ -691,6 +696,20 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           rtn = true;
         }
         return rtn;
+      },
+      //设置多选按钮是否禁用
+      setButtonsDisabled() {
+        var selectData = rtn.getSelectRowData({ isMulti: 1 });
+        rtn._buttons.forEach((v) => {
+          if (v.isMulti) {
+            if (selectData != null && selectData.length > 0) {
+              v.disabled = false;
+            }
+            else {
+              v.disabled = true;
+            }
+          }
+        });
       }
     };
     if (rtn.template) {

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

@@ -9,19 +9,13 @@ const So = function (source, moreActionRouter) {
     options: [{ code: source.code1, name: source.name1 }],
     get text() {
       
-      if (source.isList && (source.name1||source.displayName1) && rtn.attrs.placeholder) {
-        return rtn.attrs.placeholder + ":" +  (source.displayName1||source.name1);
+      if (source.isList && source.name1 && rtn.attrs.placeholder) {
+        return rtn.attrs.placeholder + ":" + source.name1;
       }
-      return source.displayName1||source.name1;
+      return source.name1;
     },
     set text(v) {
-      if(source.displayName1)
-      {
-        source.displayName1 = v;
-      }else
-      {
         source.name1 = v;
-      }
     },
     get optionColCount() {
       return parseInt(source.optCount) || 5;

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

@@ -8,10 +8,10 @@ const Sos = function (source, moreActionRouter) {
   var rtn = {
     options: [{ code: source.code1, name: source.name1 }],
     get text() {
-      if (source.isList && (source.name1||source.displayName1) && rtn.attrs.placeholder) {
-        return rtn.attrs.placeholder + ":" + (source.displayName1||source.name1);
+      if (source.isList && source.name1 && rtn.attrs.placeholder) {
+        return rtn.attrs.placeholder + ":" + source.name1;
       }
-      return source.displayName1||source.name1;
+      return source.name1;
     },
     set text(v) {
       if(source.displayName1)

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

@@ -8,7 +8,7 @@ const T = function (source, inputType, readonly, isPassword) {
     //   clearable: true,
     // },
     get clearable() {
-      if (typeof source.clear === 'undefined'&&!readonly) {
+      if (typeof source.clear === 'undefined'&&!readonly&&!source.locked) {
         return true;
       }
       if (source.clear) {

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

@@ -2,10 +2,9 @@ import base from '../../index';
 import Base from './Base';
 import valid from '../../../validate/index';
 import Axios from 'axios';
+import common from '../../../common';
 
-const box = function (source, isRange, dateType) {
-  if (source.code1) source.code1 = new Date('2010-08-01 ' + source.code1);
-  if (source.code2) source.code2 = new Date('2010-08-01 ' + source.code2);
+const TimeSelect = function (source, isRange, dateType) {
   var init = function (data) {
     var rtn = {
       isRange: isRange,//是否是区间
@@ -24,15 +23,19 @@ const box = function (source, isRange, dateType) {
         source.valueFormat = v;
       },
       get value() {
+        if (source.code1 && Object.prototype.toString.call(source.code1) === "[object String]") source.code1 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code1);
         return source.code1;
       },
       set value(v) {
+        if (v && Object.prototype.toString.call(v) === "[object Date]") v = common.formatDate(v, rtn.valueFormat);
         source.code1 = v;
       },
       get value1() {
+        if (source.code2 && Object.prototype.toString.call(source.code2) === "[object String]") source.code2 = new Date(common.formatDate(new Date(), 'yyyy-MM-dd') + ' ' + source.code2);
         return source.code2;
       },
       set value1(v) {
+        if (v && Object.prototype.toString.call(v) === "[object Date]") v = common.formatDate(v, rtn.valueFormat);
         source.code2 = v;
       },
       get attrs() {
@@ -54,4 +57,4 @@ const box = function (source, isRange, dateType) {
     return init(source);
   }
 }
-export default box;
+export default TimeSelect;

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

@@ -63,8 +63,8 @@ const LibFunction = {
       else if (field.controlType === Enum.ControlType.DateTimeRange) {
         field.width = field.width || 350;
       }
-      else if (field.controlType === Enum.ControlType.ButtonSearch ||
-        field.controlType === Enum.ControlType.ButtonReset ||
+      else if (field.controlType === Enum.ControlType.ButtonSearch ||
+        field.controlType === Enum.ControlType.ButtonReset ||
         field.controlType === Enum.ControlType.ButtonAdvancedSearch) {
         field.width = '';
       }
@@ -149,12 +149,8 @@ const LibFunction = {
       //  item.is = 'ct-time-select';
       //  break;
       case Enum.ControlType.TimeRange://时间区间
-        //item = TimeSelect(field, true, 'time');
-        //item.is = 'ct-time-select';
-        //break;
-        item = L(field);
-        item.is = 'ct-labelText';
-        item.value = "暂不支持该组件";
+        item = TimeSelect(field, true, 'time');
+        item.is = 'ct-time-select';
         break;
       case Enum.ControlType.Date://日期
         item = D(field, 'date');
@@ -237,7 +233,18 @@ const LibFunction = {
         var router = source.actionRouters.find((v1) => {
           return v1.key === field.fieldName1;
         });
-        item = File(field, source.medias, router, source.parameterAction);
+        var files = [];
+        source.medias.forEach((v, index) => {
+          if (v.GroupID) {
+            if (v.GroupID == field.fieldName1) {
+              files.push(v);
+            }
+          }
+          else {
+            files.push(v);
+          }
+        })
+        item = File(field, files, router, source.parameterAction);
         item.is = 'ct-file';
         break;
       case Enum.ControlType.PasswordTextBox://密码

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

@@ -22,7 +22,8 @@ const loader = {
   Form: require("./ctl/Form.js").default,
   Router: require("./ctl/Router.js").default,
   Tabs: require("./ctl/Tabs.js").default,
-  ComboBoxWithTextBox: require("./ctl/ComboBoxWithTextBox.js").default
+  ComboBoxWithTextBox: require("./ctl/ComboBoxWithTextBox.js").default,
+  Checkbox: require("./ctl/Checkbox.js").default
 };
 
 export default loader;

package/src/centaline/selectOption/src/selectOption.vue

@@ -6,7 +6,8 @@
           <el-tag v-if="typeof model.options[(n-1)*model.optionColCount + (m-1)] !== 'undefined'"
                   class="ct-option" @click.native="$emit('click',model.options[(n-1)*model.optionColCount + (m-1)][model.optionAttrs.value])"
                   :type="getOptionSelect(model.options[(n-1)*model.optionColCount + (m-1)][model.optionAttrs.value])">
-            {{model.options[(n-1)*model.optionColCount + (m-1)][model.optionAttrs.label]}}
+
+            {{getLabel(n,m)}}
           </el-tag>
         </td>
       </tr>
@@ -30,6 +31,13 @@
       }
     },
     methods: {
+      getLabel(n,m){
+         if(this.model.options[(n-1)*this.model.optionColCount + (m-1)][this.model.optionAttrs.displayLabel])
+        {
+          return this.model.options[(n-1)*this.model.optionColCount + (m-1)][this.model.optionAttrs.displayLabel];
+        }
+        return this.model.options[(n-1)*this.model.optionColCount + (m-1)][this.model.optionAttrs.label];
+      },
       getOptionSelect(value) {
         if (typeof this.model.value === 'object') {
           if (this.model.value.indexOf(value) >= 0) {

package/src/centaline/selectOption/src/selectOptionVertical.vue

@@ -2,7 +2,7 @@
   <div class="ct-selectOptionVertical" style="">
     <ul>
       <li v-for="op in model.options" :class="[getOptionSelect(op[model.optionAttrs.value])?'select':'']" @click="selectOption(op[model.optionAttrs.value])">
-        <span>{{op[model.optionAttrs.label]}}</span>
+        <span>{{op[model.optionAttrs.displayLabel]||op[model.optionAttrs.label]}}</span>
       </li>
     </ul>
   </div>

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

@@ -1,6 +1,6 @@
 <template>
   <div align="center" :class="isOperationalColumn?'subdiv_allinline':''">
-    <img v-if="router.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="label" @click="clickHandler($event);" />
+    <img v-if="router.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label" @click="clickHandler($event);" />
     <a v-else href="javascript:void(0);" class="ct-tablecurrencyA ct-tablecurrencyItem" @click="clickHandler($event)">
       {{label}}
     </a>

package/src/main.js

@@ -27,7 +27,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'f6dec7b1-c059-4587-b655-c44c518f449a',
+        oldToken: 'c91e71d3-1bec-4258-8028-5f720a4896bf',
         estateId: '20210729104021C49F04B55C50F6AF58',
       };
     },