centaline-data-driven-v3 0.0.55 → 0.0.57

package/package.json

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

package/src/assets/commonWeb.css

@@ -452,11 +452,11 @@ body {
 .ct-searchtable .ct-tr {
   background-color: #ffffff;
   color: var(--centalineBlack);
+  cursor: default;
 }
 
 .ct-searchtable .ct-tr>.ct-td {
   padding: 2px 20px;
-  cursor: default;
   box-sizing: border-box;
 }
 

package/src/components/Layout/Layout.vue

@@ -18,7 +18,7 @@ const props = defineProps({
     listData: Array,
     apiParam: Object,
     parameterAction: String,
-    formListactionRouter:{
+    formListactionRouter: {
         type: Array,
         default: [],
     },
@@ -218,8 +218,13 @@ function xmlToJson(xml) {
                             }
                             else if (props.vmodel.delete && attribute.nodeValue == 'delete') {
                                 obj["rightRouter"] = true
+                            } 
+                            else if (props.vmodel.delete && attribute.nodeValue == 'moveup') {
+                                obj["rightRouter"] = true
+                            } 
+                            else if (props.vmodel.delete && attribute.nodeValue == 'movedown') {
+                                obj["rightRouter"] = true
                             } else {
-                                
                                 var actionRouter = props.formListactionRouter;
                                 if (actionRouter) {
                                     let field = actionRouter.find((b) => {

package/src/components/Layout/LayoutField.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :class="model.className" :style="model.styleObject">
+    <div :class="model.className" :style="model.styleObject" v-if="field">
         <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field" :actionRouter="actionRouter"
             :parameterAction="parameterAction" v-bind="field.bindPara" @change="changeHandler(field)" />
 

package/src/components/app/ContainerControl.vue

@@ -10,7 +10,6 @@
 </template>
 <script lang="ts" setup>
 import { ref } from 'vue'
-import common from '../../utils/common'
 import { initData } from '../../utils/mixins';
 import ContainerControl from '../../loader/src/ContainerControl';
 const emit = defineEmits(['click', 'change', 'fieldClick', 'popupSearchList'])
@@ -24,15 +23,12 @@ const Fields = ref()
 
 model.value.selfValidExcute = () => {
     let rtnBool = true;
-    if (typeof Fields !== 'undefined') {
+    if (typeof Fields.value !== 'undefined') {
         Fields.value.forEach((f) => {
-            if (typeof f.validExcute !== 'undefined') {
-                if (!f.validExcute(f.model)) {
+            if (f.model && typeof f.model.validExcute !== 'undefined') {
+                if (!f.model.validExcute(f.model)) {
+                    model.value.displayValidMessage=f.model.displayValidMessage
                     rtnBool = false;
-                    if (!model.controlLabel && f.model.controlLabel) {
-                        common.message('【' + f.model.controlLabel + '】不能为空！')
-                    }
-
                 }
             }
         });

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

@@ -10,9 +10,9 @@
         <div ref="refTableParent" class="ct-tableParentAPP" :style="'height:' + model.tableHeight + 'px'"
             @scroll="scrollHandle($event)">
             <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-                <van-list v-if="!tableError" v-model:loading="tableLoading" :error-text="common.LocalizedString('没有查到数据，点我刷新','沒有查到數據，點我刷新')"
-                    :finished="finished" @load="onLoad" :immediate-check="false"
-                    :style="'min-height:' + model.tableHeight + 'px'">
+                <van-list v-if="!tableError" v-model:loading="tableLoading"
+                    :error-text="common.LocalizedString('没有查到数据，点我刷新', '沒有查到數據，點我刷新')" :finished="finished"
+                    @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">
@@ -43,7 +43,7 @@
                         </van-checkbox-group>
                     </template>
                 </van-list>
-                <van-empty v-else :description="common.LocalizedString('没有查到数据','沒有查到數據')" />
+                <van-empty v-else :description="common.LocalizedString('没有查到数据', '沒有查到數據')" />
             </van-pull-refresh>
             <div v-if="isoperate || flagPopupSearchlist" style="height: 50px;"></div>
             <div class="safe-area-inset-bottom" style="background-color: #fafafa;"></div>
@@ -59,7 +59,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">
@@ -71,7 +72,7 @@
                 </template>
                 <template v-else>
                     <van-button color="#EE6B6B" size="small" @click="confirmClickHandler()"
-                        style=" width: 25%;margin-left: 10px;">{{common.LocalizedString('确认','確認')}}</van-button>
+                        style=" width: 25%;margin-left: 10px;">{{ common.LocalizedString('确认', '確認') }}</van-button>
                 </template>
             </div>
         </div>
@@ -194,7 +195,7 @@ function load(data) {
         return v.key && v.show && (v.key.indexOf('New') > -1 || v.key.indexOf('new') > -1 || v.key.indexOf('Apply') > -1);
     })
     modeButtons.value = model.value.buttons.filter((v) => {
-        return v.disabled = true && !(v.key.indexOf('New') > -1 || v.key.indexOf('new') > -1 || v.key.indexOf('Apply') > -1)
+        return v.disabled && v.show && v.isMulti && !(v.key.indexOf('New') > -1 || v.key.indexOf('new') > -1 || v.key.indexOf('Apply') > -1)
     })
     modeButtons.value.forEach((v) => {
         v.name = v.controlLabel
@@ -386,6 +387,16 @@ function modeClickHandler() {
 }
 //选择行
 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
+            }
+        });
+    }
     row.$select = !row.$select
     SearchTable.setSelectAll(model.value);
     SearchTable.getSelectAll(model.value);

package/src/components/app/TextBox.vue

@@ -18,6 +18,9 @@
                     <span>{{ model.controlLabel }}</span>
                 </div>
             </template>
+            <template #extra v-if="model.sufLabel1">
+                    <span v-html="model.sufLabel1" style="margin-left: 5px;line-height: 32px;"></span>
+            </template>
             <template v-if="model.unitName1" #button>
                 {{ model.unitName1 }}
             </template>

package/src/components/web/Form.vue

@@ -9,6 +9,21 @@
 
             <!--可根据场景判断显示el-card还是el-main-->
             <component :is="model.showTitle ? 'el-main' : 'el-card'">
+                <!--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">
+                            <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
+                                :parameterAction="model.parameterAction" v-bind="col.bindPara" @change="changeHandler"
+                                @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
+                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
+                                @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
+                            </component>
+                        </el-col>
+                    </template>
+                </el-row>
+
                 <!--头部元素-->
                 <el-row v-if="model.collapseFields.length > 0">
                     <template v-for="(col, index) in model.collapseFields[0]" :key="index">
@@ -17,7 +32,7 @@
                             <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                 :parameterAction="model.parameterAction" v-bind="col.bindPara" @change="changeHandler"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
-                                @tableButtonClick="clickHandler"
+                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
                             </component>
                         </el-col>
@@ -26,7 +41,7 @@
                 <!--tabs-->
                 <el-tabs v-if="model.isHorizontalLayout" v-model="activeName">
                     <template v-for="(item, index) in model.collapse" :key="index">
-                        <el-tab-pane :label="item.controlLabel" :name="index.toString()" v-if="item.show !== false"
+                        <el-tab-pane :label="item.controlLabel" :name="index.toString()" :lazy="item.lazyLoad" v-if="item.show !== false"
                             :key="index">
                             <el-row>
                                 <template v-for="(col, i) in model.collapseFields[index + 1]" :key="i">
@@ -36,7 +51,8 @@
                                         <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                             :parameterAction="model.parameterAction" v-bind="col.bindPara"
                                             @change="changeHandler" @fieldClick="fieldClickHandler"
-                                            @popupSearchList="popupSearchListHandler" @tableButtonClick="clickHandler"
+                                            @popupSearchList="popupSearchListHandler"
+                                            @popupGroupList="popupGroupListHandler" @tableButtonClick="clickHandler"
                                             @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
                                         </component>
                                     </el-col>
@@ -66,7 +82,8 @@
                                         <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                             :parameterAction="model.parameterAction" v-bind="col.bindPara"
                                             @change="changeHandler" @fieldClick="fieldClickHandler"
-                                            @popupSearchList="popupSearchListHandler" @tableButtonClick="clickHandler"
+                                            @popupSearchList="popupSearchListHandler"
+                                            @popupGroupList="popupGroupListHandler" @tableButtonClick="clickHandler"
                                             @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
                                         </component>
                                     </el-col>
@@ -83,7 +100,7 @@
                             <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="model.parameterAction"
                                 v-bind="col.bindPara" @change="changeHandler" :key="itemKey"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
-                                @tableButtonClick="clickHandler"
+                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
                             </component>
                         </el-col>
@@ -162,7 +179,18 @@ const props = defineProps({
         String,
         default: '',
     },
+    isIframe: {
+      Boolean,
+      default: false,
+    },
+    relationParentFormFields: {
+      Array,
+      default: function () {
+        return [];
+      },
+    },
 })
+
 const itemKey = ref(1)
 const router = useRouter()
 const loading = ref(true)
@@ -205,6 +233,7 @@ function load(data) {
     model.value.parentModelForm = props.parentModelForm
     model.value.$vue = { fieldClickHandler, clickHandler, validExcute, emit, getFormObj, changeCallBackHandler, getFileData, Form, load, init, updateFields, itemKey };
     model.value.$vue.openType = props.openType
+    model.value.isIframe = props.isIframe
     if (model.value.scripts) {
         model.value.scripts.formData = model.value.formData;
         model.value.scripts.formData.form = model.value;
@@ -291,8 +320,8 @@ function validExcute() {
                         setTimeout(function () {
                             if (f.model.controlType == Enum.ControlType.List) {
                                 if (f.$el.offsetParent) {
-                                   let total = f.$el.offsetParent.offsetTop;
-                                   document.querySelector(".ct-dialog_body").children[0].scrollTop = total-50;
+                                    let total = f.$el.offsetParent.offsetTop;
+                                    document.querySelector(".ct-dialog_body").children[0].scrollTop = total - 50;
                                 }
                             }
                             else {
@@ -357,6 +386,10 @@ function changeCallBackHandler(field, callBackFunName, callBackPara) {
 function popupSearchListHandler(singleSelectio, field, router, callBack) {
     Form.popupSearchListHandler(singleSelectio, field, router, model.value, Fields.value, props, callBack)
 }
+//弹出分组列表
+function popupGroupListHandler(field, router, callBack) {
+    Form.popupGroupListHandler(field, router, model.value, Fields.value, props, callBack)
+}
 function flagNotificationParentAfterContentChanged() {
     init();
 }

package/src/components/web/FormList.vue

@@ -135,7 +135,7 @@
                         </template>
                     </el-table-column>
                     <template #empty>
-                        {{common.LocalizedString('暂无数据','暫無數據')}}
+                        {{ common.LocalizedString('暂无数据', '暫無數據') }}
                     </template>
                 </el-table>
             </template>
@@ -177,9 +177,9 @@ model.value.parentModel = props.parentModel;
 model.value.parameterAction = props.parameterAction
 model.value.$vue = { insertOrUpdateRow, insertRow, delRow, deleteAll, insertSingleRow, itemKey };
 model.value.validExcute = () => {
-    var rtn=fieldsValidExcute();
-    if(!rtn){
-        model.value.displayValidMessage=common.LocalizedString('请填写','請填寫')+'['+model.value.controlLabel+']'
+    var rtn = fieldsValidExcute();
+    if (!rtn) {
+        model.value.displayValidMessage = common.LocalizedString('请填写', '請填寫') + '[' + model.value.controlLabel + ']'
     }
     return fieldsValidExcute();
 }
@@ -379,8 +379,8 @@ function getSummaries(param) {
 //验证
 function fieldsValidExcute() {
     var rtnBool = true;
-    if(model.value.required){
-        if(model.value.tableData.length==0){
+    if (model.value.required) {
+        if (model.value.tableData.length == 0) {
             return false;
         }
     }
@@ -400,7 +400,7 @@ function fieldsValidExcute() {
         }
 
     }
-    else if(Fields.value) {
+    else if (Fields.value) {
         Fields.value.forEach((f) => {
             if (f.model.validExcute) {
                 if (!f.model.validExcute()) {
@@ -473,6 +473,26 @@ function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
             emit('change', model.value);
         });
     }
+    else if (routerKey == 'moveup') {
+        if (rowindex === 0) {
+            model.value.tableData.push(model.value.tableData.shift());
+        } else {
+            const temp = model.value.tableData[rowindex - 1];
+            model.value.tableData[rowindex - 1] = model.value.tableData[rowindex];
+            model.value.tableData[rowindex] = temp;
+        }
+        onMoveEnd()
+    }
+    else if (routerKey == 'movedown') {
+        if (rowindex === model.value.tableData.length - 1) {
+            model.value.tableData.unshift(model.value.tableData.pop());
+        } else {
+            const temp = model.value.tableData[rowindex + 1];
+            model.value.tableData[rowindex + 1] = model.value.tableData[rowindex];
+            model.value.tableData[rowindex] = temp;
+        }
+        onMoveEnd()
+    }
     else {
         var router = model.value.buttons.find((v) => {
             return v.key === routerKey;
@@ -512,7 +532,7 @@ function onMoveEnd(event) {
 
 }
 defineExpose({
-  model
+    model
 })
 </script>
 <style scoped>

package/src/components/web/GroupList.vue

@@ -0,0 +1,36 @@
+<template>
+    <ct-field :vmodel="model">
+        <template #Control>
+           
+        </template>
+        <template #Sufbutton v-if="model.moreActionRouter">
+            <div style="margin-left: 5px;">
+                <el-button  size="small" type="primary" class="h26" @click="popupSearchListHandle">
+                    {{ model.moreActionRouter.controlLabel }}</el-button>
+            </div>
+        </template>
+    </ct-field>
+</template>
+<script lang="ts" setup>
+import { initData } from '../../utils/mixins';
+import GroupList from '../../loader/src/GroupList';
+const emit = defineEmits(['input', 'change', 'click','search','popupGroupList'])
+const props = defineProps({
+    parameterAction: String,
+    vmodel: Object,
+    source: Object,
+    from: {
+        type: String,
+        default: ''
+    },
+})
+const model = initData(props, GroupList)
+
+//弹出选择列表
+function popupSearchListHandle() {
+    emit('popupGroupList',model, model.value.moreActionRouter);
+}
+defineExpose({
+    model
+})
+</script>

package/src/components/web/NumberWithPlusAndMinus.vue

@@ -0,0 +1,110 @@
+<template>
+    <div class="ct-field">
+        <div class="el-form-item el-form-item--small">
+            <div class="el-form-item__label" v-if="model.showLabel && model.controlLabel">
+                <div class="requiredLabel">
+                    <span>{{ model.controlLabel }}</span>
+                </div>
+            </div>
+            <div class="fieldControl">
+                <el-input-number v-model="model.maxValue1" :min="1" :max="26" @change="handleChange" />
+            </div>
+        </div>
+    </div>
+    <template v-for="(item, index) in model.value" :key="index">
+        <div class="ct-field" style="margin-top: 10px;" v-if="!item.flagDeleted">
+            <div class="el-form-item el-form-item--small">
+                <div class="el-form-item__label">
+                    <div class="requiredLabel">
+                        <span
+                            style="background-color: #EE6B6B;width: 20px; height: 24px;display: block;line-height: 24px; text-align: center; border-radius: 5px;color: #ffffff;">{{
+                            item.code }}</span>
+                    </div>
+                </div>
+                <div class="fieldControl">
+                    <el-input v-model="item.name" placeholder="" @input="changeOption()" />
+                </div>
+                <span  class="sufLabel" style="background-color: #EE6B6B;border-radius: 50px;width: 20px;height: 20PX;text-align: center;color: #ffffff;cursor: pointer;" @click="handleDelete(item)"><el-icon><Minus /></el-icon></span>
+            </div>
+        </div>
+    </template>
+</template>
+<script lang="ts" setup>
+import { initData } from '../../utils/mixins';
+import NumberWithPlusAndMinus from '../../loader/src/NumberWithPlusAndMinus';
+const emit = defineEmits(['click', 'change', 'search'])
+const props = defineProps({
+    parameterAction: String,
+    vmodel: Object,
+    source: Object,
+})
+const model = initData(props, NumberWithPlusAndMinus)
+function handleChange() {
+    var count = model.value.maxValue1;
+    var rows = model.value.value;
+    const str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    var newRows = [];
+    for (let i = 0; i < count; i++) {
+        var item = {};
+        item['code'] = str[i];
+
+        var name = '';
+        var rowID = '';
+        if (i < rows.length) {
+            rowID = rows[i]['rowID'];
+            name = rows[i]['name'];
+        }
+
+        item['rowID'] = rowID;
+        item['name'] = name;
+        item['flagDeleted'] = false
+        newRows.push(item)
+    }
+    if(rows.length>count){
+        for (let i = rows.length; i > count; i--){
+            rows[i-1]['flagDeleted']=true
+            newRows.push(rows[i-1])
+        }
+    }
+    model.value.value = newRows;
+    model.value.code1 = newRows;
+}
+function changeOption() {
+    var data = model.value.value.filter((v) => {
+        return v.name != '';
+    });
+    model.value.code1 = data;
+}
+function handleDelete(ev){
+    ev['flagDeleted']=true
+    model.value.maxValue1--;
+    var count = model.value.maxValue1;
+    var rows = model.value.value.filter((v) => {
+        return !v.flagDeleted;
+    });
+    const str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    var newRows = [];
+    for (let i = 0; i < count; i++) {
+        var item = {};
+        item['code'] = str[i];
+
+        var name = '';
+        var rowID = '';
+        if (i < rows.length) {
+            rowID = rows[i]['rowID'];
+            name = rows[i]['name'];
+        }
+
+        item['rowID'] = rowID;
+        item['name'] = name;
+        item['flagDeleted'] = false
+        newRows.push(item)
+    }
+    newRows.push(ev)
+    model.value.value = newRows;
+    model.value.code1 = newRows;
+}
+defineExpose({
+    model
+})
+</script>

package/src/components/web/PopupGroupList.vue

@@ -0,0 +1,6 @@
+<template>
+
+</template>
+<script setup lang="ts">
+
+</script>

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

@@ -61,7 +61,8 @@
                         <template v-for="(row, rowindex) in model.listData" :key="rowindex">
                             <tr v-if="from == 'form' || pageRowMin <= rowindex && rowindex <= pageRowMax"
                                 :ref="el => getRowsRef(el, rowindex)" @click="rowClickHandle($event, rowindex)"
-                                class="ct-tr" :style="row.rowStyle">
+                                class="ct-tr" :style="row.rowStyle" :draggable="row.flagDrag == '1' ? true : false"
+                                @dragstart="onDragStart($event, row, null, 'table')">
 
                                 <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td"
                                     :class="[model.tdClass, rowindex === model.selectIndex ? 'select' : null,]"
@@ -85,9 +86,10 @@
                                             column.fixed === 'left' ? 'left-fixation' : null,
                                             column.width === undefined ? 'ct-table-auto' : null,
                                             column.fixed === 'right' ? 'right-fixation' : null,
-                                        ]" v-bind="column.attrs" @drop="drop($event, row, column, 'body')"
-                                        @dragover.prevent @dragenter="dragenter($event, column, 'body')"
-                                        @dragleave="dragleave($event, column, 'body')">
+                                        ]" v-bind="column.attrs" :draggable="column.paramName == 'drop' ? true : false"
+                                        @drop="drop($event, row, column, 'table')" @dragover.prevent
+                                        @dragenter="dragenter($event, column, 'table')"
+                                        @dragleave="dragleave($event, column, 'table')">
                                         <!--操作列-->
                                         <div v-if="column.id === 'operation'" class="div_allinline"
                                             :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
@@ -217,7 +219,7 @@
             style="margin-top: 10px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
             <el-button size="mini" @click="popupClickHandler()" class="max-search-btn" style="float:right;"
                 type="primary">
-                 {{common.LocalizedString('确认','確認')}}
+                {{ common.LocalizedString('确认', '確認') }}
             </el-button>
         </div>
         <div v-if="isLoading" v-loading="isLoading" style="top: 30px"></div>
@@ -237,7 +239,7 @@ import Tablecurrency from './Tablecurrency.vue';
 import SearchTable from '../../../loader/src/SearchTable'
 import { RouterClickHandler, RouterMouseenterHandler } from '../../../utils/mixins';
 import { ElMessage } from 'element-plus'
-const emit = defineEmits(['rowClickHandle', 'searchComplate', 'refreshRowHandle', 'simpleRouterRefreshHandler', 'loaded', 'scrollHandle', 'closeSideBar', 'refreshParent', 'popupClickHandler', 'drop'])
+const emit = defineEmits(['rowClickHandle', 'searchComplate', 'refreshRowHandle', 'simpleRouterRefreshHandler', 'loaded', 'scrollHandle', 'closeSideBar', 'refreshParent', 'popupClickHandler', 'drag'])
 const props = defineProps({
     vmodel: Object,
     api: String,
@@ -372,6 +374,7 @@ function searchComplate(m, defaultSearch) {
 function load(data) {
     model.value = data;
     model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage };
+    model.value.isIframe = props.isIframe
     //自动查询 调用合并列
     if (model.value.listData.length > 0) {
         if (model.value.rowMergedColumns.length > 0) {
@@ -1048,6 +1051,7 @@ function updateCurrentRow(router, data, flagSimple) {
         SearchTable.getCurrentRowApiData(model.value,
             function () {
                 itemKey.value = Math.random()
+                model.value.selectAll=false
                 emit("searchComplate");
                 if (data && !flagSimple) {
                     emit("simpleRouterRefreshHandler");
@@ -1145,11 +1149,11 @@ function refreshTableColumns(data) {
         load(SearchTable.loadSearchTableModel(data, model.value.searchModel, false, props.api));
     }
     else {
-        if (refTableStats.value){
+        if (refTableStats.value) {
             disabledStats.value = true;
             getPage(1, true);
         }
-        else{
+        else {
             SearchTable.loadSearchTableApi(props.api, load, searchModel, true);
         }
     }
@@ -1238,10 +1242,17 @@ function fiexdHead() {
         }
     });
 }
+// 拖拽开始事件
+function onDragStart(event, row, column, name) {
+    if (name == "table" && row.flagDrag == "1") {
+        emit("drag", row, column, 'drag');
+    }
+}
+
 function drop(e, row, column, name) {
     let routerKey = "edit";
     let submitData = {};
-    if (props.dragStartName == "top" && name == "body" && column.paramName == "drop") {
+    if (props.dragStartName == "top" && name == "table" && column.paramName == "drop") {
         var actionRouter = model.value.actionRouter;
         let field = actionRouter.find((b) => {
             return b.key === routerKey;
@@ -1276,18 +1287,17 @@ function drop(e, row, column, name) {
                 }
             });
 
-        if (name === "body") {
+        if (name === "table") {
             let el = e.target.nodeName.toLowerCase() == "td" ? e.target : getTDOfParents(e.target);
             removeClass(el, "dragEnterHover");
         }
     }
-
-    emit("drop", row, column);
-
+    emit("drag", row, column, 'drop');
 }
+
 function dragenter(e, column, name) {
     let el = e.target.nodeName.toLowerCase() == "td" ? e.target : getTDOfParents(e.target);
-    if (name === "body" && column.paramName == "drop") {
+    if (name === "table" && column.paramName == "drop") {
         addClass(el, "dragEnterHover");
     }
     dragenterEl.value = el;
@@ -1296,7 +1306,7 @@ function dragenter(e, column, name) {
 function dragleave(e, column, name) {
     let el = e.target.nodeName.toLowerCase() == "td" ? e.target : getTDOfParents(e.target);
     // 目标节点的背景色恢复原样
-    if (name === "body" && dragenterEl.value != el) {
+    if (name === "table" && dragenterEl.value != el) {
         removeClass(el, "dragEnterHover");
     }