centaline-data-driven-v3 0.0.56 → 0.0.58

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,15 @@ 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;
+            case Enum.ControlType.VueCustomizedComponent: 
+                item.is = 'ct-'+item.vueComponentName.toLowerCase();
                 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/Router.js

@@ -17,7 +17,7 @@ const Router = function (source) {
       return source.action;
     },
     set action(v) {
-      return source.action=v;
+      return source.action = v;
     },
     // action的url对应的FieldName，如果此处有值，则忽略action
     get actionField() {
@@ -92,10 +92,24 @@ const Router = function (source) {
       source.hidden = !v;
     },
 
+    //是否显示
+    get vueComponentName() {
+      return source.vueComponentName;
+    },
+    set vueComponentName(v) {
+      source.vueComponentName = vueComponentName;
+    },
+
     //Action 对应的页面样式
     get pageStyle() {
       return source.pageStyle;
     },
+    get isVueComponentInLayer() {
+      return source.pageStyle === Enum.PageStyle.OpenVueComponentInLayer;
+    },
+    get isVueComponentInTab() {
+      return source.pageStyle === Enum.PageStyle.OpenVueComponentInTab;
+    },
     get isOpenForm() {
       return source.pageStyle === Enum.PageStyle.FormPageInLayer;
     },

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

@@ -26,7 +26,7 @@ app.use(centaline, {
     //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-7acf3f06-c2ea-471c-a5fa-07e1c2a81728"}',
+                authObject: '{EmpID:"Token_d646226c-ed20-4baa-bac4-6e6dbc101cd4",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_d646226c-ed20-4baa-bac4-6e6dbc101cd4",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作