centaline-data-driven-v3 0.1.37 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",
@@ -25,6 +25,7 @@
     "vue-cropper": "^1.1.1",
     "vue-router": "^4.2.5",
     "vue-ueditor-wrap": "^3.0.8",
+    "vue3-json-viewer": "^2.4.1",
     "vue3-pdf-app": "^1.0.3",
     "vuedraggable": "^4.1.0"
   },

package/src/components/web/Form.vue

@@ -1,5 +1,6 @@
 <template>
-    <div ref="refForm" v-loading="loading"  :style="{width:pageWidth?pageWidth+'px':'100%',margin:'auto','min-height': minHeight}">
+    <div ref="refForm" v-loading="loading"
+        :style="{ width: pageWidth ? pageWidth + 'px' : '100%', margin: 'auto', 'min-height': minHeight }">
         <div style="display: flex; width: 100%;">
             <div style="flex: 1; min-width: 0;">
                 <div v-if="model !== null && !loading" class="ct-form">
@@ -11,13 +12,18 @@
 
                     <!--可根据场景判断显示el-card还是el-main-->
                     <component :is="model.showTitle ? 'el-main' : 'el-card'">
+                        <div class="ct-from-title" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
+                            <span style="font-weight:bold">{{ model.title }}</span>
+                        </div>
+
                         <!--relationParentFormFields-->
                         <el-row v-if="relationParentFormFields.length > 0">
                             <template v-for="(col, index) in relationParentFormFields" :key="index">
                                 <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed">
                                 </div>
-                                <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px"  :class="[col.is=='ct-button'&&col.labelPlacement=='1' ? 'el-col1' : '']">
-                                    <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
+                                <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px"
+                                    :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
+                                    <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey" :listHeight="listHeight"
                                         :parameterAction="model.parameterAction" v-bind="col.bindPara"
                                         :fileData="getFileData(col)" @change="changeHandler"
                                         @importComplete="importComplete" @popupLocation="popupLocationHandler"
@@ -34,8 +40,9 @@
                             <template v-for="(col, index) in model.collapseFields[0]" :key="index">
                                 <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed">
                                 </div>
-                                <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px" :class="[col.is=='ct-button'&&col.labelPlacement=='1' ? 'el-col1' : '']">
-                                    <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
+                                <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px"
+                                    :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
+                                    <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey" :listHeight="listHeight"
                                         :parameterAction="model.parameterAction" v-bind="col.bindPara"
                                         :fileData="getFileData(col)" @change="changeHandler"
                                         @importComplete="importComplete" @popupLocation="popupLocationHandler"
@@ -47,19 +54,20 @@
                             </template>
                         </el-row>
                         <!--tabs-->
-                        <el-tabs v-if="model.isHorizontalLayout" v-model="activeName">
+                        <el-tabs v-if="model.isHorizontalLayout" v-model="activeName" @tab-click="tabClick">
                             <template v-for="(item, index) in model.collapse" :key="index">
-                                <el-tab-pane :name="index.toString()" :lazy="item.lazyLoad"
-                                    v-if="item.show !== false" :key="index">
-                                     <template #label>
+                                <el-tab-pane :name="index.toString()" :lazy="item.lazyLoad" v-if="item.show !== false"
+                                    :key="index">
+                                    <template #label>
                                         <span v-html="item.controlLabel"></span>
                                     </template>
                                     <el-row>
                                         <template v-for="(col, i) in model.collapseFields[index + 1]" :key="i">
                                             <div style="display: flex; flex: 0 0 100%;"
                                                 v-if="col.show !== false && col.lineFeed"></div>
-                                            <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px" :class="[col.is=='ct-button'&&col.labelPlacement=='1' ? 'el-col1' : '']">
-                                                <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
+                                            <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px"
+                                                :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
+                                                <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey" :listHeight="listHeight"
                                                     :parameterAction="model.parameterAction" v-bind="col.bindPara"
                                                     :fileData="getFileData(col)" @change="changeHandler"
                                                     @fieldClick="fieldClickHandler"
@@ -86,7 +94,7 @@
                                     <template #title>
                                         <i class="sign"></i>
                                         <span :class="[item.required ? 'requiredLabel' : '']">{{ item.controlLabel
-                                        }}</span>
+                                            }}</span>
                                         <span v-html="item.sufLabel1"></span>
                                     </template>
 
