centaline-data-driven-v3 0.0.89 → 0.0.91

package/package.json

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

package/src/assets/commonApp.css

@@ -90,6 +90,7 @@
 
 .ct-serach-screen .screen-serach .title {
   font-size: 14px;
+  max-width: 90%;
 }
 
 .ct-serach-screen .screen-serach .color-EE6B6B {

package/src/components/Layout/LayoutMore.vue

@@ -4,7 +4,8 @@
             <span v-if="rowMenuDisplayCountForAPP == 1 && RouterlistMore.length > 0" style="font-size: 24px;font-weight:bold"
                 @click="clickmore">...</span>
             <template v-else>
-                <van-button v-for="(field, index) in Routerlist" :key="index" color="#999999" plain size="small"
+                <van-button v-for="(field, index) in Routerlist" :key="index" plain size="small"
+                :style="{ color: field.textColor ? field.textColor : '#999999', backgroundColor: field.bgColor ? field.bgColor : '#ffffff', borderColor: field.borderColor ? field.borderColor : '#cccccc' }"
                     @click="clickHandler(field)">{{ field.controlLabel }}</van-button>
                 <van-button v-if="RouterlistMore.length>0" color="#999999" plain size="small"
                     @click="clickmore">...</van-button>

package/src/components/app/ComboBox.vue

@@ -30,7 +30,7 @@
                 </div>
 
                 <van-search v-if="model.filterable" placeholder="请输入搜索内容" v-model="searchText"
-                    @update:model-value="searchInputHandle" />
+                    @update:model-value="searchInputHandle" autocomplete="off" />
                 <div style="height: 350px;overflow: scroll;">
                     <van-checkbox-group>
                         <template v-if="model.options.length > 0 && model.options[0].options">
@@ -61,7 +61,7 @@
                 </div>
 
                 <van-search v-if="model.filterable" placeholder="请输入搜索内容" v-model="searchText"
-                    @update:model-value="searchInputHandle" />
+                    @update:model-value="searchInputHandle" autocomplete="off" />
                 <div style="height: 400px;overflow: scroll;">
                     <van-checkbox-group shape="square" v-model="model.value">
                         <van-cell-group>
@@ -79,7 +79,7 @@
         </template>
         <template v-else>
             <van-search v-if="model.filterable" placeholder="请输入搜索内容" v-model="searchText"
-                @update:model-value="searchInputHandle" />
+                @update:model-value="searchInputHandle" autocomplete="off" />
             <div style="height: 350px;overflow: scroll;">
                 <van-checkbox-group>
                     <van-cell-group>

package/src/components/app/Form.vue

@@ -21,8 +21,7 @@
                 :border="false">
                 <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                     :parameterAction="model.parameterAction" v-bind="field.bindPara" @fieldClick="fieldClickHandler"
-                    @tableButtonClick="clickHandler"
-                    @change="changeHandler" />
+                    @tableButtonClick="clickHandler" @change="changeHandler" />
             </van-cell-group>
             <template v-if="model.collapse.length > 0">
                 <!--tabs-->
@@ -37,8 +36,7 @@
                                     <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                                         :parameterAction="model.parameterAction" v-bind="field.bindPara"
                                         @fieldClick="fieldClickHandler" @change="changeHandler"
-                                        @tableButtonClick="clickHandler"
-                                        @popupSearchList="popupSearchListHandler" />
+                                        @tableButtonClick="clickHandler" @popupSearchList="popupSearchListHandler" />
                                 </van-cell-group>
                             </van-tab>
                         </template>
@@ -49,17 +47,16 @@
                 <!--分组-->
                 <template v-else>
                     <van-cell-group v-for="(item, index) in model.collapse" :key="index">
-                        <template v-if="item.show !== false" v-for="(field, collapseIndex) in model.collapseFields[index + 1]"
-                            :key="collapseIndex">
+                        <template v-if="item.show !== false"
+                            v-for="(field, collapseIndex) in model.collapseFields[index + 1]" :key="collapseIndex">
                             <component ref="Fields" :is="field.is" v-if="field.show !== false" :vmodel="field"
                                 :parameterAction="model.parameterAction" v-bind="field.bindPara"
-                                @fieldClick="fieldClickHandler" @change="changeHandler"
-                                @tableButtonClick="clickHandler"
+                                @fieldClick="fieldClickHandler" @change="changeHandler" @tableButtonClick="clickHandler"
                                 @popupSearchList="popupSearchListHandler" />
                         </template>
                         <template #title v-if="item.show !== false">
-                            <span :class="[item.required ? 'requiredLabel' : '']">{{ item.controlLabel }}</span>
-                            <span v-html="item.sufLabel1"></span>
+                            <div :class="[item.required ? 'requiredLabel' : '']">{{ item.controlLabel }}</div>
+                            <div v-if="item.sufLabel1" style="margin-top: 5px;" v-html="item.sufLabel1"></div>
                         </template>
                     </van-cell-group>
                 </template>
@@ -71,8 +68,8 @@
                     :border="false">
                     <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                         :parameterAction="model.parameterAction" v-bind="field.bindPara" @fieldClick="fieldClickHandler"
-                        @tableButtonClick="clickHandler"
-                        @change="changeHandler" @popupSearchList="popupSearchListHandler" />
+                        @tableButtonClick="clickHandler" @change="changeHandler"
+                        @popupSearchList="popupSearchListHandler" />
                 </van-cell-group>
             </template>
             <div v-if="model.links.findIndex((v) => { return v.show }) > -1" style="padding: 0 10px;">
@@ -85,7 +82,7 @@
             <div class="safe-area-inset-bottom-height"></div>
         </div>
         <div class="button-absoluteAPP"
-            v-if="common.flagMicroMessenger() && model.buttons.findIndex((v) => { return v.show }) > -1">
+            v-if="(common.flagMicroMessenger() || common.flagHK()) && model.buttons.findIndex((v) => { return v.show }) > -1">
             <template v-for="(field, index) in model.buttons" :key="index">
                 <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                     :parameterAction="model.parameterAction" v-bind="field.bindPara" @fieldClick="clickHandler" />
@@ -178,7 +175,7 @@ function init() {
 function load(data) {
     model.value = data
     model.value.parentModelForm = props.parentModelForm
-    model.value.$vue = { fieldClickHandler, clickHandler, emit, getFormObj, getFileData, Form, validExcute, changeCallBackHandler, load, init, updateFields,loaded };
+    model.value.$vue = { fieldClickHandler, clickHandler, emit, getFormObj, getFileData, Form, validExcute, changeCallBackHandler, load, init, updateFields, loaded };
     if (model.value.scripts) {
         model.value.scripts.formData = model.value.formData;
         model.value.scripts.formData.form = model.value;
@@ -251,7 +248,7 @@ function setFormHeight() {
             h2 = refForm.value.offsetTop
         }
         let formHeight = h1 - h2
-        if (common.flagMicroMessenger()) {
+        if ((common.flagMicroMessenger()||common.flagHK())&&model.value.buttons.findIndex((v) => { return v.show }) > -1) {
             formHeight = formHeight - 64
         }
         model.value.formHeight = formHeight
@@ -284,11 +281,11 @@ function validExcute() {
                         }
                         setTimeout(function () {
                             if (f.$el.offsetParent) {
-                                var h1=0;
-                                if(!props.flagNavbar){
-                                    h1=46
+                                var h1 = 0;
+                                if (!props.flagNavbar) {
+                                    h1 = 46
                                 }
-                                refForm.value.scrollTop = f.$el.offsetTop + f.$el.offsetParent.offsetTop-h1
+                                refForm.value.scrollTop = f.$el.offsetTop + f.$el.offsetParent.offsetTop - h1
                             }
 
                         }, timeOut);

package/src/components/app/FormList.vue

@@ -131,6 +131,7 @@
 import { ref } from 'vue'
 import FormList from '../../loader/src/FormList'
 import { initData } from '../../utils/mixins';
+import Enum from '../../utils/Enum'
 import common from '../../utils/common'
 import util from '../../utils/pub-use'
 import draggable from "vuedraggable";
@@ -222,8 +223,27 @@ function deleteRow(index, sourceIndex) {
 //验证
 function fieldsValidExcute() {
     var rtnBool = true;
+    var i = 0;
+    var controlLabel = model.value.controlLabel;
+    //如果当前组件的controlLabel为空 取上一个分组组的controlLabel
+    if (!model.value.controlLabel) {
+        if (model.value.form && model.value.form.fields) {
+            const currentIndex = model.value.form.fields.findIndex(v => v.fieldName1 === model.value.fieldName1);
+            if (currentIndex - 1 >= 0) {
+                if (model.value.form.fields[currentIndex - 1].controlType == Enum.ControlType.Group){
+                    controlLabel = model.value.form.fields[currentIndex - 1].controlLabel;
+                }
+            }
+        }
+    }
     if (model.value.required) {
         if (model.value.tableData.length == 0) {
+            if (controlLabel) {
+                model.value.displayValidMessage = common.LocalizedString('请填写', '請填寫') + '[' + controlLabel + ']'
+            }
+            else {
+                model.value.displayValidMessage = '表格不能为空'
+            }
             return false;
         }
     }

package/src/components/app/PhotoSelectList.vue

@@ -8,11 +8,11 @@
             </div>
             <template v-if="imageList.length > 0">
                 <template v-if="layout">
-                    <div style="display: flex;" v-for="(item, index) in imageList" :key="index">
-                        <van-radio v-if="selectedMode == 1" @click="chooseRadio(item)" style="margin: 0 5px;"
+                    <div style="display: flex;" v-for="(item, index) in imageList" :key="index" @click="changeChoose(item,false)" >
+                        <van-radio v-if="selectedMode == 1" @click.stop="changeChoose(item,true)" style="margin: 0 5px;"
                             :checked="item.ischeck" icon-size="14px"></van-radio>
-                        <van-checkbox v-else style="margin: 0 5px;" @change="choose(item, true)" v-model="item.ischeck"
-                            shape="square" icon-size="14px"></van-checkbox>
+                        <van-checkbox v-else style="margin: 0 5px;" v-model="item.ischeck"
+                            shape="square" @click.stop="changeChoose(item,true)"  icon-size="14px"></van-checkbox>
                         <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey" :rowindex="index"
                             :flagMediaSelect="true" @rolRouterclick="rolRouterCellClickHandler">
                         </ct-layout>
@@ -163,6 +163,16 @@ function load(data) {
         });
     }
 }
+function changeChoose(item,flagCheckboxOrRadio){
+  if(!flagCheckboxOrRadio){
+    item.ischeck=!item.ischeck;
+  }
+  if(selectedMode.value==1){
+    chooseRadio(item)
+  }else{
+    choose(item,true);
+  }
+}
 // 点击选中图片
 function choose(item, flagCheckbox) {
     let chooseItem = common.deepClone(item);
@@ -227,11 +237,12 @@ function handleClick() {
 function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     if (routerKey == 'photoPreview') {
         viewerfile(imageList.value, rowindex)
+        event.stopPropagation();
     }
 }
 function viewerfile(list, index) {
 
-    var MediaAlbum = [{ albumName: model.value.label || "媒体", medias: [] as any }];
+    var MediaAlbum = [{ albumName: model.value.label || common.LocalizedString('媒体', '媒體'), medias: [] as any }];
 
     let fileList = list.filter((item) => {
         return item.flagDeleted !== true;
@@ -239,7 +250,7 @@ function viewerfile(list, index) {
     fileList.forEach((v) => {
         MediaAlbum[0].medias.push(v);
     });
-    common.viewerfile((model.value.label || "预览媒体"), MediaAlbum, 0, index, props.mediaViewPageType);
+    common.viewerfile((model.value.label || common.LocalizedString('预览媒体', '預覽媒體')), MediaAlbum, 0, index, props.mediaViewPageType);
 }
 function change(item) {
     showPicker.value = false;

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

@@ -9,15 +9,17 @@
         </div>
         <div ref="refTableParent" class="ct-tableParentAPP" :style="'height:' + model.tableHeight + 'px'"
             @scroll="scrollHandle($event)">
-            <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
+            <van-pull-refresh v-model="refreshing" @refresh="onRefresh"
+            :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'">
                     <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">
-                                <van-radio @click="selectRow(row)" icon-size="16px" checked-color="#EE6B6B"
-                                    :name="rowindex" :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"
@@ -28,11 +30,11 @@
                     </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">
+                            <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="selectRow(row)"></van-checkbox>
-                                    <div class="van-checkbox" v-else></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"
@@ -339,6 +341,7 @@ function rolRouterCellClickHandler(routerKey, rowindex, forname, forrowindex, fl
     }
     model.value.selectIndex = rowindex
     RouterClickHandler(field, submitData, action, model.value, 'table')
+    event.stopPropagation();
 }
 //toolButtons操作
 function toolbarClickHandler(field) {
@@ -388,21 +391,34 @@ function modeClickHandler() {
     selectCount.value = getSelectRowLength();
 }
 //选择行
-function selectRow(row) {
-    if (props.singleSelectio) {
-        model.value.listData.forEach((ro) => {
-            if (
-                !model.value.rightCheckBoxColumn ||
-                common.getDataOfUpperLower(ro, model.value.rightCheckBoxColumn) == 1
-            ) {
-                ro.$select = false
+function selectRow(row,rowIndex,flagCheckboxOrRadio) {
+    if(flagSelect(row)&&(isoperate.value || props.flagPopupSearchlist)){
+        if (props.singleSelectio) {
+            model.value.listData.forEach((ro) => {
+                if (
+                    !model.value.rightCheckBoxColumn ||
+                    common.getDataOfUpperLower(ro, model.value.rightCheckBoxColumn) == 1
+                ) {
+                    ro.$select = false
+                }
+            });
+        }
+        row.$select = !row.$select
+        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);
+                }
             }
-        });
+        }
+        SearchTable.setSelectAll(model.value);
+        SearchTable.getSelectAll(model.value);
+        selectCount.value = getSelectRowLength();
     }
-    row.$select = !row.$select
-    SearchTable.setSelectAll(model.value);
-    SearchTable.getSelectAll(model.value);
-    selectCount.value = getSelectRowLength();
 }
 function exit() {
     model.value.selectAll = false

package/src/components/app/Span.vue

@@ -94,10 +94,10 @@ function getLableShow() {
             labelShow = props.vmodel.getCheckedName();;
             break;
         case Enum.ControlType.Switch:
-            labelShow = props.vmodel.code1 ? '开启' : '关闭';
+            labelShow = props.vmodel.value ? '开启' : '关闭';
             break;
         case Enum.ControlType.CheckBox:
-            labelShow = props.vmodel.code1 ? '是' : '否';
+            labelShow = props.vmodel.value ? '是' : '否';
             break;
         default:
             break;

package/src/components/app/TextBox.vue

@@ -11,7 +11,7 @@
         <van-field clearable :type="model.inputType" :rows="model.rows" v-bind="model.attrs" v-model="model.code1"
             :readonly="model.readonly" :disabled="model.locked" :maxlength="model.maxValue1"
             :show-word-limit="model.showWordLimit" :label-align="model.inputType == 'textarea' ? 'top' : 'left'"
-            @input="changeHandler(model, emit)" class="ct-text">
+            @input="changeHandler(model, emit)" class="ct-text" autocomplete="off">
             <template #label v-if="model.showLabel && model.controlLabel">
                 <div :class="[model.required ? 'requiredLabel' : '']"
                     :style="model.isList ? 'white-space: nowrap' : ''">

package/src/components/app/dialog.vue

@@ -1,7 +1,7 @@
 <template>
     <van-popup :show="true" :z-index="zindex" position="right" :style="{ width: '100%', height: '100%' }">
         <van-nav-bar :title="vmodel.title" :left-arrow="true" @click-left="close" @click-right="onClickRight">
-            <template #right v-if="!common.flagMicroMessenger()">
+            <template #right v-if="!common.flagMicroMessenger()&&!common.flagHK()">
                 <template v-if="buttons.length == 1">
                     {{ buttons[0].controlLabel }}
                 </template>

package/src/components/app/searchScreen.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="ct-serach-screen" v-if="model">
         <div class="screen-serach" style="display: flex;flex-direction: row;">
-            <div style="display: flex; flex: 1;">
+            <div style="display: flex; flex: 1;overflow-x: auto;">
                 <van-dropdown-menu v-if="showScreen && screendata.length > 0" active-color="#EE6B6B"
                     style=" width: 100%;">
                     <van-dropdown-item v-for="(field, index) in screendata" :key="index" ref="Refitem"
@@ -25,25 +25,31 @@
                     </van-dropdown-item>
                     <van-dropdown-item v-if="ismore" key="4" title="更多" ref="RefitemMore" title-class="title"
                         class="screen-more" @open="openMore" @close="closeMore">
-                        <template v-for="(field, index) in model.screen" :key="index">
-                            <component v-if="field.show !== false" :is="field.is" :vmodel="field" ref="Fields"
-                                :parameterAction="model.parameterAction" />
-                        </template>
-                        <template v-for="(field, index) in model.highScreen" :key="index">
-                            <component v-if="field.show !== false" :is="field.is" :vmodel="field" ref="Fields"
-                                :parameterAction="model.parameterAction" />
-                        </template>
-                        <van-sticky position="bottom">
-                            <div style="padding: 5px 16px; display: flex;background-color: #ffffff;">
-                                <van-button color="#ECECEC" block @click="reset"
-                                    style="color:333333;margin-right: 10px;">
-                                    {{ getBtnLabel(Enum.ControlType.ButtonReset, '重置') }}
-                                </van-button>
-                                <van-button color="#FF5252" block @click="clickHandlerMore()">
-                                    {{ getBtnLabel(Enum.ControlType.ButtonSearch, '确定') }}
-                                </van-button>
+                        <div style="position: relative; height: 100%;">
+                            <template v-for="(field, index) in model.screen" :key="field.keyScreen">
+                                <template v-if="field.show !== false">
+                                    <component :is="field.is" :vmodel="field" ref="Fields"
+                                        :parameterAction="model.parameterAction" @change="changeHandler(field)" />
+                                </template>
+                            </template>
+                            <template v-for="(field, index) in model.highScreen" :key="field.keyScreen">
+                                <template v-if="field.show !== false" :key="field.keyScreen">
+                                    <component :is="field.is" :vmodel="field" ref="Fields"
+                                        :parameterAction="model.parameterAction" @change="changeHandler(field)" />
+                                </template>
+                            </template>
+                            <div style="position: sticky;bottom: 0;">
+                                <div style="padding: 5px 16px; display: flex;background-color: #ffffff;">
+                                    <van-button color="#ECECEC" block @click="reset"
+                                        style="color:333333;margin-right: 10px;">
+                                        {{ getBtnLabel(Enum.ControlType.ButtonReset, '重置') }}
+                                    </van-button>
+                                    <van-button color="#FF5252" block @click="clickHandlerMore()">
+                                        {{ getBtnLabel(Enum.ControlType.ButtonSearch, '确定') }}
+                                    </van-button>
+                                </div>
                             </div>
-                        </van-sticky>
+                        </div>
                     </van-dropdown-item>
                 </van-dropdown-menu>
             </div>
@@ -57,7 +63,8 @@
         </div>
         <div class="screen-condition" v-if="searchdata.length > 0">
             <van-dropdown-menu active-color="#323233">
-                <van-dropdown-item :title="'当前搜索条件：已选中' + searchdata.length + '个条件'">
+                <van-dropdown-item
+                    :title="common.LocalizedString('当前搜索条件：已选中' + searchdata.length + '个条件', '當前搜尋條件：已選中' + searchdata.length + '個條件')">
                     <van-row gutter="20" v-for="(field, index) in searchdata" :key="index">
                         <van-col span="6" style="text-align: right;">{{ field.controlLabel }}</van-col>
                         <van-col span="18">
@@ -81,14 +88,19 @@
                 </van-dropdown-item>
             </van-dropdown-menu>
         </div>
-        <van-action-sheet v-model:show="issort" :actions="actions" cancel-text="取消" @select="selectsort($event)"
-            :round="false" />
+        <van-action-sheet v-model:show="issort" cancel-text="取消" :round="false">
+            <template #default>
+                <button type="button" class="van-action-sheet__item" v-for="(v, i) in actions" :key="i"
+                    :style="{ 'background': v.code == sortCode ? '#f2f3f5' : '' }">
+                    <span class="van-action-sheet__name" @click="selectsort(v)">{{ v.name }}</span>
+                </button>
+            </template>
+        </van-action-sheet>
     </div>
 </template>
 <script setup lang="ts">
 import { ref, nextTick } from 'vue'
 import SearchScreen from '../../loader/src/SearchScreen'
-import Form from '../../loader/src/Form'
 import Enum from '../../utils/Enum'
 import common from '../../utils/common'
 const emit = defineEmits(['loaded', 'failLoad', 'showTitle', 'search', 'resetSearch', 'saveShortcut', 'sort'])
@@ -115,6 +127,7 @@ const screendata = ref([])
 const ismore = ref(false)
 const flagsort = ref(false)
 const sortname = ref('')
+const sortCode = ref('')
 const searchdata = ref([])
 const issort = ref(false)
 const actions = ref([])
@@ -145,6 +158,18 @@ function searchComplate(flagLoad) {
 //加载数据
 function load(data) {
     model.value = data;
+    if (model.value.scripts) {
+        model.value.scripts.formData = model.value.formData;
+        model.value.scripts.formData.form = model.value;
+        model.value.scripts.formData.excuteData = model.value.screen;
+        model.value.scripts.formData.fieldsDic = model.value.screenDic;
+    }
+    if (model.value.onload) {
+        let onloads = model.value.onload.split(';');
+        onloads.forEach((v) => {
+            common.excute.call(model.value.scripts, v);
+        });
+    }
     setScreenShow();
     setscreendata();
     emit('loaded', model.value.flagSearch);
@@ -179,7 +204,7 @@ function setscreendata() {
             v.controlType !== Enum.ControlType.LineFeed
         );
     });
-    if (screens.length > 4) {
+    if (screens.length > 1) {
         ismore.value = true;
         screens = screens.splice(0, 3);
     }
@@ -208,19 +233,18 @@ function search() {
 }
 //组件值发生变化时操作
 function changeHandler(field) {
-    if (field.is == 'ct-combobox') {
+    if (field.is == 'ct-combobox' && field.isList) {
         setsearchdata()
         search()
     }
-    SearchScreen.hiddenHandle(field, model.value);
-    Form.clearRelatedHandle(field, model.value.screen)
+    SearchScreen.changeHandler(field, model.value);
 }
 
 function open(field) {
     field.showLabel = false;
     field.isList = true;
     if (field.is == 'ct-combobox') {
-        field.getOptions(model.value.parameterAction, '',null, function (data) {
+        field.getOptions(model.value.parameterAction, '', null, function (data) {
             field.options = data
         })
     }
@@ -339,6 +363,7 @@ function getsortfield(field) {
 function selectsort(ev) {
     issort.value = false;
     sortname.value = "";
+    sortCode.value = ev.code
     if (ev.code) {
         sortname.value = ev.name;
     }

package/src/components/common/iframe.vue

@@ -5,7 +5,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, onBeforeUnmount } from 'vue'
 import common from '../../utils/common'
 const emit = defineEmits(['new', 'update', 'delete', 'refreshParent', 'closeDialog'])
 const props = defineProps({
@@ -13,6 +13,9 @@ const props = defineProps({
 })
 const refIframe = ref()
 const pageStyle=ref('')
+onBeforeUnmount(()=>{
+  window.removeEventListener('message', handleMessage);
+})
 Init()
 function Init(){
     if(common.flagApp()){

package/src/components/web/AIChat.vue

@@ -292,7 +292,7 @@ const getDistanceToBottom = () => {
 function getRefFieldJson() {
     let rtn = {};
     let router = props.router;
-    if (router.refFieldName) {
+    if (router?.refFieldName &&  props.form?.getFormObj) {
         let refFieldName = router.refFieldName.split(',');
         let submitData = props.form.getFormObj();
         if (refFieldName.length > 0 && submitData) {
@@ -524,7 +524,7 @@ const getTemplateType = (fullText) => {
                 rtn = "error";
                 outtext.value = (eventData.rtnMsg || fullText);
                 if (eventData.rtnCode == Enum.ReturnCode.Unauthorized) {
-                    if (common.getDataDrivenOpts().handler?.login) { 
+                    if (common.getDataDrivenOpts().handler?.login) {
                         common.getDataDrivenOpts().handler.login();
                     };
                 }

package/src/components/web/ComboBox.vue

@@ -27,7 +27,7 @@
             </el-select-v2>
             <template v-if="model.flagaFterText">
                 <el-input type="text" v-model="model.code2" v-bind="model.attrs" @change="changeHandler(model, emit)"
-                    :disabled="model.locked" :rows="model.rows" :readonly="model.readonly" autocomplete="on"
+                    :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                     :maxlength="model.maxValue1" :show-word-limit="model.showWordLimit" clearable
                     class="fieldControl ml10">
                 </el-input>
@@ -45,7 +45,7 @@
 </template>
 <script lang="ts" setup>
 import Axios from 'axios';
-import { ref, nextTick } from 'vue'
+import { ref, nextTick, onBeforeUnmount } from 'vue'
 import { Search } from '@element-plus/icons-vue'
 import { initData, changeHandler } from '../../utils/mixins';
 import common from '../../utils/common'
@@ -64,6 +64,16 @@ const nodatatext = ref('    ')
 model.value.itemKey=Math.random();
 let cancelTokenSource = null; // 用于存储取消令牌
 
+const qrtimer=ref(null)
+onBeforeUnmount(()=>{
+  model.value=null
+  refselect.value=null
+  if (qrtimer.value) {
+    clearTimeout(qrtimer.value);
+    qrtimer.value = null;
+  }
+})
+
 //下拉框出现/隐藏时触发
 function visibleChange(visible) {
     //是否有更多选择路由
@@ -74,7 +84,7 @@ function visibleChange(visible) {
         //出现获取数据
         if (visible) {
             open.value = true;
-            nodatatext.value = '加载中';
+            nodatatext.value = common.LocalizedString('加载中', '加載中');
             if (!model.value.filterable) {
                 getOptions('')
             }
@@ -142,12 +152,11 @@ function getOptions(key) {
 }
 // 防抖函数
 function debounce(func, delay) {
-    let timer = null;
     return function () {
         const context = this;
         const args = arguments;
-        clearTimeout(timer);
-        timer = setTimeout(() => {
+        if(qrtimer.value)clearTimeout(qrtimer.value);
+        qrtimer.value = setTimeout(() => {
             func.apply(context, args);
         }, delay);
     };