centaline-data-driven-v3 0.0.56 → 0.0.57

package/src/loader/src/DatePicker.js

@@ -9,11 +9,19 @@ const DatePicker = function (source) {
             if (source.controlType == Enum.ControlType.DateTime || source.controlType == Enum.ControlType.DateTimeRange || this.flagtime) {
                 return 'yyyy-MM-dd HH:mm:ss'
             }
+            else if(source.controlType == Enum.ControlType.DateYearMonth  
+              || source.controlType == Enum.ControlType.MonthRange){
+              return 'yyyy-MM'
+            }
             return 'yyyy-MM-dd'
         },
         //APP格式
         get valueFormatAPP() {
-            return ['year', 'month', 'day']
+          if(source.controlType == Enum.ControlType.DateYearMonth  
+            || source.controlType == Enum.ControlType.MonthRange){              
+            return ['year', 'month']
+          }
+          return ['year', 'month', 'day']
         },
         //是否时间
         get flagtime() {
@@ -24,20 +32,25 @@ const DatePicker = function (source) {
         },
         //是否区间
         get flagrange() {
-            if (source.controlType == Enum.ControlType.DateRange || source.controlType == Enum.ControlType.DateTimeRange || source.controlType == Enum.ControlType.TimeRange) {
+            if (source.controlType == Enum.ControlType.DateRange 
+              || source.controlType == Enum.ControlType.DateTimeRange 
+              || source.controlType == Enum.ControlType.MonthRange 
+              || source.controlType == Enum.ControlType.TimeRange) {
                 return true
             }
             return false
         },
         //控件类型
         get dateType() {
-            if (source.controlType == Enum.ControlType.DateTime || source.controlType == Enum.ControlType.DateTimeRange) {
+            if (source.controlType == Enum.ControlType.DateTime 
+              || source.controlType == Enum.ControlType.DateTimeRange) {
                 return 'datetime'
             }
             else if (this.flagtime) {
                 return 'time'
             }
-            else if (source.controlType == Enum.ControlType.DateYearMonth) {
+            else if (source.controlType == Enum.ControlType.DateYearMonth 
+              || source.controlType == Enum.ControlType.MonthRange) {
                 return 'month'
             }
             return 'date'

package/src/loader/src/Field.js

@@ -26,8 +26,8 @@ const Base = function (source, moreActionRouter) {
             if (source.labelDelimiter) {
                 l = l + source.labelDelimiter;
             }
-            if(common.flagApp()){
-                l=l.trim();
+            if (common.flagApp()) {
+                l = l.trim();
             }
             return l;
         },
@@ -235,7 +235,7 @@ const Base = function (source, moreActionRouter) {
         },
         //允许的文件类型（针对上传控件）
         get fileAccept1() {
-            return source.fileAccept1||'';
+            return source.fileAccept1 || '';
         },
         set fileAccept1(v) {
             source.fileAccept1 = v;
@@ -724,8 +724,8 @@ const Base = function (source, moreActionRouter) {
         set lineFeed(v) {
             source.lineFeed = v;
         },
-         // 主要给 表单分组控件使用 控制分组里面的内容是否使用 懒加载
-         get lazyLoad() {
+        // 主要给 表单分组控件使用 控制分组里面的内容是否使用 懒加载
+        get lazyLoad() {
             if (typeof source.lazyLoad !== "undefined") {
                 return source.lazyLoad;
             }
@@ -831,28 +831,30 @@ const Base = function (source, moreActionRouter) {
                     }
 
                 }
-                this.code1 = this.defaultCode1;
-                this.code2 = this.defaultCode2;
-                this.name1 = this.defaultName1;
+                this.code1 = this.defaultCode1 || '';
+                this.code2 = this.defaultCode2 || '';
+                this.name1 = this.defaultName1 || '';
 
             }
             else {
-                if (this.controlType === Enum.ControlType.DateRange || this.controlType === Enum.ControlType.DateTimeRange) {
+                if (this.controlType === Enum.ControlType.DateRange
+                    || this.controlType === Enum.ControlType.DateTimeRange
+                    || this.controlType === Enum.ControlType.MonthRange) {
                     this.code1 = '';
                     this.code2 = '';
                 }
                 else if (this.controlType === Enum.ControlType.CheckBoxList) {
                     this.value = [];
                 }
-                else if (this.controlType === Enum.ControlType.SearchListBox 
-                    || this.controlType === Enum.ControlType.ComboBox 
-                    || this.controlType === Enum.ControlType.MultiSelectNoSearch 
-                    || this.controlType === Enum.ControlType.MultiSelectWithSearch 
+                else if (this.controlType === Enum.ControlType.SearchListBox
+                    || this.controlType === Enum.ControlType.ComboBox
+                    || this.controlType === Enum.ControlType.MultiSelectNoSearch
+                    || this.controlType === Enum.ControlType.MultiSelectWithSearch
                     || this.controlType === Enum.ControlType.PhoneNumberText) {
-                        this.code1 = '';
-                        this.code2 = '';
-                        this.name1 = '';
-                        this.value = '';
+                    this.code1 = '';
+                    this.code2 = '';
+                    this.name1 = '';
+                    this.value = '';
                 }
                 else {
                     this.code1 = '';
@@ -910,6 +912,23 @@ const Base = function (source, moreActionRouter) {
                     configurable: true
                 });
             }
+            else if (source.controlType == Enum.ControlType.NumberWithPlusAndMinus) {
+                Object.defineProperty(rtnFormObj, source.fieldName1, {
+                    get: function () {
+                        if (source.code1) {
+                            let val = source.code1
+                            if (typeof source.code1 === 'string') {
+                                val = JSON.parse(source.code1)
+                            }
+                            return val
+                        }
+                        return []
+
+                    },
+                    enumerable: true,
+                    configurable: true
+                });
+            }
             return rtnFormObj;
         },
 

package/src/loader/src/Form.js

@@ -973,6 +973,80 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
   }
   common.openDialog(dialogOption);
 }
+//弹出分组搜索列表
+function popupGroupListHandler(field, router, model, Fields, props, callBack) {
+  let submitData = {};
+  let verified = true;
+  let flagSearchlist = false;
+  let tempFormData = model.getFormObj();
+
+  let check = true;
+  let checkMsg;
+  router.submitFormField.forEach((v) => {
+    Fields.forEach((f) => {
+      if (f.model && f.model.fieldName1 === v) {
+        if (typeof f.model.validExcute !== 'undefined') {
+          if (!f.model.validExcute()) {
+            common.message(f.model.displayValidMessage)
+            verified = false;
+            return;
+          }
+        }
+      }
+    });
+    if (!verified) {
+      return;
+    }
+    submitData[v] = common.getDataOfUpperLower(tempFormData, v);
+    if (!submitData[v]) {
+      if (model.fieldsDic[v]) {
+        if (model.fieldsDic[v].required) {
+          checkMsg = "请先录入" + model.fieldsDic[v].controlLabel;
+          check = false;
+        }
+      }
+      else {
+        checkMsg = "未读取到表单项(" + v + ")的值";
+        check = false;
+      }
+    }
+  });
+
+  if (!verified) {
+    return;
+  }
+  if (!check) {
+    common.message(checkMsg, 'warning')
+    return;
+  }
+  submitData = router.getActionPara(submitData).para;
+    var dialogOption = {
+      title: router.pageTitle,
+      pane: common.getParentPane(),
+      content: [{
+        component: 'ct-popupgrouplist',
+        width: router.pageWidth + 'px',
+        height: (router.pageHeight || 500) + 'px',
+        documentHeight: props.documentHeight,
+        documentWidth: props.documentWidth,
+        attrs: {
+          searchConditionApi: router.actionForSearchLayout,
+          searchFormApi: router.actionForSearchLayout,
+          searchDataApi: router.actionForSearch,
+          apiParam: submitData,
+          flagPopupSearchlist: flagSearchlist,
+          onSubmit: (option) => {
+            if (typeof callBack === "function" && !router.callBackFunName) {
+              callBack(option);
+            }
+            model.$vue.changeCallBackHandler(field, router.callBackFunName, option);
+            common.closeDialog(dialogOption);
+          }
+        },
+      }]
+    };
+  common.openDialog(dialogOption);
+}
 function getFileData(field, model) {
   var submitData = {};
   var tempFormData = model.getFormObj();
@@ -1067,6 +1141,7 @@ const Form = {
   clearRelatedHandle,
   doAction,
   popupSearchListHandler,
+  popupGroupListHandler,
   getFileData,
   changeHandler,
   getRouterAndSubmitData,

package/src/loader/src/FormList.js

@@ -239,7 +239,7 @@ function FormListModel(source, master,actionRouters) {
                             row['delete'] = rows[i].delete
                             row['fontColor'] = rows[i].fontColor
                             this._tableData.push(row);
-                            if (this.flagRepeat) {
+                            if (this.flagRepeat||this.flagTemplate) {
                                 allhiddenHandle(row, rows[i].$sourceIndex, rtn)
                             }
                         }
@@ -302,6 +302,29 @@ function FormListModel(source, master,actionRouters) {
             });
             return rtnObj;
         },
+        get relationParentFormFields() {
+          return source.relationParentFormFields;
+        },
+        getRelationParentFormFields(){
+          let relfields=[];      
+          if(this.relationParentFormFields){
+            if(this.form && this.form.fieldsDic){
+              let form=this.form;
+              (this.relationParentFormFields.split(',')).forEach(function(f){
+                if(form.fieldsDic[f]){
+                  let newField={...form.fieldsDic[f]};
+                  newField.is='ct-label';
+                  newField.type=Enum.ControlType.Label;
+                  newField.colspan=24;
+                  newField.required=false;
+                  newField.labelClass='';
+                  relfields.push(newField);
+                }
+              });
+            }
+          }
+          return relfields;
+        }
     };
     return rtn;
 }
@@ -464,6 +487,7 @@ function addRow(model) {
                     actionRouters: model.actionRouters,
                 },
                 parentModelForm: model.parentModel,
+                relationParentFormFields:model.getRelationParentFormFields(),
                 onSubmit: (ev) => {
                     var row = JSON.parse(JSON.stringify(model.source.rows[0]));
                     for (let findex = 0; findex < row.columns.length; findex++) {
@@ -471,6 +495,8 @@ function addRow(model) {
                         field.code1 = ev.formData.source.fields[findex].code1;
                         field.name1 = ev.formData.source.fields[findex].name1;
                         field.code2 = ev.formData.source.fields[findex].code2;
+                        field.locked = ev.formData.source.fields[findex].locked;
+                        field.required = ev.formData.source.fields[findex].required;
                         if(field.controlType==Enum.ControlType.Photo){
                             field.code1 =JSON.stringify(ev.formData.fields[findex].fileSource)
                         }
@@ -536,6 +562,7 @@ function editRow(sourceIndex, model) {
                     actionRouters: model.source.actionRouters,
                 },
                 parentModelForm: model.parentModel,
+                relationParentFormFields:model.getRelationParentFormFields(),
                 onSubmit: (ev) => {
                     model.rows[model.rows.findIndex(v => v.$sourceIndex === sourceIndex)].edited = true;
                     var row = model.source.rows[index].columns;
@@ -547,11 +574,13 @@ function editRow(sourceIndex, model) {
                             model.tableData[tableIndex][row[findex]['fieldName1']]['name1'] = ev.formData.source.fields[findex].name1
                             model.tableData[tableIndex][row[findex]['fieldName1']]['code2'] = ev.formData.source.fields[findex].code2
                             model.tableData[tableIndex][row[findex]['fieldName1']]['locked'] = ev.formData.source.fields[findex].locked
+                            model.tableData[tableIndex][row[findex]['fieldName1']]['required'] = ev.formData.source.fields[findex].required
 
                             row[findex]['code1'] = ev.formData.source.fields[findex].code1
                             row[findex]['name1'] = ev.formData.source.fields[findex].name1
                             row[findex]['code2'] = ev.formData.source.fields[findex].code2
                             row[findex]['locked'] = ev.formData.source.fields[findex].locked
+                            row[findex]['required'] = ev.formData.source.fields[findex].required
                         }
                         common.closeDialog(dialogOption);
                     }

package/src/loader/src/GroupList.js

@@ -0,0 +1,14 @@
+import base from '../index';
+import valid from '../../utils/validate';
+const GroupList = function (source) {
+    let rtn = {
+        get value() {
+          
+        },
+
+    };
+    rtn = base.copy(source, rtn);
+    rtn = base.copy(rtn, valid.Init(rtn));
+    return rtn;
+};
+export default GroupList

package/src/loader/src/LibFunction.js

@@ -10,6 +10,7 @@ import TextBox from './TextBox';
 import DatePicker from './DatePicker';
 import RadioButton from './RadioButton';
 import CheckBoxList from './CheckBoxList';
+import NumberWithPlusAndMinus from './NumberWithPlusAndMinus';
 import NumericRange from './NumericRange';
 import MultiComboBoxWithTextBox from './MultiComboBoxWithTextBox';
 import FormList from './FormList';
@@ -34,7 +35,8 @@ const LibFunction = {
             else if (field.controlType === Enum.ControlType.DateTime) {
                 field.width = field.width || 280;
             }
-            else if (field.controlType === Enum.ControlType.DateRange) {
+            else if (field.controlType === Enum.ControlType.DateRange
+                || field.controlType === Enum.ControlType.MonthRange) {
                 field.width = field.width || 300;
             }
             else if (field.controlType === Enum.ControlType.DateTimeRange) {
@@ -58,6 +60,9 @@ const LibFunction = {
             else if (field.controlType === Enum.ControlType.CheckBox) {
                 showLabel = true;
             }
+            else if (field.controlType === Enum.ControlType.DateYearMonth) {
+                field.width = field.width || 200;
+            }
             else {
                 showLabel = false;
                 field.width = field.width || 200;
@@ -119,6 +124,7 @@ const LibFunction = {
             case Enum.ControlType.DateTime:
             case Enum.ControlType.Date:
             case Enum.ControlType.Time:
+            case Enum.ControlType.MonthRange:
                 item = DatePicker(item)
                 item.is = 'ct-datepicker'
                 break;
@@ -147,7 +153,7 @@ const LibFunction = {
                     console.error("找不到对应的list：" + field.fieldName1);
                 }
                 listobj.scripts = source.scripts;
-                item = FormList.FormListModel(listobj, field,source.actionRouters);
+                item = FormList.FormListModel(listobj, field, source.actionRouters);
                 item.is = 'ct-formlist';
                 break;
             case Enum.ControlType.RichText: //富文本框
@@ -191,8 +197,8 @@ const LibFunction = {
                 var files = [];
                 if (Array.isArray(field.code1)) {
                     files = field.code1;
-                } else { 
-                    files= field.code1 && field.code1 != "[]" ? JSON.parse(field.code1) : [];
+                } else {
+                    files = field.code1 && field.code1 != "[]" ? JSON.parse(field.code1) : [];
                 }
                 item = Photo.loadFromModel(item, files, router, source.videoPlayIconUrl);
                 item.is = 'ct-photo';
@@ -234,8 +240,12 @@ const LibFunction = {
                 item.is = 'ct-steps';
                 break;
             case Enum.ControlType.Tags:
-                    item = Tags(item)
-                    item.is = 'ct-tags'
+                item = Tags(item)
+                item.is = 'ct-tags'
+                break;
+            case Enum.ControlType.NumberWithPlusAndMinus:
+                item = NumberWithPlusAndMinus(item)
+                item.is = 'ct-numberwithplusandminus'
                 break;
             default:
                 item = Label(item)

package/src/loader/src/NumberWithPlusAndMinus.js

@@ -0,0 +1,35 @@
+import base from '../../loader/index';
+import valid from '../../utils//validate';
+const NumberWithPlusAndMinus = function (source) {
+    let rtn = {
+        get value() {
+            this._value = [];
+            if (source.code1) {
+                let val = source.code1
+                if (typeof source.code1 === 'string') {
+                    val = JSON.parse(source.code1)
+                }
+                this._value = val;
+            }
+            if (this._value && this._value.length == 0) {
+                const str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+                for (let i = 0; i < 4; i++) {
+                    var item = {};
+                    item['code'] = str[i];
+
+                    item['name'] = '';
+                    item['flagDeleted'] = false
+                    this._value.push(item)
+                }
+            }
+            source.maxValue1 = this._value.length;
+            return this._value
+
+        },
+
+    };
+    rtn = base.copy(source, rtn);
+    rtn = base.copy(rtn, valid.Init(rtn));
+    return rtn;
+};
+export default NumberWithPlusAndMinus

package/src/loader/src/SearchScreen.js

@@ -57,6 +57,7 @@ function loadSearchScreenModel(source, prevParam) {
                 }
                 if ((source.fields[key].controlType === Enum.ControlType.DateRange
                     || source.fields[key].controlType === Enum.ControlType.Location
+                    || source.fields[key].controlType === Enum.ControlType.MonthRange
                     || source.fields[key].controlType === Enum.ControlType.DateTimeRange)
                     && source.fields[key].code2 == undefined) {
                     source.fields[key].code2 = '';

package/src/loader/src/SearchTable.js

@@ -205,8 +205,8 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
 
                     }
                 }
-                else{
-                    data=data.replace("总耗时", "").replace("總耗時", "");
+                else {
+                    data = data.replace("总耗时", "").replace("總耗時", "");
                 }
                 return data;
             }
@@ -468,6 +468,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                                         styleObj["width"] = col.width + 'px'; //列宽
                                         styleObj["min-width"] = col.width + 'px'; //列宽
                                     }
+                                    if (col.paramName == 'drag') {
+                                        styleObj["cursor"] = 'move';
+                                    }
                                     styleObj["text-align"] = col.align; //水平位置
 
                                     return styleObj;
@@ -573,12 +576,15 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         //设置行样式
         setStyleRow(rows) {
             rows.forEach((row) => {
-                if (!row.$style) {
-                    row.$style = {};
+                if (!row.rowStyle) { 
+                    row.rowStyle = "";
                 }
                 if (rtn.rowColorColumn && row[rtn.rowColorColumn]) {
                     row.rowStyle = row.rowStyle + "color:" + row[rtn.rowColorColumn] + ";";
                 }
+                 if (row.flagDrag && row.flagDrag=='1') {
+                    row.rowStyle = row.rowStyle + "cursor:move;";
+                }
             });
         },
         _lastRowspan: null,

package/src/main.js

@@ -21,12 +21,12 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
-    //baseUrl: "http://10.88.22.66:6060/onecard-api/",
+    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    baseUrl: "http://10.88.22.66:6060/onecard-api/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -63,8 +63,8 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                //authObject: '{token:"1647-1802885825978044416",platform:"WEB"}',
-                authObject: '{EmpID:"Token_db2d49d2-8f18-4491-a9c1-2b6bee44ad28",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_db2d49d2-8f18-4491-a9c1-2b6bee44ad28",Platform:"IOS"}',
+                authObject: '{token:"1-80c31492-53e1-45c8-82ce-67ca89b3e40c"}',
+                //authObject: '{EmpID:"Token_bf5a6050-abc4-4108-b208-2c808c1ef335",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_bf5a6050-abc4-4108-b208-2c808c1ef335",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/Enum.js

@@ -291,6 +291,16 @@ const Enum = {
       /// </summary>
       Tags: 58,
   
+      /// <summary>
+      ///  月份区间
+      /// </summary>
+      MonthRange: 59,
+
+       /// <summary>
+      ///  数值输入框带+/-按钮
+      /// </summary>
+      NumberWithPlusAndMinus: 60,
+      
     },
   
     //返回状态码
@@ -737,19 +747,19 @@ const Enum = {
        /**
        * 悬停 触发
        */
-      Hover: 1,
+      Hover: 0,
        /**
        * 点击 触发
        */
-      Click: 2,
+      Click: 1,
        /**
        * 聚焦 触发
        */
-      Focus: 3,
+      Focus: 2,
        /**
        * 右键菜单 触发
        */
-      Contextmenu: 4
+      Contextmenu: 3
     },
   };
   

package/src/utils/mixins.js

@@ -761,7 +761,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                     common.closeDialog(dialogOption);
 
                                 },
-
+                                isIframe: model.isIframe,
                             },
                         }]
                     };
@@ -782,8 +782,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                 onSubmit: () => {
                                     common.closeDialog(dialogOption.dialog);
                                 },
-
-
+                                isIframe: model.isIframe,
                             },
                         }]
                     };
@@ -872,6 +871,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
             submitData = field.getActionPara(submitData).para;
             let title = field.pageTitle == undefined ? field.label : field.pageTitle;
             submitData.actionType = field.actionType;
+            if (model.isIframe) {
+              submitData.isIframe = model.isIframe;
+            }
             var fun = common.getDataDrivenOpts().handler[action];
             fun(submitData, title, model);
         }

package/src/utils/validate.js

@@ -236,6 +236,7 @@ const valid = {
               break;
             case Enum.ControlType.NumericRange:
             case Enum.ControlType.DateRange:
+            case Enum.ControlType.MonthRange:
             case Enum.ControlType.DateTimeRange:
             case Enum.ControlType.ComboBoxWithTextBox:
             case Enum.ControlType.PhoneNumberText:

package/src/views/SearchList.vue

@@ -1,8 +1,7 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
-      :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/admin/schoolclass/SchoolStudentClassList/getLayoutOfSearch'"
+      :searchDataApi="'/admin/schoolclass/SchoolStudentClassList/getListOfSearchModel'"></ct-searchlist>
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>