centaline-data-driven-v3 0.1.51 → 0.1.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/Layout/LayoutChildren.vue

@@ -1,13 +1,13 @@
 <template>
     <template v-if="model.routerKey && model.visibility != '0'">
-        <div style="display: flex;height: max-content;cursor: pointer;" :class="[flagflex == true ? 'flagflex' : '',model.className]"
+        <div style="display: flex;cursor: pointer;" :class="[flagflex == true ? 'flagflex' : '',model.className]"
             v-if="model.rightRouter && model.value != ''" :style="model.styleObject" @click="clickHandlerLayout()">
             <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index"
                 :is="item.is" :vmodel="item" :rowindex="rowindex" :fields="fields" :forname="forname" :forrowindex="forrowindex" :parameterAction="parameterAction"
                 :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler" @changeHandler="changeHandler"></component>
         </div>
     </template>
-    <div style="display: flex;height: max-content;" :class="[flagflex == true ? 'flagflex' : '',model.className]"
+    <div style="display: flex;" :class="[flagflex == true ? 'flagflex' : '',model.className]"
         v-else-if="model.value != '' && model.visibility != '0'" :style="model.styleObject">
         <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index"
             :is="item.is" :vmodel="item" :rowindex="rowindex" :fields="fields" :forname="forname" :forrowindex="forrowindex" :parameterAction="parameterAction"

package/src/components/web/Comfirm.vue

@@ -1,7 +1,7 @@
 <template>
     <div
         style="margin-top: 15px;margin-bottom: 15px;min-width: 150px;text-align: center; display: flex; justify-content: center;padding-left: 28px;padding-right: 16px;">
