centaline-data-driven 1.1.17 → 1.1.22

package/src/centaline/imgPreview/index.js

@@ -1,15 +1,15 @@
 import imgPreview from './src/imgPreview.vue'
 
 imgPreview.install = function (Vue) {
-  Vue.component(imgPreview.name, imgPreview);
+  Vue.component(imgPreview.name, imgPreview);
   //import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-  //Vue.component("ElImageViewer", ElImageViewer);
+  //Vue.component("ElImageViewer", ElImageViewer);
 
   const PreviewConstructor = Vue.extend(imgPreview);
   const instance = new PreviewConstructor();
-  instance.$mount(document.createElement("div"));
+  instance.$mount(document.createElement("div"));
   setTimeout(function () {
-    document.body.appendChild(instance.$el);
+    document.body.appendChild(instance.$el);
   }, 1000);
 
 
@@ -24,8 +24,8 @@ imgPreview.install = function (Vue) {
 }
 
 if (typeof window !== 'undefined' && window.Vue) {
-  window.Vue.use(imgPreview);
-
+  window.Vue.use(imgPreview);
+
   const PreviewConstructor = Vue.extend(imgPreview);
   const instance = new PreviewConstructor();
   instance.$mount(document.createElement("div"));

package/src/centaline/imgPreview/src/imgPreview.vue

@@ -3,9 +3,9 @@
                    :urlList="previewImages"
                    :on-close="closeViewer"></el-image-viewer>
 </template>
-<script>
+<script>
   //该组件打包被排除（会导致包大很多），不排除的话无法使用，todo待更新
-  //import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+  //import ElImageViewer from "element-ui/packages/image/src/image-viewer";
   export default {
     name: 'ctImgPreview',
     data() {
@@ -23,4 +23,4 @@
       }
     }
   };
-</script>
+</script>

package/src/centaline/index.js

@@ -1,30 +1,30 @@
 const paths = require('../../build/centaline/centaline.path').default;
 //import './css/common.css'
 import babelpolyfill from 'babel-polyfill'
-
+
 let defaultInstallOpt = {
   baseUrl: '',
-  zIndex: 2000,
+  zIndex: 2000,
   showRequestErrorMessage: true,
-  handler: {
+  handler: {
     // 打开tab页
     openTab: function (action, submitData, pageTitle) {
       
-    },
+    },
     // 关闭当前tab页
     closeTab: function () {
 
-    },
-    // 获取请求头
-    getRequestHeaders: function () {
-      return {};
-    },
-    // 请求完成事件，可判断是否登录过期执行响应操作
-    requestComplete: function (response) {
-      
+    },
+    // 获取请求头
+    getRequestHeaders: function () {
+      return {};
+    },
+    // 请求完成事件，可判断是否登录过期执行响应操作
+    requestComplete: function (response) {
+      
     }
   }
-}
+}
 
 const centaline = {
   install(Vue, opts = {}) {
@@ -37,7 +37,7 @@ const centaline = {
       var plug = require("./" + plugName + "/index.js").default;
       Vue.use(plug);
     }
-
+
     opts.handler = Object.assign(defaultInstallOpt.handler, opts.handler)
     const option = Object.assign(defaultInstallOpt, opts)
     Vue.prototype.$dataDrivenOpts = option

package/src/centaline/loader/index.js

@@ -42,8 +42,8 @@ var loader = {
             delete rtn[k];
             rtn[k] = args[i][k];
             this.arrayVariation(rtn, args[i], k);
-          }
-          else if (args[i][k] instanceof Date) {
+          }
+          else if (args[i][k] instanceof Date) {
             this.dep(rtn, args[i], k);
           }
           else {
@@ -94,9 +94,9 @@ var loader = {
    * @param {Object} tempData 临时存储的监听对象
    * @desc 根据key值，将合并对象与源数据的对象属性绑定监听
    */
-  depObj: function (obj, source, key, tempData) {
-    if (key == 'timeValue') {
-      debugger
+  depObj: function (obj, source, key, tempData) {
+    if (key == 'timeValue') {
+      debugger
 
     }
     var property = Object.getOwnPropertyDescriptor(source, key);

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

@@ -14,10 +14,10 @@ const Button = function (source, router) {
     set label(v) {
       source.controlLabel = v;
     },
-    get isHyperLink() {
+    get isHyperLink() {
       if (router) {
-        return router.isHyperLink;
-      }
+        return router.isHyperLink;
+      }
       return false;
     },
   };

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/ComboBoxWithTextBox.js

@@ -3,7 +3,7 @@ import Base from './Base';
 import valid from '../../../validate/index';
 import common from '../../../common';
 import Vue from 'vue';
-const cbwt = function (source) {
+const cbwt = function (source) {
   var rtn = {
     options: [{ code: source.code1, name: source.name1 }],
     options1: [{ code: source.code2, name: source.name2 }],
@@ -95,7 +95,7 @@ const cbwt = function (source) {
         action: apiAddrs,
         para: {
           paramName: self['paramName' + numStr],
-          parentValue: parentValue,
+          parentValue: parentValue,
           extraData: rtn.getFormRefFieldPara()
         }
       };
@@ -105,11 +105,11 @@ const cbwt = function (source) {
         }
       });
     },
-    getFormRefFieldPara() {
-      if (rtn.form && typeof source.refFieldName !== 'undefined' && source.refFieldName.length > 0) {
-        if (typeof rtn.form.getRefFieldPara === 'function') {
-          return JSON.stringify(rtn.form.getRefFieldPara(source.refFieldName));
-        }
+    getFormRefFieldPara() {
+      if (rtn.form && typeof source.refFieldName !== 'undefined' && source.refFieldName.length > 0) {
+        if (typeof rtn.form.getRefFieldPara === 'function') {
+          return JSON.stringify(rtn.form.getRefFieldPara(source.refFieldName));
+        }
       }
       return null;
     },
@@ -121,21 +121,21 @@ const cbwt = function (source) {
         },
         enumerable: true,
         configurable: true
-      });
+      });
       Object.defineProperty(rtnFormObj, source.fieldName2, {
         get: function () {
           return source.code2;
         },
         enumerable: true,
         configurable: true
-      });
+      });
       Object.defineProperty(rtnFormObj, source.fieldName3, {
         get: function () {
           return source.code3;
         },
         enumerable: true,
         configurable: true
-      });
+      });
       Object.defineProperty(rtnFormObj, source.fieldName4, {
         get: function () {
           return source.code4;
@@ -160,7 +160,7 @@ const cbwt = function (source) {
     attrs: {
       clearable: true
     },
-  };
+  };
   var baseSource = Base(source);
   //rtn.attrs = base.copy(baseSource.attrs, rtn.attrs);
   rtn = base.copy(baseSource, rtn);

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

@@ -12,9 +12,9 @@ const D = function (source, dateType) {
         if (typeof source.valueFormat !== 'undefined') {
           return source.valueFormat;
         }
-        else {
+        else {
           if (dateType === "datetime") {
-            return 'yyyy-MM-dd HH:mm:ss'
+            return 'yyyy-MM-dd HH:mm:ss'
           }
           return 'yyyy-MM-dd'
         }

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

@@ -6,9 +6,9 @@ import Vue from 'vue';
 import common from '../../../common';
 
 const Dtd = function (source, dateType) {
-  var self = this;
-  if (!dateType) {
-    dateType = "date";
+  var self = this;
+  if (!dateType) {
+    dateType = "date";
   }
   var init = function (data) {
     var rtn = {
@@ -16,9 +16,9 @@ const Dtd = function (source, dateType) {
         if (typeof source.valueFormat !== 'undefined') {
           return source.valueFormat;
         }
-        else {
+        else {
           if (dateType === "datetime") {
-            return 'yyyy-MM-dd HH:mm:ss'
+            return 'yyyy-MM-dd HH:mm:ss'
           }
           return 'yyyy-MM-dd'
         }
@@ -42,21 +42,21 @@ const Dtd = function (source, dateType) {
       get value() {
         return source.code1;
       },
-      set value(v) {
-        if (!v) {
-          source.code1 = "";
-          return;
-        }
+      set value(v) {
+        if (!v) {
+          source.code1 = "";
+          return;
+        }
         source.code1 = common.formatDate(v, rtn.valueFormat);
       },
       get value1() {
         return source.code2;
       },
-      set value1(v) {
-        if (!v) {
-          source.code2 = "";
-          return;
-        }
+      set value1(v) {
+        if (!v) {
+          source.code2 = "";
+          return;
+        }
         source.code2 = common.formatDate(v, rtn.valueFormat);
       },
       get id1() {
@@ -68,7 +68,7 @@ const Dtd = function (source, dateType) {
         source.code1 = this.formatValue[0];
         source.code2 = this.formatValue[1];
       },
-      getFormObj() {
+      getFormObj() {
         var rtnFormObj = {};
         Object.defineProperty(rtnFormObj, source.fieldName1, {
           get: function () {
@@ -89,8 +89,8 @@ const Dtd = function (source, dateType) {
       attrs: {
         type: dateType,
         'unlink-panels': true,
-        get format() {
-          return rtn.valueFormat;
+        get format() {
+          return rtn.valueFormat;
         },
         //'value-format': 'yyyy-MM-dd',
         align: 'left'

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

@@ -5,9 +5,9 @@ import Axios from 'axios';
 import Vue from 'vue';
 
 const Dtd = function (source, dateType) {
-  var self = this;
-  if (!dateType) {
-    dateType = "daterange";
+  var self = this;
+  if (!dateType) {
+    dateType = "daterange";
   }
   var init = function (data) {
     var rtn = {
@@ -37,11 +37,11 @@ const Dtd = function (source, dateType) {
       get placeholder1() {
         return source.placeholder2 || '';
       },
-      setFormatValue(v1) {//上面的set formatValue(v1)无法自动触发(无法监听数组)
-        let dateFormat = "yyyy-MM-dd";
-        if (dateType === "datetimerange") {
-          dateFormat = 'yyyy-MM-dd HH:mm:ss';
-        }
+      setFormatValue(v1) {//上面的set formatValue(v1)无法自动触发(无法监听数组)
+        let dateFormat = "yyyy-MM-dd";
+        if (dateType === "datetimerange") {
+          dateFormat = 'yyyy-MM-dd HH:mm:ss';
+        }
 
         if (v1 && v1.length > 0) {
           source.code1 = v1[0] && v1[0] instanceof Date ? Vue.prototype.$common.formatDate(v1[0], dateFormat) : "";

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

@@ -237,7 +237,7 @@ const box = function (source, fileSourceList, router, optionApi) {
           Vue.prototype.$message.error(res.rtnMsg);
         }
       },
-      deleteFile(file, forceDelete) {
+      deleteFile(file, forceDelete) {
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {

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

@@ -19,7 +19,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       },
       set title(v) {
         source.formTitle = v;
-      },
+      },
       isChanged: false,
       get isHorizontalLayout() {
         return source.layoutOrientation === Enum.Orientation.Horizontal
@@ -51,12 +51,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         rtn._fields = [];
         for (var key in source.fields) {
           let value = source.fields[key];
-
-          let showLabel = true;
-          let isList = false;
-          if (isFormList) {
-            showLabel = false;
-            isList = true;
+
+          let showLabel = true;
+          let isList = false;
+          if (isFormList) {
+            showLabel = false;
+            isList = true;
           }
           let item = LibFunction.GetControl(value, source, showLabel, isList);
 
@@ -242,6 +242,10 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             }
             //源数据
             else {
+              if (rowNum === null && listData.currentRowIndex) {
+                rowNum = listData.currentRowIndex;
+              }
+
               if (rowNum === 0 || (rowNum && fiedlId)) {
                 let fields = listData.rows[rowNum].field;
                 field = fields.find((v) => {

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/HyperLink.js

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const HyperLink = function (source) {
   var rtn = {

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/PlaceHolder.js

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

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

@@ -100,11 +100,11 @@ const SearchScreen = function (source, callBack, screenPara) {
         rtnscreens = this.initScreen(screens);
         this._highScreen = rtnscreens;
         return rtnscreens;
-      },
-      setBtnLoading(loading) {
-        this.btnScreen.forEach(btn => {
-          btn.disabled = loading;
-        });
+      },
+      setBtnLoading(loading) {
+        this.btnScreen.forEach(btn => {
+          btn.disabled = loading;
+        });
       },
       get searchData() {
         var rtn = {

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

@@ -12,7 +12,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       tableHeight: 350,
       defaultSearchData: defaultSearchData,
       pageIndex: 1,
-      selectIndex: 0,
+      selectIndex: 0,
+      selectAll: 0,
       get source() {
         return source;
       },
@@ -348,7 +349,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         this.apiData(callback);
         this.selectIndex = 0;
         this._lastRowspan = null;
-        if (index === 1) this.setButtonsDisabled();
+        if (index === 1) {
+          this.setButtonsDisabled();
+          this.selectAll = 0;
+        }
       },
       nextPage: function (callback) {
         if (this.flagMoreData && this.flagMoreData !== false) {

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,//是否是区间
@@ -22,17 +21,21 @@ const box = function (source, isRange, dateType) {
       },
       set valueFormat(v) {
         source.valueFormat = v;
-      },
-      get value() {
+      },
+      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) {
+      set value(v) {
+        if (v && Object.prototype.toString.call(v) === "[object Date]") v = common.formatDate(v, rtn.valueFormat);
         source.code1 = v;
       },
-      get value1() {
+      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) {
+      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;