centaline-data-driven 1.6.16 → 1.6.18

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

@@ -5,11 +5,12 @@ import Vue from 'vue';
 import common from '../../../common';
 import valid from '../../../validate/index';
 //元数据、附件列表元数据、对应router、下拉框数据api
-const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl) {
+const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl,moreActionRouter) {
   var self = this;
   var init = function (data) {
     var rtn = {
       QRCodeStatusAction:'',
+      moreActionRouter: moreActionRouter,
       get min2() {
         return source.minValue2;
       },
@@ -397,11 +398,10 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
         }
         rtn.fileList.push(awaitfile);
       },
-      jsSetFile(data)
-      {
+      jsSetFile(data){
         var photos = JSON.parse(data);
-      photos.forEach((v) => {
-        if(rtn.fileList.length<parseInt(rtn.max || 999)){
+        photos.forEach((v) => {
+          if(rtn.fileList.length<parseInt(rtn.max || 999)){
             v.videoCoverFileName=v.videoCoverFileName||null;
             v.thumbnailUrl=v.thumbnailUrl||'';
             v.mediaSourceTypeID=v.mediaSourceTypeID||null;
@@ -420,12 +420,11 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
             FileData.width=v.width;
             FileData.height=v.height;
             rtn.fileList.push(FileData);
-            rtn.self.handleChange();
-            
-        }
-      });
-    },
-       setByPieces(res, Progress, file) {
+            rtn.self.handleChange();            
+          }
+        });
+      },
+      setByPieces(res, Progress, file) {
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           var data = {

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

@@ -0,0 +1,31 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+const Location = function (source,moreActionRouter) {
+  var rtn = {
+    moreActionRouter: moreActionRouter,
+    getFormObj() {
+      var rtnFormObj = {};
+      Object.defineProperty(rtnFormObj, source.fieldName1, {
+        get: function () {
+          return source.code1;
+        },
+        enumerable: true,
+        configurable: true
+      });
+      Object.defineProperty(rtnFormObj, source.fieldName2, {
+        get: function () {
+          return source.code2;
+        },
+        enumerable: true,
+        configurable: true
+      });
+      return rtnFormObj;
+    },
+  };
+  rtn = base.copy(Base(source), rtn);
+  rtn = base.copy(rtn, valid.Init(rtn));
+  return rtn;
+};
+
+export default Location;

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

@@ -129,8 +129,8 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
           return rtn._scripts;
         }
         else {
-          if (typeof source.scripts !== 'undefined') {
-            rtn._scripts = base.common.eval(source.scripts);
+          if (typeof source.content.scripts !== 'undefined') {
+            rtn._scripts = base.common.eval(source.content.scripts);
             return rtn._scripts;
           }
           else {
@@ -155,6 +155,7 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
             continue;
           }
           if((source.content.fields[key].controlType===Enum.ControlType.DateRange 
+            || source.content.fields[key].controlType===Enum.ControlType.Location
             || source.content.fields[key].controlType===Enum.ControlType.DateTimeRange)
             && source.content.fields[key].code2==undefined){
             source.content.fields[key].code2='';

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

@@ -286,6 +286,11 @@ const Enum = {
     /// </summary>
     Steps: 57,
 
+    /// <summary>
+    ///  标签集合控件,每个标签是一个 ModelListItem 对象，可以拖动改变每个标签的顺序，locked 状态下不能拖动
+    /// </summary>
+    Tags: 58,
+
   },
 
   //返回状态码

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

@@ -40,6 +40,7 @@ import Contact from '../Contact';
 import LH from '../LH';
 import Image from '../Image';
 import Steps from '../Steps';
+import Location from '../Location';
 
 const LibFunction = {
   install(Vue) {},
@@ -315,7 +316,8 @@ const LibFunction = {
             }
           })
         }
-        item = File(field, files, router, source.parameterAction,source.videoPlayIconUrl);
+        moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+        item = File(field, files, router, source.parameterAction,source.videoPlayIconUrl,moreActionRouter);
         item.is = 'ct-file';
         break;
       case Enum.ControlType.PhotoSelect: //图片选择
@@ -394,6 +396,11 @@ const LibFunction = {
         item = Steps(field);
         item.is = 'ct-Steps';
         break;
+      case Enum.ControlType.Location: //位置获取控件
+        moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+        item = Location(field,moreActionRouter);
+        item.is = 'ct-Location';
+        break;
       default:
         item = L(field);
         item.is = 'ct-labelText';
@@ -434,7 +441,7 @@ const LibFunction = {
           return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine || field.controlType === Enum.ControlType.Repeat
             || field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File 
             || field.controlType === Enum.ControlType.SliceUpload || field.controlType === Enum.ControlType.PhoneDial 
-            || field.controlType === Enum.ControlType.Steps 
+            || field.controlType === Enum.ControlType.Steps || field.controlType === Enum.ControlType.Location 
             || field.controlType === Enum.ControlType.SearchPage;
         },
         showLabel: showLabel

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

@@ -48,6 +48,7 @@ const loader = {
   Image: require("./ctl/Image.js").default,
   AppContainer: require("./ctl/AppContainer.js").default,
   Steps: require("./ctl/Steps.js").default,
+  Location: require("./ctl/Location.js").default,
 };
 
 export default loader;

package/src/centaline/mixins/dynamicElement.js

@@ -148,9 +148,9 @@ export default {
     validExcute() {
       var self = this;
       self.validMessage="";
-
+      
       //通用校验
-      if (typeof this.model.validating === "function") {
+      if (typeof this.model.validating === "function") {        
         let validtemp = this.model.validating();
         self.valid = validtemp.valid;
         if (!self.valid) {

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

@@ -41,7 +41,9 @@
     props: {
       router: Object,
       rowData: Object,
-      colValue: String,
+      colValue: {
+        type: [String, Number], // 现在 colValue 可以是对象或数字
+      },
       columnName: String,
       rowindex: Number,
       isOperationalColumn: {

package/src/centaline/validate/index.js

@@ -278,6 +278,7 @@ const valid = {
               case Enum.ControlType.DateRange:
               case Enum.ControlType.DateTimeRange:
               case Enum.ControlType.ComboBoxWithTextBox:
+              case Enum.ControlType.Location:
                 rtnValidate.push(valid.requiredArea);
                 break;
               case Enum.ControlType.Address:
@@ -333,6 +334,7 @@ const valid = {
             case Enum.ControlType.DateRange:
             case Enum.ControlType.DateTimeRange:
             case Enum.ControlType.ComboBoxWithTextBox:
+            case Enum.ControlType.Location:
               rtnValidate.push(valid.requiredArea);
               break;
             case Enum.ControlType.Address:
@@ -340,11 +342,11 @@ const valid = {
               break;
             case Enum.ControlType.File: 
             case Enum.ControlType.SliceUpload:
-                rtnValidate.push(valid.requiredFile);
+              rtnValidate.push(valid.requiredFile);
               break;
             case Enum.ControlType.PhotoSelect:
               rtnValidate.push(valid.requiredPhoto);
-                break;
+              break;
             default:
               rtnValidate.push(valid.required);
               break;

package/src/main.js

@@ -16,16 +16,18 @@ Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.46:6060/onecard-api/",
+  baseUrl: "http://10.88.22.46:9999/service-api/",  
+  // baseUrl: "http://10.88.22.46:22324/service-api/v1/form/router",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:6060/onecard-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
-  baseUrl: "http://10.25.10.63:9999/service-api/",
-  baseUrl: "http://10.25.10.67:9999/service-api/",
+  // baseUrl: "http://10.25.10.63:9999/service-api/",
+  // baseUrl: "http://10.25.10.67:9999/service-api/",
   // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  baseUrl: "http://10.88.22.46:9999/service-api/",
   // baseUrl: "http://10.88.22.42:9999/service-api/",
+  baseUrl: "http://10.1.245.111:38908/service-api/",
   // baseUrl: "http://10.1.245.111:31574/service-api/",
   // baseUrl: "https://tjcptest.centaline.com.cn/", 
   // baseUrl: "https://shccai.centaline.com.cn/api/",
@@ -54,6 +56,9 @@ Vue.use(centaline, {
     openTabUrl: function (action) {
       alert("打开tab页URL:" + action)
     },
+    openAnnexVerify:function(submitData, pageTitle, parentModel){
+      alert("openAnnexVerify")
+    },
     // 获取请求头
     getRequestHeaders: function () {
       return {
@@ -62,17 +67,17 @@ Vue.use(centaline, {
         // authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksKAjEMQO_StYEkTZp2dq3TbjzE0JERxpX4AUW8u4qHcPd4m_ee7nKb3eDYxio1EJRKHoTFf8gzIKqOJbdajKfUssYRBZhTAWnWICbzoJR8xhhLLTLFLRIjE-g2G4hlhawtga9BLKKNWNht3HI_uYGMlFkl8cat_foT5BN-xe2ynHfL4x9zx-v6yRKbCR4QYp87SEeFzr1D2Hfbk4ZwQHOvNwAAAP__.WXDbBaPltpYZXolspry93UzYBfcZrKEmjpvrgrVTWFM"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"20191111150458268D9815816AA4E11A","estateName":"%E5%BD%AD%E4%BF%8A%E6%9D%B0%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98","estDeptPath":"009.001.001"}',
+        EstateInfo: '{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"}',
         estateId: '',
 
-        authObject: '{"currentEstate":{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"vcmmdo","time":1720429708212,"sign":"c0308806988b00b3e62b6a0de614ad89","systemSource":"CCESU","empNo":"121728","empId":"202110201430497BB5FE89123A054CCA"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImM2NmVmNzJiLTU1ZDAtNGE4Ni05ZjRlLTM4OWMxM2ZkMTRkNSJ9.FFG8SC8pYGc2LqsgSfeGPGfoRag70o53abXD6dj_YHiUWz7WD_aAvfZhAN8yp4_g-mCg2AECcEvsDgKeaFSV-Q',
+        authObject: '{"currentEstate":{"estateId":"2021012114303422B4EEE3B843911CD0","estateName":"0%E6%81%92%E8%A3%95%E6%B7%B1%E5%9C%B3%E6%B9%BE0","estDeptPath":"001.007.001"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"vHBZlA","time":1723713874993,"sign":"d38f285069b890a31043567989ec15c0","systemSource":"CCESU","empNo":"ceshics0","empId":"201804231035296D8646770E1ECD32CD"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImQ3MTJkNWMyLTdiYmUtNGZiMC05Y2ViLTE3ZjM3N2UwODMwOSJ9.4O6r0mtfsBbBLwiW6FQ0QSMbce7oEQRDnKrRP5SypazRGLODIZF5V7qJMMi60I-mdD-OcX-lS9PnykEn6-Gs_w',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作
     requestComplete: function (response) {
       
-    }
+    },
   }});
 
 /* eslint-disable no-new */