centaline-data-driven 1.6.33 → 1.6.35

package/src/centaline/dynamicTreeList/src/dynamicTreeList.vue

@@ -1,16 +1,18 @@
 <template>
   <div id="app-Tree" style="height:100%;">
     <el-container style="height:  calc(100vh - 98px);" ref="tree_left">
-      <el-aside :width="leftWidth?leftWidth+'px':'15%'"
+      <el-aside :width="asideWidth ? asideWidth + 'px' : '15%'"
         style="background-color:white;border-radius: 6px;overflow-y:hidden">
-        <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" :searchtreeHeight="searchtreeHeight"
-          @loaded="loaded"></ct-searchtree>
+        <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi"
+          :searchtreeHeight="searchtreeHeight" @loaded="loaded"></ct-searchtree>
+       
       </el-aside>
-      <el-main v-if="isShowMain">
-
-        <template v-if="pageType=='form'">
+      <el-main v-if="isShowMain" style="position: relative;">
+        <div class="resizer" @mousedown="startResizing"></div>
+        <template v-if="pageType == 'form'">
           <div style="height: calc(100vh - 120px);">
-            <div class="ct-form" :style="{'width':(width?width+'px':'auto'),'height':(height?height+'px':'auto')}">
+            <div class="ct-form"
+              :style="{ 'width': (width ? width + 'px' : 'auto'), 'height': (height ? height + 'px' : 'auto') }">
               <ct-form :api="formApi" :api-param="apiParam" :width="width" :height="height"></ct-form>
             </div>
           </div>
@@ -52,16 +54,28 @@ export default {
       isShowMain: false,
       pageType: 'list',
       apiParam: {},
-      searchtreeHeight:0,
+      searchtreeHeight: 0,
+      dataRowRouter: "",
+      asideWidth: 200,
+      isResizing: false,
+      startX: 0,
+      startWidth: 0
     };
   },
   methods: {
     loaded(data) {
-      
+      this.asideWidth = Number(this.leftWidth ? this.leftWidth : 200);
+
       var self = this;
       self.isShowMain = false;
       self.pageType = "list";
       if (data && data.rowRouter && (JSON.stringify(data.rowRouter) != "{}")) {
+
+        self.dataRowRouter = JSON.stringify(data.rowRouter);
+        let localStorageWidth = window.localStorage.getItem(self.dataRowRouter);
+        localStorageWidth = localStorageWidth ? localStorageWidth : self.asideWidth + "";
+        self.asideWidth = Number(localStorageWidth);
+
         self.formApi = data.rowRouter.getLayout;
         self.pageType = data.rowRouter.pageType != undefined ? data.rowRouter.pageType : "list";
         self.width = parseFloat(data.rowRouter.width != undefined ? data.rowRouter.width : "0");
@@ -83,35 +97,64 @@ export default {
           }
 
         });
-      }      
+      }
       this.$emit('loaded');
     },
-  setsearchtreeHeight(){
-     let self = this;
-     if(self.$refs.tree_left&&self.$refs.tree_left.$el)
-        {
+    setsearchtreeHeight() {
+      let self = this;
+      if (self.$refs.tree_left && self.$refs.tree_left.$el) {
         self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
       }
-  }
+    },
+    startResizing(event) {
+      this.isResizing = true;
+      this.startX = event.clientX;
+      this.startWidth =   this.asideWidth;
+      document.addEventListener('mousemove', this.resizeAside);
+      document.addEventListener('mouseup', this.stopResizing);
+    },
+
+    resizeAside(event) {
+      if ( this.isResizing) {
+        const newWidth = this.startWidth + (event.clientX - this.startX);
+        this.asideWidth = newWidth > 50 ? newWidth : 50; // 设置最小宽度为 50px
+        window.localStorage.setItem(this.dataRowRouter, this.asideWidth);
+      }
+    },
+
+    stopResizing() {
+      this.isResizing = false;
+      document.removeEventListener('mousemove', this.resizeAside);
+      document.removeEventListener('mouseup', this.stopResizing);
+    }
   },