@@ -94,8 +102,9 @@
                                         <template v-for="(col, i) in model.collapseFields[index + 1]" :key="i">
                                             <div style="display: flex; flex: 0 0 100%;"
                                                 v-if="col.show !== false && col.lineFeed"></div>
-                                            <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px"  :class="[col.is=='ct-button'&&col.labelPlacement=='1' ? 'el-col1' : '']">
-                                                <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
+                                            <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px"
+                                                :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
+                                                <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey" :listHeight="listHeight"
                                                     :parameterAction="model.parameterAction" v-bind="col.bindPara"
                                                     :fileData="getFileData(col)" @change="changeHandler"
                                                     @fieldClick="fieldClickHandler"
@@ -117,8 +126,9 @@
                             <template v-for="(col, index) in model.independentItem" :key="index">
                                 <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed">
                                 </div>
-                                <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px"  :class="[col.is=='ct-button'&&col.labelPlacement=='1' ? 'el-col1' : '']">
-                                    <component ref="Fields" :is="col.is" :vmodel="col"
+                                <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px"
+                                    :class="[col.is == 'ct-button' && col.labelPlacement == '1' ? 'el-col1' : '']">
+                                    <component ref="Fields" :is="col.is" :vmodel="col" :listHeight="listHeight"
                                         :parameterAction="model.parameterAction" v-bind="col.bindPara"
                                         @change="changeHandler" :key="itemKey" :fileData="getFileData(col)"
                                         @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
@@ -130,7 +140,7 @@
                             </template>
                         </el-row>
                         <el-row v-if="model.links.findIndex((v) => { return v.show }) > -1" style="margin-top: 8px;">
-                            <el-col :span="24" style="text-align:left" >
+                            <el-col :span="24" style="text-align:left">
                                 <template v-for="(btn, index) in model.links" :key="index">
                                     <component :is="btn.is" :vmodel="btn" v-if="btn.show" @fieldClick="clickHandler">
                                     </component>
@@ -143,7 +153,7 @@
                             :style="['max-width:' + buttonsWidth(), isWebScroll ? 'position: fixed;' : '']">
                             <el-col :span="24"
                                 style="text-align:center;padding-bottom: 1px;padding-left: 5px;padding-right: 5px;"
-                                class="btnPadBom" >
+                                class="btnPadBom">
                                 <template v-for="(btn, index) in model.buttons" :key="index">
                                     <component :is="btn.is" :vmodel="btn" v-if="btn.show" @fieldClick="clickHandler"
                                         :style="{ 'float': btn.isCheckbox ? btn.alignCss : '' }"></component>
@@ -196,7 +206,6 @@ import { useRouter } from 'vue-router';
 import util from '../../utils/pub-use'
 import Enum from '../../utils/Enum';
 import AIChat from '../web/AIChat.vue';
-import { fi } from 'element-plus/es/locale';
 const emit = defineEmits(['loaded', 'failLoad', 'submit', 'AIToggle'])
 const props = defineProps({
     api: String,
@@ -230,6 +239,10 @@ const props = defineProps({
         String,
         default: 'close',
     },
+    pageStyle: {
+        String,
+        default: '',
+    },
     openType: {
         String,
         default: '',
@@ -246,6 +259,7 @@ const props = defineProps({
     },
     dialogHeight: Number,
     dialoWidth: Number,
+    listHeight: Number,
 })
 
 const itemKey = ref(1)
@@ -261,6 +275,7 @@ const downloadUrl = ref('')
 const minHeight = ref('auto')
 const showAI = ref(false);
 const dialogHeight = ref(props.dialogHeight || (window.innerHeight - 60));
+const tabActiveNameKey = ref('')
 
 const qrtimer1 = ref(null)
 const qrtimer2 = ref(null)
@@ -336,6 +351,22 @@ function load(data) {
         });
     }
     loading.value = false;
+
+    if (props.openType == 'detail') {
+        tabActiveNameKey.value = props.api + model.value.title + props.pageStyle;
+        var tagkey = window.localStorage.getItem(tabActiveNameKey.value);
+        if (window.localStorage) {
+            if (model.value.collapseFields && model.value.collapse) {
+                for (var i = 0; i < model.value.collapse.length; i++) {
+                    if (tagkey == model.value.collapse[i].fieldName1) {
+                        activeName.value = i.toString();
+                    }
+                }
+            }
+
+        }
+    }
+
     //通知父组件加载完成
     emit('loaded', model.value);
 }
