centaline-data-driven-v3 0.1.53 → 0.1.54

package/package.json

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

package/src/components/app/Form.vue

@@ -108,6 +108,10 @@ const props = defineProps({
     parentModel: Object,
     parentModelForm: Object,
     pageWidth: Number,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
     topHeight: {
         type: Number,
         default: -1

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

@@ -10,16 +10,18 @@
         <div ref="refTableParent" class="ct-tableParentAPP" :style="'height:' + model.tableHeight + 'px'"
             @scroll="scrollHandle($event)">
             <van-pull-refresh v-model="refreshing" @refresh="onRefresh"
-            :loosing-text="common.LocalizedString('释放即可刷新...', '釋放即可刷新...')">
+                :loosing-text="common.LocalizedString('释放即可刷新...', '釋放即可刷新...')">
                 <van-list v-if="!tableError" v-model:loading="tableLoading"
                     :error-text="common.LocalizedString('没有查到数据，点我刷新', '沒有查到數據，點我刷新')" :finished="finished"
-                    :loading-text="common.LocalizedString('加载中...', '加載中...')"
-                    @load="onLoad" :immediate-check="false" :style="'min-height:' + model.tableHeight + 'px'">
+                    :loading-text="common.LocalizedString('加载中...', '加載中...')" @load="onLoad" :immediate-check="false"
+                    :style="'min-height:' + model.tableHeight + 'px'">
                     <template v-if="flagPopupSearchlist && singleSelectio">
                         <van-radio-group v-model="checkeds" ref="refCheckboxGroup">
-                            <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex" @click="selectRow(row,rowindex,false)">
-                                <van-radio @click.stop="selectRow(row,rowindex,true)" icon-size="16px" checked-color="#EE6B6B"
-                                    :name="rowindex" :checked="row.$select" :disabled="!flagSelect(row)"> </van-radio>
+                            <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex"
+                                @click="selectRow(row, rowindex, false)">
+                                <van-radio @click.stop="selectRow(row, rowindex, true)" icon-size="16px"
+                                    checked-color="#EE6B6B" :name="rowindex" :checked="row.$select"
+                                    :disabled="!flagSelect(row)"> </van-radio>
                                 <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex"
                                     :key="itemKey" @rolRouterclick="rolRouterCellClickHandler"
                                     :actionRouter="model.actionRouter"
@@ -30,11 +32,13 @@
                     </template>
                     <template v-else>
                         <van-checkbox-group v-model="checkeds" ref="refCheckboxGroup">
-                            <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex" @click="selectRow(row,rowindex,false)">
+                            <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex"
+                                @click="selectRow(row, rowindex, false)">
                                 <template v-if="isoperate || flagPopupSearchlist">
                                     <van-checkbox v-if="flagSelect(row)" shape="square" checked-color="#EE6B6B"
-                                        icon-size="14px" :name="rowindex"  @click.stop="selectRow(row,rowindex,true)"></van-checkbox>
-                                    <div class="van-checkbox" v-else>{{row.$select}}</div>
+                                        icon-size="14px" :name="rowindex"
+                                        @click.stop="selectRow(row, rowindex, true)"></van-checkbox>
+                                    <div class="van-checkbox" v-else>{{ row.$select }}</div>
                                 </template>
                                 <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex"
                                     :key="itemKey" @rolRouterclick="rolRouterCellClickHandler"
@@ -61,8 +65,8 @@
         </div>
         <div class="ct-checkboxtips" v-if="isoperate || flagPopupSearchlist">
             <van-checkbox v-if="!singleSelectio" v-model="model.selectAll" shape="square" checked-color="#EE6B6B"
-                icon-size="14px" :indeterminate="model.isIndeterminate"
-                @click="selectAll()">{{ common.LocalizedString('本页全选（已选', '本頁全選（已選') }}{{ selectCount }}）
+                icon-size="14px" :indeterminate="model.isIndeterminate" @click="selectAll()">{{
+                    common.LocalizedString('本页全选（已选', '本頁全選（已選') }}{{ selectCount }}）
             </van-checkbox>
             <div style="display: flex;flex: 1; justify-content: right;">
                 <template v-if="!flagPopupSearchlist">
@@ -96,6 +100,10 @@ const props = defineProps({
     api: String,
     searchStatsApi: String,
     flagAppMode: Boolean,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
     apiParam: {
         type: Object,
         default: () => { }
@@ -185,7 +193,7 @@ function load(data) {
     tableLoading.value = false
     model.value.scripts.formData = model.value.formData;
     model.value.scripts.formData.formTable = model.value;
-    model.value.$vue = { loadStats, updateCurrentRow, doAction, itemKey,toolbarClickHandler, emit, tableError, refreshTableColumns, getPage, setTableHeight };
+    model.value.$vue = { loadStats, updateCurrentRow, doAction, itemKey, toolbarClickHandler, emit, tableError, refreshTableColumns, getPage, setTableHeight };
     emit("loaded");
     if (model.value.rowCount == model.value.$total) {
         finished.value = true;
@@ -391,8 +399,8 @@ function modeClickHandler() {
     selectCount.value = getSelectRowLength();
 }
 //选择行
-function selectRow(row,rowIndex,flagCheckboxOrRadio) {
-    if(flagSelect(row)&&(isoperate.value || props.flagPopupSearchlist)){
+function selectRow(row, rowIndex, flagCheckboxOrRadio) {
+    if (flagSelect(row) && (isoperate.value || props.flagPopupSearchlist)) {
         if (props.singleSelectio) {
             model.value.listData.forEach((ro) => {
                 if (
@@ -404,14 +412,14 @@ function selectRow(row,rowIndex,flagCheckboxOrRadio) {
             });
         }
         row.$select = !row.$select
-        if(!flagCheckboxOrRadio){
-            if(row.$select){
-                if(checkeds.value.indexOf(rowIndex) == -1){
+        if (!flagCheckboxOrRadio) {
+            if (row.$select) {
+                if (checkeds.value.indexOf(rowIndex) == -1) {
                     checkeds.value.push(rowIndex);
                 }
-            }else{
-                if(checkeds.value.indexOf(rowIndex) > -1){
-                    checkeds.value.splice(checkeds.value.indexOf(rowIndex),1);
+            } else {
+                if (checkeds.value.indexOf(rowIndex) > -1) {
+                    checkeds.value.splice(checkeds.value.indexOf(rowIndex), 1);
                 }
             }
         }

package/src/components/app/SearchList.vue

@@ -27,6 +27,10 @@ const props = defineProps({
     searchStatsApi: String,
     pageHeight: String,
     flagAppMode: Boolean,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
     apiParam: {
         type: Object,
         default: () => { }

package/src/components/web/Button.vue

@@ -32,9 +32,9 @@
         {{ model.controlLabel }}
     </el-checkbox>
 
-    <el-dropdown split-button trigger="click" ref="refsearchwhere" class="search-btn-dropdown" popper-class="earch-btn-dropdown-popper"
-        :type="model.isHyperLink ? 'text' : 'primary'" v-bind="model.attrs" @click="clickHandle"
-        v-else-if="model.isSearchRouterKey && fieldSearchWhere" :hide-on-click="false"
+    <el-dropdown split-button trigger="click" ref="refsearchwhere" class="search-btn-dropdown"
+        popper-class="earch-btn-dropdown-popper" :type="model.isHyperLink ? 'text' : 'primary'" v-bind="model.attrs"
+        @click="clickHandle" v-else-if="model.isSearchRouterKey && fieldSearchWhere" :hide-on-click="false"
         @visible-change="clickHandleDropdown"
         :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
         :icon="model.icon" :disabled="model.disabled || model.locked" placement="bottom">
@@ -90,7 +90,7 @@
     </template>
 
     <el-button v-else type="primary" :loading="model.loading" v-bind="model.attrs" @click="clickHandle"
-        :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null,'margin-bottom': model.labelPlacement=='1'? '1px':null }"
+        :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null, 'margin-bottom': model.labelPlacement == '1' ? '1px' : null }"
         :disabled="model.disabled || model.locked">
         <template #icon v-if="model.icon">
             <i :class="model.icon"></i>
@@ -112,7 +112,7 @@ import Button from '../../loader/src/Button';
 import Enum from '../../utils/Enum'
 import common from '../../utils/common'
 import { ElMessage, UploadFile } from 'element-plus'
-const emit = defineEmits(['input', 'fieldClick', 'importComplete', 'SearchWhereManage', 'SaveSearchWhere','clickSearchWhere'])
+const emit = defineEmits(['input', 'fieldClick', 'importComplete', 'SearchWhereManage', 'SaveSearchWhere', 'clickSearchWhere'])
 const props = defineProps({
     parameterAction: String,
     fileData: Object,
@@ -148,6 +148,11 @@ if (model.value.controlType == Enum.ControlType.ButtonAdvancedSearch) {
 if (model.value.isDropdown) {
     dropClick()
 }
+if (model.value.isCheckbox) {
+    if (model.value.subText == "1") {
+        model.value.code1 = true
+    }
+}
 const uploadData = computed(() => {
     //因传输方式是FormData，故需要对Value是object的进行转化
     let data = {};
@@ -389,8 +394,8 @@ function generateUUID() {
 
 .earch-btn-dropdown-popper .el-dropdown-menu li:hover,
 .earch-btn-dropdown-popper .el-dropdown-menu li:focus {
-     background: #ffffff;
-     color: #606266;
+    background: #ffffff;
+    color: #606266;
 }
 
 .earch-btn-dropdown-popper .el-dropdown-menu .el-button--primary.is-disabled,

package/src/components/web/Form.vue

@@ -94,7 +94,7 @@
                             <div style="height: 34px;"> </div>
                         </template>
                         <!--分组-->
-                        <el-collapse v-else-if="model.collapse.length>0" v-model="model.collapseActiveNames"
+                        <el-collapse v-else-if="model.collapse.length > 0" v-model="model.collapseActiveNames"
                             :class="model.flagHideSaveLine ? 'el-collapse-saveLine' : ''">
                             <template v-for="(item, index) in model.collapse" :key="index">
                                 <el-collapse-item v-if="item.show !== false" :title="item.controlLabel" :name="index"
@@ -102,7 +102,7 @@
                                     <template #title>
                                         <i class="sign"></i>
                                         <span :class="[item.required ? 'requiredLabel' : '']">{{ item.controlLabel
-                                            }}</span>
+                                        }}</span>
                                         <span v-html="item.sufLabel1"></span>
                                     </template>
 
@@ -211,7 +211,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { ref, nextTick, onUpdated, onDeactivated, onMounted, onBeforeUnmount } from 'vue'
+import { ref, nextTick, onUpdated, onDeactivated, onMounted, onBeforeUnmount,provide } from 'vue'
 import { RouterClickHandler } from '../../utils/mixins';
 import common from '../../utils/common'
 import Form from '../../loader/src/Form'
@@ -229,6 +229,10 @@ const props = defineProps({
     parentModel: Object,
     parentModelForm: Object,
     pageWidth: Number,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
     topHeight: {
         type: Number,
         default: -1
@@ -301,6 +305,7 @@ const translateX = ref(0)
 
 const qrtimer1 = ref(null)
 const qrtimer2 = ref(null)
+provide('appRootUrl', props.appRootUrl)
 onBeforeUnmount(() => {
     if (model.value && typeof model.value.scripts !== 'undefined') {
         model.value.scripts.formData.form = null;
@@ -361,11 +366,11 @@ function init() {
         }
         if (typeof props.api !== 'undefined') {
             //根据接口获取数据
-            Form.loadFormApi(props.api, load, props.apiParam, failLoad, false);
+            Form.loadFormApi(props.api, load, props.apiParam, failLoad, false,props.appRootUrl);
         }
         else if (typeof props.source !== 'undefined') {
             //根据modelFrom获取数据
-            load(Form.loadFromModel(props.source));
+            load(Form.loadFromModel(props.source,false,props.appRootUrl));
         }
         else if (props.vmodel) {
             load(props.vmodel);
@@ -379,7 +384,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
+    model.value.appendToBody = props.appendToBody
     if (model.value.scripts) {
         model.value.scripts.formData = model.value.formData;
         model.value.scripts.formData.form = model.value;
@@ -782,7 +787,7 @@ function buttonsWidth() {
 // 点击后让激活 Tab 居中
 async function tabClick(pane: TabsPaneContext) {
     if (props.openType == 'detail') {
-        window.localStorage.setItem(tabActiveNameKey.value, model.value.collapse[event.index].fieldName1);//存储
+        window.localStorage.setItem(tabActiveNameKey.value, model.value.collapse[pane.index].fieldName1);//存储
     }
     await nextTick()          // 等 DOM 更新完再取节点
     const navWrapScroll = document.querySelector('.el-tabs__nav-scroll') as HTMLElement

package/src/components/web/FormList.vue

@@ -131,7 +131,7 @@
                         </el-table-column>
                     </template>
                     <template v-for="(v, i) in model.rows[0].field" :key="i">
-                        <el-table-column :prop="v.fieldName1" :label="v.controlLabel" :width="v.width"
+                        <el-table-column :prop="v.fieldName1" :label="v.controlLabel" :width="v.width" :sortable="v.autoSearch" :sort-method="(a, b) => columnSort(a, b, v.fieldName1)" 
                             :fixed="model.frozenColumns.includes(v.fieldName1)"
                             v-if="v.show !== false && v.controlType !== Enum.ControlType.Group">
                             <template #header="{ column, $index }">
@@ -636,6 +636,15 @@ function onMoveEnd(event) {
     model.value._rows = [...pushNewArr, ...deleteItem];
 
 }
+// 动态列排序方法
+const columnSort = (a, b, prop) => {
+  // 取当前列的值
+  let valueA = (a[prop].code1 || '').trim().toUpperCase()
+  let valueB = (b[prop].code1 || '').trim().toUpperCase()
+
+  // 英文 A-Z 排序
+  return valueA.localeCompare(valueB)
+}
 defineExpose({
     model
 })

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

@@ -1,14 +1,16 @@
 <template>
     <div :style="{ position: pageType == 'Form' ? 'relative' : '' }">
-        <ct-searchlist ref="detailSearchlist" v-if="pageType == 'SearchList'" :searchConditionApi="rowSelectRouter.actionForSearchLayout"
-            :searchStatsApi="rowSelectRouter.actionForSearchStats" :searchDataApi="rowSelectRouter.actionForSearch" :apiParam="apiParam"
-            :pageHeight="listHeight + 'px'">
+        <ct-searchlist ref="detailSearchlist" v-if="pageType == 'SearchList'"
+            :searchConditionApi="rowSelectRouter.actionForSearchLayout"
+            :searchStatsApi="rowSelectRouter.actionForSearchStats" :searchDataApi="rowSelectRouter.actionForSearch"
+            :apiParam="apiParam" :appRootUrl="appRootUrl" :pageHeight="listHeight + 'px'">
         </ct-searchlist>
 
         <div ref="detailForm" v-if="pageType == 'Form'" style="overflow: auto;"
             :style="{ height: (listHeight - 5) + 'px' }">
-            <ct-form :api="rowSelectRouter.action" :pageStyle="rowSelectRouter.pageStyle" :apiParam="apiParam" @submit="submit" :flagScroll="'true'"
-                :drowerClose="drowerClose" :openType="'detail'" :listHeight="listHeight">
+            <ct-form :api="rowSelectRouter.action" :appRootUrl="appRootUrl" :pageStyle="rowSelectRouter.pageStyle"
+                :apiParam="apiParam" @submit="submit" :flagScroll="'true'" :drowerClose="drowerClose"
+                :openType="'detail'" :listHeight="listHeight">
             </ct-form>
         </div>
 
@@ -20,7 +22,7 @@ import { ref } from 'vue'
 const emit = defineEmits(['submit'])
 const props = defineProps({
     vmodel: Object,
-    rowSelectRouter:Object,
+    rowSelectRouter: Object,
     apiParam: Object,
     parentModel: Object,
     pageType: String,
@@ -29,8 +31,12 @@ const props = defineProps({
     top: Number,
     drowerClose: String,
     listHeight: Number,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
 })
-const detailSearchlist=ref()
+const detailSearchlist = ref()
 
 
 function submit(modelForm, responseData) {
@@ -40,7 +46,3 @@ defineExpose({
     detailSearchlist
 })
 </script>
-
-
-
-

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

@@ -260,6 +260,10 @@ const props = defineProps({
     api: String,
     searchStatsApi: String,
     flagAppMode: Boolean,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
     apiParam: {
         type: Object,
         default: () => { }
@@ -394,7 +398,7 @@ function searchComplate(m, defaultSearch) {
                 searchEnd.value = Date.now();
                 isLoading.value = false;
                 tableLoading.value = false;
-            });
+            },null,props.appRootUrl);
         }
         if (typeof props.source !== "undefined") {
             load(SearchTable.loadSearchTableModel(props.source));
@@ -1299,7 +1303,7 @@ function refreshTableColumns(data) {
         searchStats = refTableStats.value.getsearchStats();
     }
     if (data) {
-        load(SearchTable.loadSearchTableModel(data, model.value.searchModel, false, props.api));
+        load(SearchTable.loadSearchTableModel(data, model.value.searchModel, false, props.api,null,props.appRootUrl));
     }
     else {
         if (refTableStats.value) {
@@ -1307,7 +1311,7 @@ function refreshTableColumns(data) {
             getPage(1, true);
         }
         else {
-            SearchTable.loadSearchTableApi(props.api, load, searchModel, true);
+            SearchTable.loadSearchTableApi(props.api, load, searchModel, true,null,null,null,props.appRootUrl);
         }
     }
     model.value.searchStats = searchStats;

package/src/components/web/SearchList.vue

@@ -5,17 +5,17 @@
             <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
                 <span style="font-weight:bold">{{ title }}</span>
             </div>
-            <SearchCategory v-if="searchCategoryApi" ref="refcategory" :api="searchCategoryApi"
+            <SearchCategory v-if="searchCategoryApi" ref="refcategory" :api="searchCategoryApi" :appRootUrl="appRootUrl"
                 @loadedCategory="categoryLoaded" @loadedCategoryError="categoryLoadedError"
                 @changeCategory="categorychange"></SearchCategory>
-            <ct-searchscreen ref="refScreen" :api="searchConditionApi" :key="reloadKey" v-if="flagShow"
-                @loaded="screenLoaded" @failLoad="screenfailLoad" :screenPara="screenPara" @resetSearch="resetSearch()"
-                :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut"
-                @showTitle="showTitleScreenHandler"></ct-searchscreen>
-            <searchTable ref="refTable" :api="searchDataApi" :key="reloadKey" :searchStatsApi="searchStatsApi"
-                :from="from" :isIframe="isIframe" :documentHeight="documentHeight" :documentWidth="documentWidth"
-                :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
-                :apiParam="apiParam" @searchComplate="searchComplate" @loaded="tableLoaded"
+            <ct-searchscreen ref="refScreen" :api="searchConditionApi" :appRootUrl="appRootUrl" :key="reloadKey"
+                v-if="flagShow" @loaded="screenLoaded" @failLoad="screenfailLoad" :screenPara="screenPara"
+                @resetSearch="resetSearch()" :categoryLoaded="loaded.categoryLoaded" @search="search()"
+                @saveShortcut="saveShortcut" @showTitle="showTitleScreenHandler"></ct-searchscreen>
+            <searchTable ref="refTable" :api="searchDataApi" :appRootUrl="appRootUrl" :key="reloadKey"
+                :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" :documentHeight="documentHeight"
+                :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop"
+                :flagAppMode="flagAppMode" :apiParam="apiParam" @searchComplate="searchComplate" @loaded="tableLoaded"
                 @rowClickHandle="rowClickHandle" @refreshRowHandle="refreshRowHandle" @scrollHandle="scrollHandle"
                 @refreshParent="refreshParentHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler"
                 @closeSideBar="closeSideBar" @popupClickHandler="popupClickHandler" :dragStartItem="dragStartItem"
@@ -26,12 +26,12 @@
         <div ref="refSidebar" v-if="flagSideBar && flagSideBarOfData"
             :style="{ 'height': pageHeight ? pageHeight : '100%', 'width': sideBarWidth + 'px', right: sideBarRight + 'px' }"
             class="sidebar">
-            <SearchSideRight :style="{ 'display': sideBarWidth && sideBarWidth > 0 ? 'block' : 'none' }" ref="RefSideRight"
-                :apiParam="sideBarApiParam" :pageType="sideBarPageType" :rowSelectRouter="rowSelectRouter"
-                :listHeight="listHeight" :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey"
-                :drowerClose="drowerClose" @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler"
-                @simpleRouterclickHandler="simpleRouterclickHandler" @closeSideHandler="closeSideHandler"
-                @submit="submitHandler"></SearchSideRight>
+            <SearchSideRight :style="{ 'display': sideBarWidth && sideBarWidth > 0 ? 'block' : 'none' }"
+                ref="RefSideRight" :apiParam="sideBarApiParam" :appRootUrl="appRootUrl" :pageType="sideBarPageType"
+                :rowSelectRouter="rowSelectRouter" :listHeight="listHeight" :selectIndex="selectIndex"
+                :rowCount="rowCount" :key="detailKey" :drowerClose="drowerClose" @clickNextHandler="clickNextHandler"
+                @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
+                @closeSideHandler="closeSideHandler" @submit="submitHandler"></SearchSideRight>
             <SearchSideMenu ref="refSideMenu" :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus"
                 @sideMenuClickHandler="sideMenuClickHandler"></SearchSideMenu>
         </div>
@@ -55,6 +55,10 @@ const props = defineProps({
     pageHeight: String,
     flagAppMode: Boolean,
     appID: String,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
     apiParam: {
         type: Object,
         default: () => { }
@@ -400,8 +404,8 @@ function rowClickHandle() {
             if (refTable.value.model.columnGroupId) {
                 sideBarApiParam.value.columnGroupId = refTable.value.model.columnGroupId;
             }
-             if (refTable.value.model.rowSelectRouter.flagAttachSearchCondition) {
-              sideBarApiParam.value["searchFields"] = refTable.value.model.getSearchData();
+            if (refTable.value.model.rowSelectRouter.flagAttachSearchCondition) {
+                sideBarApiParam.value["searchFields"] = refTable.value.model.getSearchData();
             }
             sideBarApiParam.value.actionType = refTable.value.model.rowSelectRouter.actionType;
             detailKey.value = detailKey.value + 1;

package/src/components/web/SearchScreen.vue

@@ -64,6 +64,10 @@ const props = defineProps({
     api: String,
     source: Object,
     vmodel: Object,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
     categoryLoaded: {
         type: Boolean,
         default: true
@@ -99,11 +103,11 @@ function searchComplate(flagLoad) {
         nextTick(function () {
             if (typeof props.api !== 'undefined') {
                 //根据接口获取数据
-                SearchScreen.loadSearchScreenApi(props.api, load, props.screenPara, props.prevParam, failLoad);
+                SearchScreen.loadSearchScreenApi(props.api, load, props.screenPara, props.prevParam, failLoad,props.appRootUrl);
             }
             else if (typeof props.source !== 'undefined') {
                 //根据modelFrom获取数据
-                load(SearchScreen.loadSearchScreenModel(props.source, props.prevParam));
+                load(SearchScreen.loadSearchScreenModel(props.source, props.prevParam,props.appRootUrl));
             }
             else if (props.vmodel) {
                 load(props.vmodel);

package/src/components/web/TextBox.vue

@@ -84,11 +84,17 @@ function input() {
     if (model.value.controlType === Enum.ControlType.MultiLineText || model.value.controlType === Enum.ControlType.TextBox) {
     }
     else {
-        change();
+        changeHandler(model.value, emit);
+        if (isEnterPressed.value) {
+            return;
+        }
+        if (props.from == 'tree') { emit('search'); }
     }
 }
 function change() {
-    changeHandler(model.value, emit);
+    if (!model.value.controlType === Enum.ControlType.NumericTextBox) {
+        changeHandler(model.value, emit);
+    }
     if (isEnterPressed.value) {
         return;
     }

package/src/components/web/Tree.vue

@@ -20,6 +20,10 @@ const loadTree = ref(false)
 const props = defineProps({
     searchConditionApi: String,
     searchDataApi: String,
+    appRootUrl: {
+        type: String,
+        default: ''
+    },
     flagsearch: Boolean,
     searchtreeHeight: {
         type: Number,

package/src/components/web/dialog.vue

@@ -18,9 +18,7 @@ const modelSelf = ref(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
 })

package/src/loader/src/Button.js

@@ -6,6 +6,15 @@ import Enum from '../../utils/Enum';
 const Button = function (source) {
     let rtn = {
         icon: '',
+        get code1() {
+            if (source.isCheckbox) {
+                if (source.subText == "1") {
+                    return true
+                }
+                return false
+            }
+            return false
+        },
         get bgColor() {
             // if (source.controlType == Enum.ControlType.ButtonReset) {
             //     return '#519DA6'

package/src/loader/src/Form.js

@@ -5,14 +5,14 @@ import Enum from '../../utils/Enum';
 import common from '../../utils/common';
 import request from '../../utils/request';
 
-function loadFormApi(api, callBack, apiParam, failCallBack, isFormList) {
+function loadFormApi(api, callBack, apiParam, failCallBack, isFormList, appRootUrl) {
   if (api) {
     apiParam = apiParam ? apiParam : {};
-    request.postHandler(common.globalUri(), { "action": api, "para": apiParam }).then(
+    request.postHandler(common.globalUri(), { "action": (appRootUrl||'') + api, "para": apiParam }).then(
       function (response) {
         if (response.rtnCode === Enum.ReturnCode.Successful) {
           let data = response.content;
-          let rtn = loadFromModel(data, isFormList);
+          let rtn = loadFromModel(data, isFormList, appRootUrl);
           if (callBack) {
             callBack(rtn);
           }
@@ -29,7 +29,7 @@ function loadFormApi(api, callBack, apiParam, failCallBack, isFormList) {
 
 
 
-function loadFromModel(source, isFormList) {
+function loadFromModel(source, isFormList, appRootUrl) {
   let rtn = {
     formData: {
       form: null,
@@ -37,6 +37,7 @@ function loadFromModel(source, isFormList) {
       excuteData: null,//fields
       fieldsDic: null,//fieldsDic
       _excuteListData: undefined,
+      appRootUrl: appRootUrl||'',
       enableRelationFields(FlagRelation) {
         this.form.enableRelationFields = FlagRelation
       },
@@ -673,6 +674,8 @@ function loadFromModel(source, isFormList) {
         if (source.buttons) {
           source.buttons.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
+            v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
+            v.action = (appRootUrl||'') + v.action;
             var button = Router(v);
             button.is = "ct-button";
             rtn._buttons.push(button);
@@ -692,6 +695,8 @@ function loadFromModel(source, isFormList) {
         if (source.captionBarButtons) {
           source.captionBarButtons.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
+            v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
+             v.action = (appRootUrl||'') + v.action;
             var button = Router(v);
             button.is = "ct-button";
             rtn._captionBarButtons.push(button);
@@ -711,6 +716,8 @@ function loadFromModel(source, isFormList) {
         if (source.links) {
           source.links.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
+            v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
+             v.action = (appRootUrl||'') + v.action;
             var button = Router(v);
             button.is = "ct-button";
             rtn._links.push(button);
@@ -730,6 +737,8 @@ function loadFromModel(source, isFormList) {
         if (source.actionRouters) {
           source.actionRouters.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
+            v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
+            v.action = (appRootUrl||'') + v.action;
             var button = Router(v);
             button.is = "ct-button";
             rtn._actionRouters.push(button);
@@ -740,7 +749,7 @@ function loadFromModel(source, isFormList) {
     },
     //参数取值的Action    
     get parameterAction() {
-      return source.parameterAction;
+      return (appRootUrl||'') + source.parameterAction;
     },
     _pageDisabled: false,
     get pageDisabled() {
@@ -924,6 +933,7 @@ function loadFromModel(source, isFormList) {
       }
     },
     getRtnRouter(v) {
+      v.action = (appRootUrl||'') + v.action;
       var button = Router(v);
       button.is = "ct-button";
       return button;