-  created() {  
+  created() {
     this.model = this.vmodel;
   },
   mounted() {
     let self = this;
     window.addEventListener('resize', function () {
       self.$nextTick(() => {
-       self.setsearchtreeHeight();
+        self.setsearchtreeHeight();
       })
     })
-     self.setsearchtreeHeight();
+    self.setsearchtreeHeight();
+    document.addEventListener('mouseup', this.stopResizing);
+
   },
-  activated(){
-      let self = this;
-      self.$nextTick(() => {
-       self.setsearchtreeHeight();
-      })
-    }
+  activated() {
+    let self = this;
+    self.$nextTick(() => {
+      self.setsearchtreeHeight();
+      document.addEventListener('mouseup', self.stopResizing);
+    })
+  },
+  deactivated() {
+    document.removeEventListener('mouseup', this.stopResizing);
+  },
+  unmounted() {
+    document.removeEventListener('mouseup', this.stopResizing);
+  }
 }
 
 </script>
@@ -129,5 +172,13 @@ export default {
   -webkit-box-shadow: #cfcece 0px 7px 9px 0px !important;
   border-radius: 6px !important;
   margin-top: 14px;
+} 
+.resizer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 2px;
+    height: 100%;
+    cursor: ew-resize;
 }
 </style>

package/src/centaline/dynamicViewerFile/src/dynamicViewerPDF.vue

@@ -1,15 +1,8 @@
-
 <template>
   <div v-loading="loading">
-    <iframe 
-      ref="previewPdf"
-      id="previewPdf"
-      :src="'/static/pdf/web/viewer.html?' + fileUrl"
-      :height="displayAreaHeight - 78 + 'px'"
-      :width="displayAreaWidth + 'px'"
-      @load="complete()"
-             @contextmenu="handleMouse" style="border-width: 0px;"
-    >
+    <iframe ref="previewPdf" id="previewPdf" :src="'/static/pdf/web/viewer.html?' + fileUrl"
+      :height="displayAreaHeight - 78 + 'px'" :width="displayAreaWidth + 'px'" @load="complete()"
+      @contextmenu="handleMouse" style="border-width: 0px;">
     </iframe>
   </div>
 </template>
