centaline-data-driven-v3 0.0.72 → 0.0.74

package/package.json

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

package/src/assets/commonWeb.css

@@ -1044,4 +1044,21 @@ body {
   background-color: #ed745f;
 }
 
+.ct-location .el-location-input{
+  border: 1px solid var(--bagGray);
+  line-height: 24px;
+  padding-left: 5px;
+  color: var(--centalineBlue);
+  border-radius: 6px !important;
+  font-size: inherit;
+ }
+ .ct-location .el-location-input:hover{
+  border-color: var(--centalineBlue);
+ }
+ .ct-location .el-location-input:focus{
+  outline:0;
+ }
+ .h26{
+  height: 26px;
+}
 /*elementPlus样式重置结束*/

package/src/components/app/PhotoSelectList.vue

@@ -9,10 +9,12 @@
             <template v-if="imageList.length > 0">
                 <template v-if="layout">
                     <div style="display: flex;" v-for="(item, index) in imageList" :key="index">
-                        <van-checkbox style="margin: 0 5px;" @change="choose(item, true)" v-model="item.ischeck"
+                        <van-radio v-if="selectedMode == 1" @click="chooseRadio(item)" 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>
-                        <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey"  :rowindex="index" :flagMediaSelect="true"
-                            @rolRouterclick="rolRouterCellClickHandler">
+                        <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey" :rowindex="index"
+                            :flagMediaSelect="true" @rolRouterclick="rolRouterCellClickHandler">
                         </ct-layout>
                     </div>
                 </template>
@@ -39,13 +41,14 @@
                 </template>
             </template>
             <template v-else>
-                <van-empty :description="common.LocalizedString('没有数据','沒有數據')" />
+                <van-empty :description="common.LocalizedString('没有数据', '沒有數據')" />
             </template>
         </div>
         <div class="PhotoSelectList-bottom">
-            <van-checkbox @change="allchoose" v-model="allcheck" shape="square" icon-size="14px">{{common.LocalizedString('全选','全選')}}</van-checkbox>
+            <van-checkbox v-if="selectedMode != 1"  @change="allchoose" v-model="allcheck" shape="square"
+                icon-size="14px">{{ common.LocalizedString('全选', '全選') }}</van-checkbox>
             <van-button type="primary" class="van-button-app" size="small" style="display: flex;margin-left: 30%;"
-                @click="handleClick()">{{common.LocalizedString('确定','確認')}}</van-button>
+                @click="handleClick()">{{ common.LocalizedString('确定', '確認') }}</van-button>
         </div>
     </div>
     <van-popup v-model:show="showPicker" position="bottom" :safe-area-inset-bottom="true">
@@ -68,7 +71,7 @@ import { ElMessage } from 'element-plus'
 import common from '../../utils/common'
 import util from '../../utils/pub-use'
 import PhotoSelectList from '../../loader/src/PhotoSelectList';
