centaline-data-driven 1.1.33 → 1.1.37

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

@@ -1,10 +1,10 @@
 import base from '../../index';
-import Axios from 'axios';
 import LibFunction from './lib/LibFunction';
 import Enum from './lib/Enum';
 import Router from './Router';
 import valid from '../../../validate/index';
 import common from '../../../common';
+import formData from '../../../formData';
 import Vue from 'vue';
 
 const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
@@ -144,324 +144,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           }
         }
       },
-      formData: {
-        common: common,
-        Axios: Axios,
-        form: null,
-
-        excuteData: null,//fields
-        fieldsDic: null,//fieldsDic
-        getCode1ByField1(id) {
-          //var rtn1 = this.excuteData.find((v) => {
-          //  return v.id === arguments[0];
-          //});
-          var rtn1 = this.fieldsDic[id];
-          if (rtn1) {
-            return rtn1.value;
-          }
-        },
-        getCode2ByField1(id) {
-          var rtn1 = this.fieldsDic[id];
-          if (rtn1) {
-            return rtn1.value1;
-          }
-        },
-        /**
-       * @method
-       * @param {string} id 指定Field的fieldName1
-       * @param {string} attrKey 指定Field的属性attrKey
-       * @desc 获取指定Field的指定Field的值
-       * @returns {string} 指定Field的指定Field的值
-       */
-        getValueByFieldName(id, attrKey) {
-          attrKey = this.common.initialsToUpperCase(attrKey);
-          var rtn1 = this.fieldsDic[id];
-          if (rtn1) {
-            return rtn1.source[attrKey];
-          }
-        },
-        /**
-       * @method
-       * @param {string} id 指定Field的fieldName1
-       * @param {string} attrKey 指定Field的属性名
-       * @param {string} attrValue 需要设置的属性值
-       * @desc 设置指定Field的指定Field的值
-       * @returns {boolean} 是否成功
-       */
-        setValueByFieldName(id, attrKey, attrValue) {
-          attrKey = this.common.initialsToUpperCase(attrKey);
-          var rtn1 = this.fieldsDic[id];
-          if (rtn1) {
-            rtn1.source[attrKey] = attrValue;
-
-            this.form.hatchHandle(id, attrKey, attrValue, rtn1);
-            //this.form.hiddenHandle(rtn1);//隐藏关联的
-
-            //用于处理源数据改动,强制更新视图数据 todo
-            if (rtn1.self.$forceUpdate) {
-              rtn1.self.$forceUpdate();
-            }
-          }
-        },
-        setV1AndV2ByField1(id, code1, code2) {
-          var rtn1 = this.fieldsDic[id];
-          if (rtn1) {
-            if (typeof rtn1.value !== 'undefined') {
-              rtn1.value = code1;
-
-              this.form.validMrf(rtn1);//验证必填关联组件
-              this.form.hiddenHandle(rtn1, true);//隐藏关联的
-            }
-            if (typeof rtn1.value1 !== 'undefined') {
-              rtn1.value1 = code2;
-            }
-
-            if (rtn1.self.$forceUpdate) {
-              rtn1.self.$forceUpdate();
-            }
-          }
-        },
-
-        _excuteListData: undefined,
-        get excuteListData() {
-          if (this._excuteListData) {
-            return this._excuteListData;
-          }
-          else {
-            if (this.excuteData !== null) {
-              this._excuteListData = this.excuteData.filter((v) => {
-                return typeof v.is !== undefined && v.is === 'ct-form-list-table';
-              });
-            }
-          }
-          return this._excuteListData;
-        },
-        //获取列表的Field
-        getListField(tableName, rowNum, fiedlId) {
-          let listData = this.excuteListData.find((v) => {
-            return v.id === tableName;
-          });
-          if (listData) {
-            let field = null;
-            //正在编辑的Field
-            if (rowNum === null && (fiedlId === null || listData.currentEventField.id === fiedlId)) {
-              field = listData.currentEventField;
-            }
-            //正在编辑的行
-            else if (rowNum === null && listData.currentRowIndex === 0) {
-              let fields = listData.currentRow.data;
-              field = fields[fiedlId];
-            }
-            //源数据
-            else {
-              if (rowNum === null && listData.currentRowIndex) {
-                rowNum = listData.currentRowIndex;
-              }
-
-              if (rowNum === 0 || (rowNum && fiedlId)) {
-                try {
-                  let fields = listData.rows[rowNum].field;
-                  field = fields.find((v) => {
-                    return v.id === fiedlId;
-                  });
-                } catch (e) {
-                  if (listData.rows.length <= rowNum) {
-                    var checkMsg = "获取列表行索引超出界限";
-                    this.message(checkMsg);
-                  }
-                }
-              }
-            }
-
-            return { listData: listData, field: field };
-          }
-        },
-        /**
-         * @method
-         * @param {string} tableName 指定的表fieldName1 默认当前表
-         * @desc 获取指定列表的行数（注意 这里包括列头）
-         * @returns {number} 列表行数
-         */
-        getListCount(tableName) {
-          tableName = tableName ? tableName : this.form.scripts.$fd;
-
-          let data = this.getListField(tableName, null, null);
-
-          if (data) {
-            return data.listData.rows.length;
-          }
-        },
-
-        /**
-         * @method
-         * @param {String} tableName 表fieldName1 默认当前表
-         * @param {Number} rowNum 行号 默认当前行号（注意 这里第0行是列头）
-         * @param {String} fiedlId 列fieldName1 默认当前列fieldName1
-         * @param {String} attrName 需要获取attr，如code1,code2 默认code1
-         * @param {String} defaultValue 默认值，若该行被删除时，则直接返回这个值，可空
-         * @desc 获取指定列表中的指定Field的指定属性值
-         * @returns {String} 指定列表中的指定Field的指定属性值
-         */
-        getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue) {
-          tableName = tableName ? tableName : this.form.scripts.$fd;
-
-          let data = this.getListField(tableName, rowNum, fiedlId);
-
-          attrName = this.common.initialsToUpperCase(attrName);
-          attrName = attrName ? attrName : 'code1';
-
-          if (!fiedlId) {
-            fiedlId = data.listData.currentEventField.id;
-          }
-          if (fiedlId && rowNum === null && fiedlId === data.listData.currentEventField.id) {
-            data.field = data.listData.currentEventField;
-          }
-          rowNum = rowNum !== null ? rowNum : data.listData.currentRowIndex;
-
-          //若该行正在编辑，则取编辑状态的。
-          if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
-            && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
-            return data.listData.currentRow.data[fiedlId].source[attrName];
-          }
-          else if (data && data.field) {
-            if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
-              return defaultValue;
-            }
-            return data.field.source[attrName];
-          }
-        },
-
-        /**
-         * @method
-         * @param {String} value 设置的值
-         * @param {String} tableName 表fieldName1
-         * @param {Number} rowNum 行号 默认当前行号（注意 这里第0行是列头）
-         * @param {String} fiedlId 列fieldName1
-         * @param {String} attrName 需要改的attrName，如code1,code2
-         * @desc 设置指定列表中的指定Field的指定属性
-         * @returns {boolean} 是否成功
-         */
-        setListFieldValue(value, tableName, rowNum, fiedlId, attrName) {
-          value = value.toString();
-          tableName = tableName ? tableName : this.form.scripts.$fd;
-          let data = this.getListField(tableName, rowNum, fiedlId);
-
-          attrName = this.common.initialsToUpperCase(attrName);
-          attrName = attrName ? attrName : 'code1';
-
-          if (!fiedlId) {
-            fiedlId = data.listData.currentEventField.id;
-          }
-          if (fiedlId && !rowNum && fiedlId === data.listData.currentEventField.id) {
-            //data.field = data.listData.currentEventField;
-          }
-          rowNum = rowNum ? rowNum : data.listData.currentRowIndex;
-
-          if (data) {
-            if (data.field) {
-              data.field.source[attrName] = value;
-              data.listData.updateListField(data.listData.refFieldsLabel, rowNum, fiedlId);
-            }
-            //data.field.self.$forceUpdate();
-
-            //正在编辑的行
-            if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && data.listData.currentRow.data.$sourceIndex === rowNum) {
-              let currentField = data.listData.currentRow.data[fiedlId];
-              currentField.source[attrName] = value;
-              //校验自己
-              if (currentField.self && currentField.self.validExcute) {
-                currentField.self.validExcute();
-              }
-              if (typeof currentField.self.$forceUpdate === "function") {
-                currentField.self.$forceUpdate();
-              }
-            }
-
-            //如果有汇总列，触发重新计算汇总
-            if (data.listData.showSummary) {
-              data.listData.tableData.push({});
-              data.listData.tableData.pop();
-            }
-
-            return true;
-          }
-          return false;
-        },
-
-        setListAttr(tableId, attrName, attrValue) {
-          let listData = this.excuteListData.find((v) => {
-            return v.id === tableId;
-          });
-          listData[attrName] = attrValue
-
-        },
-
-        /**
-         * @method
-         * @param {String} action action。
-         * @param {Object} object 传到后台的数据。
-         * @param {Function} successCallback 成功后的回调，只有请求成功且response.ClientAction==1时才执行。
-         * @desc 获取后台数据，并返回脚本。
-         */
-        execServerScript(action, object, successCallback) {
-          let formData = this;//作用域保存
-
-          //是否是行内触发的
-          let data = this.getListField(this.form.scripts.$fd, null, null);
-          object.editMode = data ? 1 : 0;
-
-          Vue.prototype.$api.postHandler(this.common.globalUri(), { action: action, para: object }).then(
-            function (response) {
-              if (response.rtnCode === Enum.ReturnCode.Successful) {
-                var data = response.content;
-                if (response.clientActionType === Enum.ClientActionType.ExcuteScript && data) {
-                  formData.common.excute.call(formData.form.scripts, data);
-                }
-                else
-                  if (response.clientActionType === Enum.ClientActionType.None && data && successCallback) {
-                    //因为要传参，并直接执行方法，故successCallback回调里要使用formData的话，要加this
-                    //若不能接受this，也可修改common.excute方法
-                    //successCallback.call(formData.form.scripts, data);
-
-                    //优化，不需要加this
-                    formData.common.excuteFun.call(formData.form.scripts, successCallback, data);
-                  }
-              }
-            }
-          );
-        },
-
-        /**
-         * @method
-         * @param {string} message 消息文字。
-         * @param {string} type 主题:success/warning/info/error。
-         * @param {boolean} center 是否居中。
-         * @param {number} duration 显示时间, 毫秒。设为 0 则不会自动关闭。
-         * @param {boolean} showClose 是否显示关闭按钮。
-         * @param {boolean} dangerouslyUseHTMLString 是否将message作为html处理。
-         * @desc 消息提示。常用于主动操作后的反馈提示。
-         */
-        message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
-          if (typeof center === 'undefined') {
-            center = true;
-          }
-          if (typeof duration === 'undefined') {
-            duration = 1500;
-          }
-          if (typeof showClose === 'undefined') {
-            showClose = false;
-          }
-
-          Vue.prototype.$message({
-            message: message,//消息文字
-            dangerouslyUseHTMLString: dangerouslyUseHTMLString || false,
-            type: type || 'error',//主题:success/warning/info/error
-            center: center,//是否居中
-            duration: duration, //显示时间, 毫秒。设为 0 则不会自动关闭
-            showClose: showClose,//是否显示关闭按钮
-          });
-        }
-      },
+      formData:formData,
       getFormObj() {
         var rtnFormObj = {};
         rtn.fields.forEach((f) => {

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

@@ -3,6 +3,7 @@ import common from '../../../common';
 import Router from './Router';
 import Vue from 'vue';
 import Enum from './lib/Enum';
+import formData from '../../../formData';
 const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSearchData) {
   var init = function (source) {
     var rtn = {
@@ -725,7 +726,24 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
           }
         });
-      }
+      },
+      _scripts: null,
+      get scripts() {
+        if (rtn._scripts !== null) {
+          return rtn._scripts;
+        }
+        else {
+          if (typeof source.scripts !== 'undefined') {
+            rtn._scripts = base.common.eval(source.scripts);
+            return rtn._scripts;
+          }
+          else{
+            rtn._scripts={};
+            return rtn._scripts;
+          }
+        }
+      },
+      formData:formData,
     };
     if (rtn.template) {
       var tempLoader = template.loader(rtn.template).default;

package/src/centaline/validate/index.js

@@ -62,7 +62,15 @@ const actions = {
     }
   },
   number(v, o) {
-    var reg = /^[0-9]+$|^[0-9]+\.[0-9]*$|^[0-9]{1,3}([,'][0-9]{3})+$|^[0-9]{1,3}([,'][0-9]{3})+\.[0-9]*$/;
+    // var reg = /^[0-9]+$|^[0-9]+\.[0-9]*$|^[0-9]{1,3}([,'][0-9]{3})+$|^[0-9]{1,3}([,'][0-9]{3})+\.[0-9]*$/;
+    var reg = '';
+    let dc = v.decimals;
+    if (dc == undefined || dc == "" || dc === "0") {
+      reg = /^(\-)?\d*$/;
+    }
+    else{
+      reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
+    }
     if (v.value === '') {
       return true;
     } else if (reg.test(v.value)) {
@@ -87,7 +95,15 @@ const actions = {
     }
   },
   numberArea(v, o, o1) {
-    var reg = /^[0-9]+$|^[0-9]+\.[0-9]*$|^[0-9]{1,3}([,'][0-9]{3})+$|^[0-9]{1,3}([,'][0-9]{3})+\.[0-9]*$/;
+    // var reg = /^[0-9]+$|^[0-9]+\.[0-9]*$|^[0-9]{1,3}([,'][0-9]{3})+$|^[0-9]{1,3}([,'][0-9]{3})+\.[0-9]*$/;
+    var reg = '';
+    let dc = v.decimals;
+    if (dc == undefined || dc == "" || dc === "0") {
+      reg = /^(\-)?\d*$/;
+    }
+    else{
+      reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
+    }    
     if (v.value === '' && v.value1 === '') {
       return true;
     } else if ((v.value === '' || reg.test(v.value)) && (v.value1 === '' || reg.test(v.value1))) {
@@ -172,7 +188,6 @@ const valid = {
           switch (model.type) {
             case Enum.ControlType.NumericTextBox:
               rtnValidate.push(valid.number);
-              //rtnValidate.push(valid.numberDecimal);
               break;
             case Enum.ControlType.NumericRange:
               rtnValidate.push(valid.numberArea);
@@ -219,7 +234,6 @@ const valid = {
         switch (model.type) {
           case Enum.ControlType.NumericTextBox:
             rtnValidate.push(valid.number);
-            //rtnValidate.push(valid.numberDecimal);
             break;
           case Enum.ControlType.NumericRange:
             rtnValidate.push(valid.numberArea);

package/src/main.js

@@ -20,6 +20,12 @@ Vue.use(centaline, {
     openTab: function (action) {
       alert("打开tab页:" + action)
     },
+    openDetail: function (action) {
+      alert("打开tab页:" + action)
+    },
+    openPropertyDetailRET: function (submitData, pageTitle, parentModel) {
+      alert("打开tab页:" + pageTitle)
+    },
     // 关闭当前tab
     closeTab: function () {
       alert("关闭当前tab")
@@ -27,7 +33,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'd09609ec-e13a-4b97-8c15-e003b1c36cbc',
+        oldToken: '2db49cf6-0026-428b-9167-4273376a076f',
         estateId: '20210729104021C49F04B55C50F6AF58',
       };
     },