@@ -22,7 +15,7 @@ export default {
   },
   data() {
     return {
-       loading: true,
+      loading: true,
       numPages: 1,
       fileUrl: "",
     };
@@ -30,32 +23,53 @@ export default {
   mounted() {
     this.init(this.pdfUrl);
   },
-  created() { 
+  created() {
   },
-    methods: {
-      handleMouse(e) {
-        e.preventDefault();
-      },
+  methods: {
+    handleMouse(e) {
+      e.preventDefault();
+    },
     init(pdfUrl) {
       var self = this;
-      self.fileUrl = 'r='+Math.random()+'&file='+encodeURIComponent(pdfUrl);
+      self.fileUrl = 'r=' + Math.random() + '&file=' + encodeURIComponent(pdfUrl);
     },
     complete() {
-       this.loading = false;
+      this.loading = false;
       var doc = document.getElementById("previewPdf").contentWindow.document;
-      doc.getElementById("download").style.display = "none";
-      doc.getElementById("openFile").style.display = "none";
-      doc.getElementById("print").style.display = "none";  
-      doc.getElementById("viewBookmark").style.display = "none";
+      elementHideById("download",doc)
+      elementHideById("openFile",doc)
+      elementHideById("print",doc)
+      elementHideById("viewBookmark",doc)
+
+      elementHideById("editorHighlightButton",doc)
+      elementHideById("editorFreeText",doc)
+      elementHideById("editorInk",doc)
+      elementHideById("editorStamp",doc)
+      elementHideById("editorModeButtons",doc)
+
+      elementHideById("printButton",doc)
+      elementHideById("downloadButton",doc)
+
+      elementHideById("secondaryOpenFile",doc)
+      elementHideById("cursorToolButtons",doc)
+      elementHideById("documentProperties",doc)
+
       doc.oncontextmenu = new Function("event.returnValue=false");
     },
   },
   watch: {
     pdfUrl(newValue, oldValue) {
-       this.loading = true;
+      this.loading = true;
       this.init(newValue);
     },
   },
 };
+
+function elementHideById(elementId, doc) {
+  if (doc.getElementById(elementId) != null) {
+    if (doc.getElementById(elementId).style) {
+      doc.getElementById(elementId).style.display = "none";
+    }
+  }
+}
 </script>
- 

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

@@ -323,7 +323,8 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
         classify.file.source.mediaLabelID = classify.option[rtn.optionModel.optionAttrs.value];
       },
       handleAvatarSuccess(res, file, fileList) {
-        if (res.rtnCode === Enum.ReturnCode.Successful) {
+        if (Object.prototype.toString.call(res ) === '[object Object]') {
+        if ( res.rtnCode === Enum.ReturnCode.Successful) {
           var media = res.content[0]; 
           media.mediaLabelID =file.mediaLabelID ||  rtn.mediaLabe.mediaLabelID;
           media.mediaLabelName = file.mediaLabelName  || rtn.mediaLabe.mediaLabelName;
@@ -368,7 +369,8 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
             type: 'error',
             showClose:true,
           });
-        }
+         }
+       }
       },
       addfileItem(file) {
         let awaitfile = {

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

@@ -440,6 +440,7 @@ const FormList = function (source, master) {
             width: rtn.pageWidth+'px',
             height: rtn.pageHeight+'px',
             parentModelForm:self.$self.parentModel,
+            relationParentFormFields:rtn.getRelationParentFormFields(),
           },
           on: {
             submit: function (ev) {
@@ -452,6 +453,7 @@ const FormList = function (source, master) {
                   Vue.set(row[findex], 'code1', ev.formData.source.fields[findex].code1);
                   Vue.set(row[findex], 'name1', ev.formData.source.fields[findex].name1);
                   Vue.set(row[findex], 'locked', ev.formData.source.fields[findex].locked);
+                  Vue.set(row[findex], 'required', ev.formData.source.fields[findex].required);
                   switch(ev.formData.source.fields[findex].controlType){
                     case 19:
                     case 20:
@@ -525,6 +527,7 @@ const FormList = function (source, master) {
             width: rtn.pageWidth+'px',
             height: rtn.pageHeight+'px',
             parentModelForm:self.$self.parentModel,
+            relationParentFormFields:rtn.getRelationParentFormFields(),
           },
           on: {
             submit: function (ev) {
@@ -534,6 +537,7 @@ const FormList = function (source, master) {
                 field.code1 = ev.formData.source.fields[findex].code1;
                 field.name1 = ev.formData.source.fields[findex].name1;
                 field.locked = ev.formData.source.fields[findex].locked;
+                field.required = ev.formData.source.fields[findex].required;
                 switch(ev.formData.source.fields[findex].controlType){
                   case 19:
                   case 20:
@@ -785,6 +789,28 @@ const FormList = function (source, master) {
     get frozenColumns() {
       return source.frozenColumns || [];
     },
+    get relationParentFormFields() {
+      return source.relationParentFormFields;
+    },
+    getRelationParentFormFields(){
+      let relfields=[];
+      if(rtn.relationParentFormFields){
+        if(rtn.form && rtn.form.fieldsDic){
+          (rtn.relationParentFormFields.split(',')).forEach(function(f){
+            if(rtn.form.fieldsDic[f]){
+              let newField={...rtn.form.fieldsDic[f]};
+              newField.is='ct-labelText';
+              newField.type=Enum.ControlType.Label;
+              newField.colspan=24;
+              newField.required=false;
+              newField.labelClass='';
+              relfields.push(newField);
+            }
+          });
+        }
+      }
+      return relfields;
+    }
   };
   return rtn;
 };

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

@@ -643,32 +643,19 @@ const Enum = {
   /// <summary>
   /// 平台类型
   /// </summary>
-  Platform: {
-    /// <summary>
-    /// 
-    /// </summary>
+  Platform: {   
     iOS: 0,
-
-    /// <summary>
-    /// 
-    /// </summary>
-    Android: 1,
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// 
+    Android: 1, 
     WEB: 2,
-    /// <summary>
-    /// 
-    /// </summary>
-
     WeChat: 3,
-
     /// <summary>
     /// 
     /// </summary>
     WeChatMiniProgram: 4,
+    /// <summary>
+    /// 鸿蒙 Next
+    /// </summary>
+    Harmony:5,
 
     /// <summary>
     /// 

package/src/centaline/selectOption/src/selectOptionVertical.vue

@@ -32,6 +32,7 @@
     updated() {
       var self = this;
       this.$nextTick(function () {
+        this.$emit('dataUpdated');
         if(self.$refs.options.scrollHeight>self.$refs.options.offsetHeight){
           let lem = self.$refs.options.querySelector('.select');
           if(lem){

package/src/main.js

@@ -15,6 +15,7 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
+  // baseUrl: "http://10.88.22.46:9004/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",
@@ -68,14 +69,14 @@ Vue.use(centaline, {
       return {
         oldToken: 'da18df1e-9ee2-49fd-a5ca-a3e17c8947e5',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksOwjAMBe-SdS05tuPE7PpJNhwCBWglWCHaSiDE3SniEGznjfTm5eb16HYuIUWltoc-sYKkYGDcF_ApGWYzjrE_CHOHKANQxAJSYgYTCYBoahaC0qAHJc6lbRW8bLuUbpNIBDS3QTJhZiHXuPFxczsfmXxCJG3cpS4_gMb6Bes83vfj8x9x1-Wy3eJ48seQJuCaziATTWDRIlSazCNrlerd-wMAAP__.93H7c7k4TLTqbKpozp0aTSU4U_WrQu3eS990iS-TCpw',
-        // authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksOwjAMBe-SdS05tuPE7PpJNhwCBWglWCHaSiDE3SniEGznjfTm5eb16HYuIUWltoc-sYKkYGDcF_ApGWYzjrE_CHOHKANQxAJSYgYTCYBoahaC0qAHJc6lbRW8bLuUbpNIBDS3QTJhZiHXuPFxczsfmXxCJG3cpS4_gMb6Bes83vfj8x9x1-Wy3eJ48seQJuCaziATTWDRIlSazCNrlerd-wMAAP__.93H7c7k4TLTqbKpozp0aTSU4U_WrQu3eS990iS-TCpw"}',
+        // authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjktqAzEQBe-itRv6Oy15J3mkTQ5hxnEPOKsQ25AQcveIXCK7R_Gg6jvdn5d0TOxr174QtE4CyipzCQOi2drq6M35XEa1vKICc2mgwwfk4gJGRSrm3HrTcz4hMTKBnaqDejWoNgpIX9Qz-oqN0yHF53s6kouhEGU9pNv2-ANadP4meN7j4yW-_iPu7XGbWovd46oIsV9tatEgRwmg14V1l4tssaWfXwAAAP__.sF1LYLtwnVq8_fFcoq7FA9hy44G1H7SMCYBmZqeKnLY"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
         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":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"YSLnFY","time":1726133598476,"sign":"e08cc3c4257654dcc6b8063e3cb9b1b3","systemSource":"CCESU","empNo":"24988","empId":"202110201430497BB5FE89123A054CCA"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjY5ZTQ1Nzg1LTAxYTEtNDIzMy1iZTgwLWU4MWZkZjg2NjQ4ZSJ9.2PORWldHVb2pcAT3vbizoGzFyhiQow4IHPNGmgesunUj9GW9V0iwiaZCOXR5vSPXs65_ztKRP6eRiFwXPVofgA',
+        authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"588NJK","time":1733886962541,"sign":"7cb413ac60ed50fe406c9b91c8d4a836","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc5ZThjMmI3LTg5NmUtNDc5MS1iZmYxLWM5YWE2NzhlMWZmYiJ9.CRhyx5tOWgVA5l5wmcjIuAyjAlgN9zCAvLoDQ9xjHbW9iLfdz8_fjhbe3QwoS4nQ7tzrzPu97PfVZNw0mQP6cA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作