-const emit = defineEmits(['handlePhoto','loaded', 'failLoad'])
+const emit = defineEmits(['handlePhoto', 'loaded', 'failLoad'])
 const props = defineProps({
     Selected: Array,
     api: String,
@@ -89,6 +92,7 @@ const itemKey = ref(0)
 const mediaLabelID = ref('')
 const mediaLabelName = ref('全部')
 const options = ref([])
+const selectedMode = ref(2)
 onMounted(() => {
     nextTick(function () {
         showLoadingToast({ message: '', duration: 10000 });
@@ -115,6 +119,9 @@ function load(data) {
             layout.value = data.source.content.layout;
             paramName.value = data.source.content.paramName;
             sourceRows = common.deepClone(data.source.content.mediaList);
+            if (data.source.content.selectedMode) {
+                selectedMode.value = data.source.content.selectedMode
+            }
         }
         else {
             sourceRows = common.deepClone(data.source.content);
@@ -188,6 +195,16 @@ function choose(item, flagCheckbox) {
         item.ischeck = false;
     }
 
+}
+function chooseRadio(item) {
+    let chooseItem = common.deepClone(item);
+    chooseList.value = [];
+    imageList.value.forEach((v) => {
+        v.ischeck = false;
+    });
+    item.ischeck = true;
+    chooseList.value.push(chooseItem);
+
 }
 function allchoose() {
     chooseList.value = [];

package/src/components/web/Button.vue

@@ -69,6 +69,7 @@ const props = defineProps({
     vmodel: Object,
     source: Object,
     flagAppMode: Boolean,
+    parentModel: Object,
 })
 const model = initData(props, Button)
 if (model.value.controlType == Enum.ControlType.ButtonAdvancedSearch) {
@@ -95,24 +96,35 @@ const headers = computed(() => {
     return common.getDataDrivenOpts().handler.getRequestHeaders();
 })
 function clickHandle() {
-    emit('fieldClick', model.value);
+  emit('fieldClick', model.value);
 }
 
 function handleAvatarBeforeUpload(file) {
-    if (model.value.form && model.value.form.$vue) {
-        let submitData = model.value.form.$vue.getFileData(model.value);
-        for (var key in submitData) {
-            if (typeof submitData[key] === "object") {
-                uploadData.value[key] = JSON.stringify(submitData[key]);
-            }
-            else {
-                uploadData.value[key] = submitData[key];
-            }
-        }
+  if (model.value.form && model.value.form.$vue) {
+    let submitData = model.value.form.$vue.getFileData(model.value);
+    for (var key in submitData) {
+      if (typeof submitData[key] === "object") {
+        uploadData.value[key] = JSON.stringify(submitData[key]);
+      }
+      else {
+        uploadData.value[key] = submitData[key];
+      }
+    }
+  }
+  if(props.parentModel && props.parentModel.is && props.parentModel.is=="ct-formlist" && props.parentModel.form && props.parentModel.form.$vue){
+    let submitData = props.parentModel.form.$vue.getFileData(model.value);
+    for (var key in submitData) {
+      if (typeof submitData[key] === "object") {
+        uploadData.value[key] = JSON.stringify(submitData[key]);
+      }
+      else {
+        uploadData.value[key] = submitData[key];
+      }
     }
+  }
 }
 function handleAvatarSuccess(res) {
-    emit('importComplete', res, model.value);
+  emit('importComplete', res, model.value);
 }
 function handleAvatarError(info) {
     ElMessage({
@@ -129,8 +141,8 @@ function dropClick() {
     }
 }
 function commandClick(code) {
-    model.value.selectOptionCode = code;
-    emit('fieldClick', model.value);
+  model.value.selectOptionCode = code;
+  emit('fieldClick', model.value);
 }
 </script>
 <style scoped>

package/src/components/web/Form.vue

@@ -16,7 +16,7 @@
                         <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" :fileData="getFileData(col)"
-                                @change="changeHandler" @importComplete="importComplete"
+                                @change="changeHandler" @importComplete="importComplete" @popupLocation="popupLocationHandler"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                 @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler" 
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -32,7 +32,7 @@
                         <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"  :fileData="getFileData(col)"
-                                @change="changeHandler" @importComplete="importComplete"
+                                @change="changeHandler" @importComplete="importComplete" @popupLocation="popupLocationHandler"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                 @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -52,7 +52,7 @@
                                     <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px">
                                         <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                             :parameterAction="model.parameterAction" v-bind="col.bindPara" :fileData="getFileData(col)"
-                                            @change="changeHandler" @fieldClick="fieldClickHandler"
+                                            @change="changeHandler" @fieldClick="fieldClickHandler" @popupLocation="popupLocationHandler"
                                             @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
                                             @popupGroupList="popupGroupListHandler" @tableButtonClick="clickHandler"
                                             @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -83,7 +83,7 @@
                                     <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px">
                                         <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                             :parameterAction="model.parameterAction" v-bind="col.bindPara" :fileData="getFileData(col)"
-                                            @change="changeHandler" @fieldClick="fieldClickHandler"
+                                            @change="changeHandler" @fieldClick="fieldClickHandler" @popupLocation="popupLocationHandler"
                                             @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
                                             @popupGroupList="popupGroupListHandler" @tableButtonClick="clickHandler"
                                             @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -102,7 +102,7 @@
                             <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="model.parameterAction"
                                 v-bind="col.bindPara" @change="changeHandler" :key="itemKey" :fileData="getFileData(col)"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
-                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
+                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler" @popupLocation="popupLocationHandler"
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
                             </component>
                         </el-col>
@@ -353,6 +353,9 @@ function validExcute() {
                                     }
                                     else if (f.$el.offsetParent.offsetParent.offsetParent.classList[0] === 'ct-dialog_wrapper') {
                                         total = f.$el.offsetTop;
+                                        if(f.$el.offsetParent){
+                                            total+=f.$el.offsetParent.offsetTop
+                                        }
                                         document.querySelector(".ct-dialog_body").children[0].scrollTop = total;
                                     }
                                     else if (f.$el.offsetParent.offsetParent.offsetParent.localName === "body") {
@@ -413,6 +416,14 @@ function importComplete(res, field) {
             .catch(() => {
             });
     }
+    else if(res && res.rtnCode && res.rtnCode === 200 && res.rtnMsg){
+      ElMessage({
+          message: res.rtnMsg,
+          type: 'success',
+          showClose: true,
+      });
+    }
+
     if (field.flagAsync) {
         if (res.rtnCode && res.rtnCode === 202 && res.rtnMsg) {
             common.confirm(res.rtnMsg, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
@@ -448,8 +459,13 @@ function importComplete(res, field) {
                                             type: 'success',
                                             showClose: true,
                                         });
+                                    }                                    
+                                    if (field && field.callBackFunName) {
+                                      changeCallBackHandler(field, field.callBackFunName, data.content);
+                                    }
+                                    else {
+                                      Form.doAction(data);
                                     }
-                                    getPage(1, false);
                                 },
                                 onError(data) {
                                     common.closeDialog(dialogOption);
@@ -501,7 +517,12 @@ function importComplete(res, field) {
                                         showClose: true,
                                     });
                                 }
-                                getPage(1, false);
+                                if (field && field.callBackFunName) {
+                                  changeCallBackHandler(field, field.callBackFunName, data.content);
+                                }
+                                else {
+                                  Form.doAction(data);
+                                }
                             },
                             onError(data) {
                                 common.closeDialog(dialogOption);
@@ -523,13 +544,16 @@ function importComplete(res, field) {
           changeCallBackHandler(field, field.callBackFunName, res.content);
         }
         else {
-           model.doAction(res)
+          Form.doAction(res)
         }
     }
 }
 //弹出选择列表
 function popupSearchListHandler(singleSelectio, field, router, callBack) {
-    Form.popupSearchListHandler(singleSelectio, field, router, model.value, Fields.value, props, callBack)
+  Form.popupSearchListHandler(singleSelectio, field, router, model.value, Fields.value, props, callBack)
+}
+function popupLocationHandler(field, router, callBack) {
+  Form.popupLocationHandler(field, router, callBack,model.value,props);
 }
 //弹出分组列表
 function popupGroupListHandler(field, router, callBack) {

package/src/components/web/FormList.vue

@@ -72,18 +72,27 @@
                     <h5>{{ model.controlLabel }}</h5>
                 </div>
                 <div class="list-button">
-                    <component v-if="model.selectRouter !== null" :is="model.selectRouter.is"
-                        :vmodel="model.selectRouter" @click="popupSearchListHandle(model.selectRouter)"></component>
-                    <el-button v-if="model.create" :disabled="model.disabled" class="btn-add" type="success"
-                        style="width: auto;" size="small" :icon="CirclePlus" @click="addRow">
-                        {{ model.createText }}
-                    </el-button>
+                  <template v-if="!model.tableDisabled">
+                    <ul>
+                      <li v-for="(v,i) in model.toolButtonsShow" >
+                        <component :is="v.is" :vmodel="v" :parentModel="model" @fieldClick="toolButtonsClick" @importComplete="importComplete" @change="toolButtonsChangeHandler(v,$event)"></component>
+                      </li>
+                      <li v-if="model.selectRouter!==null">
+                        <component :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle(model.selectRouter)"></component>                        
+                      </li>
+                      <li v-if="model.create">
+                        <el-button :disabled="model.disabled" class="btn-add" type="success" style="width: auto;" size="small" :icon="CirclePlus" @click="addRow">
+                          {{ model.createText }}
+                        </el-button>                    
+                      </li>
+                    </ul>
+                  </template>
                 </div>
                 <el-table :data="model.tableData" border :show-summary="model.showSummary"
                     :summary-method="getSummaries" style="width: 100%" highlight-current-row>
                     <template v-if="model.rowActionRoutersAlign === 1">
                         <el-table-column label="操作"
-                            v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0"
+                            v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)"
                             :width="'100%'">
                             <template #header="{ column, $index }">
                                 {{ setcolumnminWidth(column) }}
@@ -104,13 +113,9 @@
                                     @click="saveRow(scope.row, scope.$index, false)"
                                     style="cursor: pointer;">取消</el-tag>
                                 <template v-for="(v, i) in model.buttons">
-                                    <el-tag
-                                        v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
-                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}
-                                        1</el-tag>
-
+                                    <el-tag v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
+                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}</el-tag>
                                 </template>
-
                             </template>
                         </el-table-column>
                     </template>
@@ -146,7 +151,7 @@
                     </template>
                     <template v-if="model.rowActionRoutersAlign !== 1">
                         <el-table-column label="操作"
-                            v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0"
+                            v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)"
                             :width="'100%'">
                             <template #header="{ column, $index }">
                                 {{ setcolumnminWidth(column) }}
@@ -167,13 +172,9 @@
                                     @click="saveRow(scope.row, scope.$index, false)"
                                     style="cursor: pointer;">取消</el-tag>
                                 <template v-for="(v, i) in model.buttons">
-                                    <el-tag
-                                        v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
-                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}
-                                        1</el-tag>
-
+                                    <el-tag v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
+                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}</el-tag>
                                 </template>
-
                             </template>
                         </el-table-column>
                     </template>
@@ -494,7 +495,7 @@ function setcolumnminWidth(column) {
 function buttonClick(row, button) {
     var submitData = {};
     button.submitFormField.forEach((v) => {
-        submitData[v] = row[v].code1;
+        submitData[v] = common.getDataOfUpperLower(row,v).code1;
     });
     model.value.currentRowIndex = model.value.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex);
 
@@ -503,6 +504,15 @@ function buttonClick(row, button) {
 function rolRouterClickHandler(field, rowData,rowindex) {
   buttonClick(rowData, field);
 }
+function toolButtonsClick(field) {
+  emit('tableButtonClick', field, null);
+}
+function toolButtonsChangeHandler(field) {
+  emit('change', field);
+}
+function importComplete(res, button) {
+  emit('importComplete', res, button);
+}
 function insertOrUpdateRow(row) {
     FormList.insertOrUpdateRow(row, true, model.value);
 }
@@ -613,7 +623,10 @@ defineExpose({
     padding: 10px;
     width: 100%;
 }
-
+.list-button ul li {
+    margin-right: 5px;
+    float: left;
+}
 
 .ct-form-repeat .list-title {
     padding-bottom: 5px;

package/src/components/web/Location.vue

@@ -1,20 +1,18 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <div v-if="model !== null" class="ct-location" style="width:100%;display:flex">
-            <div
-                class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
+            <div v-if="model !== null" class="ct-location" style="display:flex">
+            <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
                 <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
                     <div slot="prepend" class="label-ellipsis" :class="[model.labelClass]" :title="model.label">
                         {{ model.label }}
                     </div>
                 </div>
-                <div style="display:inline-flex;padding-left:0px;" v-bind="model.attrs"
-                    :class="model.locked ? 'ct-is-disabled' : ''">
+                <div style="display:inline-flex;padding-left:0px;" v-bind="model.attrs" :class="model.locked ? 'ct-is-disabled' : ''">
                     <input style="text-align:left;width:100%" class="el-location-input hoverColor"
-                        :placeholder="model.attrs.placeholder1" v-model="model.value" @change="changeModel($event)" />
+                        :placeholder="model.attrs.placeholder1" v-model="model.code1" @change="changeModel($event)" />
                     <input style="text-align:left;width:100%;margin-left:5px;" class="el-location-input hoverColor"
-                        :placeholder="model.attrs.placeholder2" v-model="model.value1" @change="changeModel($event);" />
+                        :placeholder="model.attrs.placeholder2" v-model="model.code2" @change="changeModel($event);" />
                 </div>
             </div>
         </div>
@@ -22,10 +20,10 @@
         <template #Sufbutton v-if="model !== null&&model.moreActionRouter">
             <div v-if="model.moreActionRouter" style="display: inline-block;margin-left: 5px;">
                 <img v-if="model.moreActionRouter.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem"
-                    :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.label"
+                    :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.controlLabel"
                     @click="popupLocationHandler($event)" />
                 <el-button v-else size="mini" type="primary" class="h26" @click="popupLocationHandler($event)">
-                    {{ model.moreActionRouter.label }}
+                    {{ model.moreActionRouter.controlLabel }}
                 </el-button>
             </div>
         </template>
@@ -39,16 +37,17 @@ const props = defineProps({
     vmodel: Object
 })
 const model = initData(props, Location)
+console.log(model.value);
 function popupLocationHandler() {
-    emit('popupLocation', model.value, model.value.moreActionRouter, (data) => {
-          if(data){
-            model.value.value=data.lng;
-            model.value.value1=data.lat;
-          }
-        });
+  emit('popupLocation', model.value, model.value.moreActionRouter, (data) => {
+    if(data){
+      model.value.value=data.lng;
+      model.value.value1=data.lat;
+    }
+  });
 }
 function changeModel() {
-    changeHandler(model.value, emit); 
+  changeHandler(model.value, emit); 
 } 
 defineExpose({
     model

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

@@ -238,7 +238,7 @@ import TableToolbar from './TableToolbar.vue';
 import Tabletip from './Tabletip.vue';
 import Tablecurrency from './Tablecurrency.vue';
 import SearchTable from '../../../loader/src/SearchTable'
-import { RouterClickHandler, RouterMouseenterHandler } from '../../../utils/mixins';
+import { RouterClickHandler } from '../../../utils/mixins';
 import { ElMessage } from 'element-plus'
 const emit = defineEmits(['rowClickHandle', 'searchComplate', 'refreshRowHandle', 'simpleRouterRefreshHandler', 'loaded', 'scrollHandle', 'closeSideBar', 'refreshParent', 'popupClickHandler', 'drag'])
 const props = defineProps({
@@ -685,7 +685,7 @@ function rowLayoutClickHandle(index) {
 }
 
 //表单列表操作
-function rolRouterClickHandler(field, rowData, rowindex, visible, columnName) {
+function rolRouterClickHandler(field, rowData, rowindex, visible, columnName,callBack,flagMouseenter) {
     field.rowindex = rowindex;
     if (refRowsPopover.value[rowindex]) {
         refRowsPopover.value[rowindex].hide();
@@ -717,42 +717,11 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName) {
         action = rowData[field.actionField];
     }
 
-    RouterClickHandler(field, submitData, action, model.value, 'table')
+    RouterClickHandler(field, submitData, action, model.value, 'table',callBack,flagMouseenter)
 }
 //表单列表操作
-function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName, callBack) {
-    field.rowindex = rowindex;
-    if (refRowsPopover.value[rowindex]) {
-        refRowsPopover.value[rowindex].hide();
-    }
-    if (field.isListenVoice) {
-        if (model.value.currentListenVoice) {
-            refRowsRouter.value[model.value.currentListenVoice].closeListenVoice()
-        }
-        model.value.currentListenVoice = visible ? 'router' + field.id + rowindex : '';
-    }
-
-    var submitData = {};
-    field.submitListField.forEach((k) => {
-        submitData[k] = rowData[k];
-    });
-
-    if (field.flagAttachSearchCondition) {
-        submitData["searchFields"] = model.value.getSearchData();
-    }
-    if (field.isCallTel) {
-        submitData.flagHaveAlert = visible || false;
-    }
-    if (columnName) {
-        submitData.columnName = columnName;
-    }
-
-    let action = field.action;
-    if (field.actionField) {
-        action = rowData[field.actionField];
-    }
-
-    RouterMouseenterHandler(field, submitData, action, model.value, 'table', callBack)
+function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName, callBack,flagMouseenter) {
+    rolRouterClickHandler(field,rowData,rowindex,visible,columnName,callBack,true)
 }
 function popupClickHandler() {
     var tempListData = model.value.getSelectRowData({ isMulti: model.value.isMulti });

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

@@ -5,7 +5,7 @@
             <el-popover @before-enter="onShow" :width="tooltipModel.width"
                 :fallback-placements="['bottom', 'top', 'right', 'left']">
                 <template #default>
-                    <div :style="'height: '+(tooltipModel.height+50)+'px;'">
+                    <div :style="'height: ' + tooltipModel.height + ''">
                         <component v-bind="tooltipModel.attrs" :is="tooltipModel.component"></component>
                     </div>
                 </template>
@@ -107,7 +107,7 @@ const option = ref({
 const tooltipModel = ref({});
 const labelColor = ref('')
 const video = ref()
-const label = computed(() => {  
+const label = computed(() => {
     return (typeof props.colValue === "undefined" || props.colValue === '') ? props.router.controlLabel : props.colValue
 })
 const isShowLabel = computed(() => {
@@ -173,6 +173,9 @@ function voiceEndedHandler() {
 }
 function onShow() {
     emit('mouseenter', props.router, props.rowData, props.rowindex, null, props.columnName, function (data) {
+        if (data.height) {
+            data.height = (parseInt(data.height.replace('px', ''))+50)+'px';
+        }
         tooltipModel.value = data
     });
 }

package/src/loader/src/Form.js

@@ -62,6 +62,14 @@ function loadFromModel(source, isFormList) {
           router[attrKey] = attrValue;
         }
       },
+      setbuttonRouter(id, attrKey, attrValue) {
+        var router = this.form.buttons.find((v1) => {
+          return v1.key === id;
+        });
+        if (router) {
+          router[attrKey] = attrValue;
+        }
+      },
       //获取Field的属性attrKey的值
       getValueByFieldName(id, attrKey) {
         attrKey = common.initialsToLowerCase(attrKey);
@@ -1043,6 +1051,39 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
   }
   common.openDialog(dialogOption);
 }
+function popupLocationHandler(field, router, callBack,model,props) {
+  var submitData = Form.getFileData(router,model);
+  submitData.lng=field.code1;
+  submitData.lat=field.code2;
+  submitData = router.getActionPara(submitData).para;
+
+  var dialogOption = {
+    title: router.pageTitle || router.controlLabel,
+    pane: common.getParentPane(),
+    content: [{
+      component: "ct-mapBaidu",
+      width: router.pageWidth + "px",
+      height: router.pageHeight + "px",
+      documentHeight: props.documentHeight,
+      documentWidth: props.documentWidth,
+      attrs: {
+        field: router,
+        apiParam: submitData,
+        openType : 'Location',
+        onSubmit(ev) {
+          if (callBack) {
+            callBack(ev);
+          }
+          common.closeDialog(dialogOption.dialog);
+        },
+        onCloseDialog(ev) {     
+          common.closeDialog(dialogOption.dialog);                 
+        }
+      }
+    }]
+  };
+  common.openDialog(dialogOption);
+}
 //弹出分组搜索列表
 function popupGroupListHandler(field, router, model, Fields, props, callBack) {
   let submitData = {};
@@ -1225,5 +1266,6 @@ const Form = {
   changeHandler,
   getRouterAndSubmitData,
   updateFields,
+  popupLocationHandler,
 };
 export default Form;