-        <div style="text-align: left;">{{ text }}</div>
+        <div style="text-align: left;" v-html="text"></div>
     </div>
     <div style="text-align:center;width:100%;margin-bottom: 15px;">
         <el-button @click="clickHandler($event, true)" type="danger" size="small">{{ options.confirmButtonText || '确定'

package/src/components/web/Form.vue

@@ -265,6 +265,10 @@ const props = defineProps({
         Boolean,
         default: false,
     },
+    appendToBody: {
+        Boolean,
+        default: false,
+    },
     relationParentFormFields: {
         Array,
         default: function () {
@@ -375,6 +379,7 @@ function load(data) {
     model.value.$vue = { fieldClickHandler, clickHandler, validExcute, emit, getFormObj, changeCallBackHandler, getFileData, Form, load, init, updateFields, itemKey, downloadUrl, doAction };
     model.value.$vue.openType = props.openType
     model.value.isIframe = props.isIframe
+    model.value.appendToBody=props.appendToBody
     if (model.value.scripts) {
         model.value.scripts.formData = model.value.formData;
         model.value.scripts.formData.form = model.value;

package/src/components/web/SearchList/SearchTable.vue

@@ -300,6 +300,10 @@ const props = defineProps({
         String,
         default: '',
     },
+    appendToBody: {
+        Boolean,
+        default: false,
+    },
 })
 const isLoading = ref(true)
 const operationLoading = ref(false) //操作等待
@@ -406,6 +410,7 @@ function load(data) {
     model.value = data;
     model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage, toolbarClickHandler,closeTabThen };
     model.value.isIframe = props.isIframe
+    model.value.appendToBody=props.appendToBody
     model.value.isPageInSideBar = false
     model.value.columnName = null
     model.value.columnGroupId = null

package/src/components/web/dialog.vue

@@ -1,5 +1,8 @@
 <template>
-    <render />
+    <teleport to="body" v-if="vmodel.appendToBody">
+        <render />
+    </teleport>
+    <render v-else />
 </template>
 <script setup>
 import { h, ref, onActivated, resolveComponent, onBeforeUnmount } from 'vue'
@@ -12,9 +15,14 @@ const contentTop = ref(0)
 const content = ref()
 const captionBarButtons = ref([])
 const modelSelf = ref(null)
-const submitCancelData= ref(null)
-onBeforeUnmount(()=>{
-  modelSelf.value=null
+const submitCancelData = ref(null)
+const vzindex = ref(999);
+vzindex.value = props.vmodel.appendToBody ? props.zindex + 1000 : props.zindex
+// if (props.vmodel.content[0].component == 'ct-comfirm') {
+//     vzindex.value = vzindex.value + 2000;
+// }
+onBeforeUnmount(() => {
+    modelSelf.value = null
 })
 onActivated(() => {
     if (contentTop.value && content) {
@@ -33,7 +41,7 @@ function scrollHandle(ev) {
     ev.stopPropagation();
 }
 
-const render = () => { 
+const render = () => {
     return h('div', {}, [
         h('div', {
             style: {
@@ -49,7 +57,7 @@ const render = () => {
                     'ct-dialog_wrapper'
                 ],
                 style: {
-                    'z-index': props.zindex,
+                    'z-index': vzindex.value,
                     'height': '100%',
                     'width': '100%',
                 }
@@ -184,11 +192,11 @@ const render = () => {
                                                             item.height = (props.vmodel.pane.clientHeight - 60) + 'px';
                                                         }
                                                         if (item.component == 'ct-form') {
-                                                            if(props.vmodel.pane.clientHeight>window.innerHeight){
+                                                            if (props.vmodel.pane.clientHeight > window.innerHeight) {
                                                                 item.documentHeight = (window.innerHeight) + 'px';
                                                             }
-                                                            else{
-                                                                 item.documentHeight = (props.vmodel.pane.clientHeight - 60) + 'px';
+                                                            else {
+                                                                item.documentHeight = (props.vmodel.pane.clientHeight - 60) + 'px';
                                                             }
                                                         }
                                                     }
@@ -213,6 +221,9 @@ const render = () => {
                                                     }
                                                     item.attrs.dialoWidth = parseInt((item.width || 0).replace('px', ''));
                                                     item.attrs.dialogHeight = parseInt((item.height || 0).replace('px', ''));
+                                                    if (props.vmodel.appendToBody) {
+                                                        item.attrs.appendToBody = props.vmodel.appendToBody;
+                                                    }
                                                     return h('div', {
                                                         style: {
                                                             width: item.width,

package/src/loader/src/CellLayout.js

@@ -264,6 +264,9 @@ const CellLayout = function (source, actionRouter, rowdata, forname, forrowindex
                 self._styleObject.WebkitBoxOrient = "vertical";
                 self._styleObject.display = "-webkit-box";
                 self._styleObject.overflow = "hidden";
+            }
+             if (typeof source.whiteSpace !== 'undefined') {
+                self._styleObject.whiteSpace = source.whiteSpace;
             }
             return self._styleObject;
         }

package/src/loader/src/Form.js

@@ -533,6 +533,7 @@ function loadFromModel(source, isFormList) {
       rtn._fieldsDic = {};
       if (rtn.fields) {
         rtn.fields.forEach((f) => {
+          f.controlType = common.getEnumValue(Enum.ControlType, f.controlType);
           if (f.controlType == Enum.ControlType.Compound || f.controlType == Enum.ControlType.ContainerControl) {
             if (f.fields) {
               f.fields.forEach((v) => {
@@ -671,6 +672,7 @@ function loadFromModel(source, isFormList) {
         rtn._buttons = [];
         if (source.buttons) {
           source.buttons.forEach((v) => {
+            v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             var button = Router(v);
             button.is = "ct-button";
             rtn._buttons.push(button);
@@ -689,6 +691,7 @@ function loadFromModel(source, isFormList) {
         rtn._captionBarButtons = [];
         if (source.captionBarButtons) {
           source.captionBarButtons.forEach((v) => {
+            v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             var button = Router(v);
             button.is = "ct-button";
             rtn._captionBarButtons.push(button);
@@ -707,6 +710,7 @@ function loadFromModel(source, isFormList) {
         rtn._links = [];
         if (source.links) {
           source.links.forEach((v) => {
+            v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             var button = Router(v);
             button.is = "ct-button";
             rtn._links.push(button);
@@ -725,6 +729,7 @@ function loadFromModel(source, isFormList) {
         rtn._actionRouters = [];
         if (source.actionRouters) {
           source.actionRouters.forEach((v) => {
+            v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             var button = Router(v);
             button.is = "ct-button";
             rtn._actionRouters.push(button);

package/src/loader/src/LibFunction.js

@@ -1,3 +1,4 @@
+import common from '../../utils/common';
 import Enum from '../../utils/Enum';
 import base from '../index';
 import Field from './Field';
@@ -30,6 +31,7 @@ const LibFunction = {
     },
     GetControl(field, source, showLabel, isList) {
         let item;
+        field.controlType = common.getEnumValue(Enum.ControlType, field.controlType);
         //列表设置默认宽度、不显示label
         if (isList) {
             if (field.controlType === Enum.ControlType.Date) {

package/src/main.js

@@ -67,7 +67,7 @@ app.use(centaline, {
             return {
                 
              //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
-              authobject: '{token:"T5067-2038438946182201344",platform:"WEB"}',
+              authobject: '{token:"T5067-2042438796758376448",platform:"WEB"}',
               //authobject: '{EmpID:"Token_946d56e1-7972-4382-9d10-4a72496aab39",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_946d56e1-7972-4382-9d10-4a72496aab39",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',

package/src/utils/common.js

@@ -226,7 +226,7 @@ const common = {
    * @param {Object} options 参数 如confirmButtonText，cancelButtonText
    * @desc 确认框
    */
-  confirm(message, title, options) {
+  confirm(message, title, options,appendToBody) {
     let self = this;
     return new Promise((resolve, reject) => {
       if (dataDrivenOpts.flagApp) {
@@ -245,6 +245,7 @@ const common = {
         var dialogOption = {
           title: title,
           name: 'ct-comfirm',
+          appendToBody:appendToBody,
           vmodel: {},
           content: [{
             component: 'ct-comfirm',
@@ -899,5 +900,14 @@ const common = {
     const videoExtensions = /\.(mp4|mov|webm|avi|wmv|flv)$/i;
     return videoExtensions.test(url);
   },
+  getEnumValue(enumObj, value) {
+    if (typeof value === 'number') {
+      return value;
+    }
+    if(value=="CompoundControl"){
+      return enumObj["Compound"]
+    }
+    return enumObj[value];
+  },
 };
 export default common;

package/src/utils/mixins.js

@@ -155,6 +155,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                         if (res.content && res.content.action) {
                                             var dialogOption = {
                                                 title: field.pageTitle || field.controlLabel,
+                                                appendToBody: model.appendToBody,
                                                 content: [{
                                                     component: 'ct-progress',
                                                     width: '350px',
@@ -215,12 +216,13 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                             confirmButtonText: '确定',
                                             cancelButtonText: '取消',
                                             type: 'warning'
-                                        }).then(() => {
+                                        },model.appendToBody).then(() => {
                                             field.doAction(model.$vue.getFormObj({ flagHaveAlert: '1' }), (res202) => {
                                                 if (res202.rtnCode === Enum.ReturnCode.Successful) {
                                                     if (res202.content && res202.content.action) {
                                                         var dialogOption = {
                                                             title: field.pageTitle || field.controlLabel,
+                                                            appendToBody: model.appendToBody,
                                                             content: [{
                                                                 component: 'ct-progress',
                                                                 width: '350px',
@@ -302,7 +304,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                 confirmButtonText: '确定',
                                                 cancelButtonText: '取消',
                                                 type: 'warning'
-                                            }).then(() => {
+                                            },model.appendToBody).then(() => {
                                                 //如果没有弹框 则关闭tab页
                                                 if (common.dialogList && common.dialogList.List.value.length === 0) {
                                                     if (typeof common.getDataDrivenOpts().handler.closeTab === 'function') {
@@ -336,7 +338,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                             confirmButtonText: '确定',
                                             cancelButtonText: '取消',
                                             type: 'warning'
-                                        }).then(() => {
+                                        },model.appendToBody).then(() => {
                                             field.disabled = true;
                                             field.doAction(model.$vue.getFormObj({ flagHaveAlert: '1' }), (res) => {
                                                 field.disabled = false;
@@ -397,6 +399,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     if (field.isOpenBaiduMap) {
                         var dialogOption = {
                             title: field.pageTitle,
+                            appendToBody: model.appendToBody,
                             content: [
                                 {
                                     component: "ct-mapbaidu",
@@ -494,6 +497,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     var dialogOption = {
                         title: field.pageTitle,
                         pane: common.getParentPane(),
+                        appendToBody: model.appendToBody,
                         content: [
                             {
                                 component: "ct-iframe",
@@ -547,6 +551,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                 if (res.content && res.content.action) {
                                     var dialogOption = {
                                         title: field.pageTitle || field.controlLabel,
+                                        appendToBody: model.appendToBody,
                                         content: [{
                                             component: 'ct-progress',
                                             width: '350px',
@@ -613,12 +618,13 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                     confirmButtonText: '确定',
                                     cancelButtonText: '取消',
                                     type: 'warning'
-                                }).then(() => {
+                                },model.appendToBody).then(() => {
                                     field.doAction(submitData, (res202) => {
                                         if (res202.rtnCode === Enum.ReturnCode.Successful) {
                                             if (res202.content && res202.content.action) {
                                                 var dialogOption = {
                                                     title: field.pageTitle || field.controlLabel,
+                                                    appendToBody: model.appendToBody,
                                                     content: [{
                                                         component: 'ct-progress',
                                                         width: '350px',
@@ -738,6 +744,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     var dialogOption = {
                         title: field.pageTitle,
                         pane: common.getParentPane(),
+                        appendToBody: model.appendToBody,
                         content: [{
                             component: 'ct-form',
                             width: field.pageWidth + 'px',
@@ -866,6 +873,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     var dialogOption = {
                         title: field.pageTitle,
                         pane: common.getParentPane(),
+                        appendToBody: model.appendToBody,
                         content: [{
                             component: 'ct-searchlist',
                             width: field.pageWidth + 'px',
@@ -897,6 +905,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     var dialogOption = {
                         title: field.pageTitle,
                         pane: common.getParentPane(),
+                        appendToBody: model.appendToBody,
                         content: [{
                             component: field.vueComponentName,
                             width: field.pageWidth + 'px',
@@ -983,7 +992,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                         confirmButtonText: '确定',
                                         cancelButtonText: '取消',
                                         type: 'warning'
-                                    }).then(() => {
+                                    },model.appendToBody).then(() => {
                                         submitData.flagHaveAlert = '1';
                                         field.doAction(submitData, (res) => {
                                             if (res.rtnCode === Enum.ReturnCode.Successful) {
@@ -1065,7 +1074,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
             confirmButtonText: field.confirmButtonText,
             cancelButtonText: field.cancelButtonText,
             center: field.contentCenter
-        }).then(() => {
+        },model.appendToBody).then(() => {
             clickAcion(field);
         }).catch(() => {
         });

package/src/views/Form.vue

@@ -1,11 +1,12 @@
 <template>
   <div
       :style="{ 'width': '800px' , 'height': '800px', margin: 'auto', 'position': 'relative'}">
-   <ct-form :api="'/Order/readDetail'" :apiParam="apiParam" :openType="'tree'"></ct-form>
+   <ct-form :source="source" :openType="'tree'"></ct-form>
     <!-- <ct-textbox :source="source"></ct-textbox> -->
 <ct-dialoglist ref="dialogList"></ct-dialoglist>
  </div>  
 </template>
 <script lang="ts" setup>
+const source={"flagSearch":false,"parameterAction":"/cache/getParamList","actionTitle":"","title":"新跟進","flagFixedTabOnHorizontalLayout":false,"layoutOrientation":"Vertical","flagHideSaveLine":true,"captionBarButtons":[],"flagAlertCloseWindowAfterSave":false,"scripts":"","actionRouters":[{"buttonHeight":0,"hidden":false,"align":"left","pageHeight":600,"pageWidth":800,"buttonType":"Submit","action":"ind/PropertyFollow/save","flagAlert":false,"pageColumns":0,"text":"保存","locked":false,"key":"save","flagAttachSearchCondition":false,"flagAddRowAfterAction":false,"flagFreshCurrentRow":false,"actionType":"New","flagAsync":false,"flagVerifyData":true}],"buttons":[],"colSpan":0,"list":[],"labelPlacement":"left","onload":"","medias":[],"flagShowTitle":false,"fields":[{"displayLabelAfterSelected":true,"code1":"100476","fieldName1":"PropertyID","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"","mediaViewPageType":"PageInLayer","hidden":false,"spanCols":1,"controlType":"Hidden"},{"displayLabelAfterSelected":true,"code1":"1","fieldName1":"FlagShortcutFollow","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"","mediaViewPageType":"PageInLayer","hidden":false,"spanCols":1,"controlType":"Hidden"},{"displayLabelAfterSelected":true,"code1":"","fieldName1":"FullFollow","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"","mediaViewPageType":"PageInLayer","compoundFields":[{"displayLabelAfterSelected":true,"code1":"","fieldName1":"FollowContent","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"","mediaViewPageType":"PageInLayer","hidden":false,"spanCols":1,"maxValue1":"50","controlType":"TextBox"},{"displayLabelAfterSelected":true,"code1":"","fieldName1":"saveShortcutFollow","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"保存","mediaViewPageType":"PageInLayer","hidden":false,"spanCols":1,"controlType":"ButtonCommon"}],"hidden":false,"spanCols":1,"controlType":"CompoundControl"}]}
  const apiParam={"originalOrderId":"2014640778344816640","columnName":"orderNo","actionType":"1","pageStyle":"2","pageOnly":"true"}
 </script>