@@ -378,9 +409,9 @@ function fieldClickHandler(field) {
     let data = Form.getRouterAndSubmitData(field, model.value);
     clickHandler(data.router, data.submitData);
 }
-function clickHandler(field, submitData,formList) {
+function clickHandler(field, submitData, formList) {
     if (field.isOpenFileDialog) {
-        common.excuteFunStr.call(model.value.scripts, field.onChanged, {files: field.fileList,columns: formList?.source?.rows[0].columns });
+        common.excuteFunStr.call(model.value.scripts, field.onChanged, { files: field.fileList, columns: formList?.source?.rows[0].columns });
     }
     else {
         RouterClickHandler(field, submitData, null, model.value, 'form');
@@ -678,6 +709,12 @@ function buttonsWidth() {
     return rtn;
 }
 
+function tabClick(event) {
+    if (props.openType == 'detail') {
+        window.localStorage.setItem(tabActiveNameKey.value, model.value.collapse[event.index].fieldName1);//存储
+    }
+}
+
 </script>
 
 <style scoped>

package/src/components/web/JsonViewer.vue

@@ -0,0 +1,102 @@
+<template> 
+
+    <div class="josnViewerBox" :style="{ height: model.height || 'auto','max-height':(listHeight?listHeight-130+'px':'calc(100vh - 130px)') }" v-if="isRefresh">
+      <JsonViewer :value="model.json" copyable show-array-index show-double-quotes theme="light" :expanded="true"
+        :expand-depth="2" @onKeyClick="keyClick">
+        <template #copy="{ copied }">
+          <div class="btn-iocn"><el-icon title="复原到初始状态" @click.stop="resetJSON">
+              <Refresh />
+            </el-icon>
+
+            <!-- 复制按钮 -->
+            <el-icon :class="{ 'copied': copied }" title="复制JSON内容">
+              <CopyDocument />
+            </el-icon>
+          </div>
+        </template>
+      </JsonViewer>
+    </div>
+</template>
+
+<script setup>
+import { JsonViewer } from "vue3-json-viewer"
+import "vue3-json-viewer/dist/vue3-json-viewer.css";
+import { nextTick, ref } from "vue";
+const props = defineProps({
+  api: String,
+  vmodel: Object,
+  actionRouter: Array,
+   listHeight: Number,
+})
+const model = ref({});
+const isRefresh = ref(true);
+
+
+init()
+//初始化数据
+function init() {
+
+  nextTick(function () {
+    if (props.vmodel) {
+      load(props.vmodel);
+    }
+  });
+}
+function load(data) {
+  model.value = data;
+}
+const resetJSON = () => {
+  isRefresh.value = false;
+  nextTick(() => { 
+    isRefresh.value = true;
+  });
+};
+
+ 
+
+const keyClick = (keyName) => {
+  console.log(keyName, "it was click")
+}
+</script>
+
+<style scoped>
+:deep(.jv-container .jv-code) {
+  padding: 0px !important;
+}
+
+:deep(.jv-tooltip) {
+  position: sticky !important;
+  top: 0 !important;
+  right: 0 !important;
+  /* 新增：靠右定位 */
+  z-index: 10;
+  margin-left: auto;
+  /* 辅助：确保靠右 */
+ float: right;
+
+}
+
+ 
+
+.josnViewerBox {
+  overflow: auto; 
+  width: 100%;
+  border: 1px solid #eee;
+  border-radius: 4px;
+  padding: 2px;
+  /* 明确设置背景色 */
+  /* 增加内边距让边框更明显 */
+  box-sizing: border-box;
+  background-color: #ffffff;
+}
+.josnViewerBox:focus {
+  border: 1px solid #3D5ECC;
+}
+
+
+.btn-iocn {
+    display: flex;
+  gap: 10px;
+ 
+}
+</style>

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

@@ -7,8 +7,8 @@
 
         <div ref="detailForm" v-if="pageType == 'Form'" style="overflow: auto;"
             :style="{ height: (listHeight - 5) + 'px' }">
-            <ct-form :api="rowSelectRouter.action" :apiParam="apiParam" @submit="submit" :flagScroll="'true'"
-                :drowerClose="drowerClose" :openType="'detail'">
+            <ct-form :api="rowSelectRouter.action" :pageStyle="rowSelectRouter.pageStyle" :apiParam="apiParam" @submit="submit" :flagScroll="'true'"
+                :drowerClose="drowerClose" :openType="'detail'" :listHeight="listHeight">
             </ct-form>
         </div>
 

package/src/loader/src/JsonViewer.js

@@ -0,0 +1,20 @@
+function loadJsonViewerModel(source) {
+    let rtn = {
+        get json() {
+            if (source.code1 && typeof source.code1 === 'string') {
+                return JSON.parse(source.code1);
+
+            } else {
+                return source.code1;
+            }
+        },
+        get height() {
+            return source.rows ? source.rows * 20 + 'px' : 'auto';
+        }
+    };
+    return rtn;
+}
+const JsonViewer = {
+    loadJsonViewerModel
+};
+export default JsonViewer;

package/src/loader/src/LibFunction.js

@@ -23,6 +23,7 @@ import Steps from './Steps';
 import Tags from './Tags';
 import Location from './Location';
 import AIChat from './AIChat';
+import JsonViewer from './JsonViewer';
 const LibFunction = {
     install(app) {
     },
@@ -80,7 +81,7 @@ const LibFunction = {
             moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
         }
 
-        item = Field(field, moreActionRouter,source.labelPlacement);
+        item = Field(field, moreActionRouter, source.labelPlacement);
         item.isList = isList;
         switch (field.controlType) {
             case Enum.ControlType.Group:
@@ -217,10 +218,10 @@ const LibFunction = {
                 item.is = 'ct-customizecolumns'
                 break;
             case Enum.ControlType.Location:
-              moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
-              item = Location(item,moreActionRouter);
-              item.is = 'ct-location';
-              break;
+                moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+                item = Location(item, moreActionRouter);
+                item.is = 'ct-location';
+                break;
             case Enum.ControlType.SearchPage: //搜索列表页面
                 //item = {};
                 item.is = 'ct-searchlist';
@@ -255,8 +256,8 @@ const LibFunction = {
             case Enum.ControlType.Image:
                 item.is = 'ct-image'
                 break;
-            
-              case Enum.ControlType.AIChat: //AI
+
+            case Enum.ControlType.AIChat: //AI
                 var router = {};
                 if (source.actionRouters) {
                     router = source.actionRouters.find((v1) => {
@@ -270,10 +271,14 @@ const LibFunction = {
                 } else {
                     messages = field.code1 && field.code1 != "[]" ? JSON.parse(field.code1) : [];
                 }
-            
+
                 item = AIChat.loadFromModel(item, messages, router);
                 item.is = 'ct-aichat';
                 break;
+            case Enum.ControlType.JsonViewer: //JSON预览控件
+                item = JsonViewer.loadJsonViewerModel(item);
+                item.is = 'ct-jsonviewer';
+                break;
             default:
                 item = Label(item)
                 item.is = 'ct-label'

package/src/loader/src/SearchTable.js

@@ -85,6 +85,11 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         set title(v) {
             source.content.title = v;
         },
+        get flagShowTitle() {
+            let v = false;
+            if (source.flagShowTitle) v = source.flagShowTitle;
+            return v;
+        },
         //源数据
         get source() {
             return source;

package/src/main.js

@@ -21,7 +21,7 @@ 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.13:7080/ibs-api/",
     //baseUrl:"http://10.88.22.13:7070/onecard-api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{EmpID:"Token_3d65f2f0-d6a3-432e-9af6-5c378b501b76",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_3d65f2f0-d6a3-432e-9af6-5c378b501b76",Platform:"WEB"}',
+              authobject: '{token:"T5067-1993594422771769344",platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
                 //authObject: '{EmpID:"Token_4e09499b-4b76-46df-9ce5-5498d48ed062",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4e09499b-4b76-46df-9ce5-5498d48ed062",Platform:"WEB"}',

package/src/utils/Enum.js

@@ -309,7 +309,11 @@ const Enum = {
     /// <summary>
     ///  AI会话控件
     /// </summary>
-    AIChat: 62
+    AIChat: 62,
+    /// <summary>
+    ///  Json预览控件
+    /// </summary>
+    JsonViewer: 63
   },
 
   //返回状态码