centaline-data-driven-v3 0.0.68 → 0.0.70

package/package.json

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

package/src/components/Layout/Layout.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="ct-Layout" v-if="Layout !== null && !loading">
+    <div class="ct-Layout" v-if="Layout !== null && !loading" @click="rowClickHandle" :style="{ 'background-color': selectIndex === rowindex?selectedRowBackColor:'' }">
         <ct-layoutchildren :rowindex="rowindex" :actionRouter="actionRouter" :rowdata="vmodel" :vmodel="LayoutList"
             :flagflex="true" :fields="fields" :parameterAction="parameterAction"
             :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler"
@@ -9,7 +9,7 @@
 <script setup lang="ts">
 import { ref, nextTick } from 'vue'
 import common from '../../utils/common'
-const emit = defineEmits(['rolRouterclick', 'changeHandler'])
+const emit = defineEmits(['rolRouterclick', 'changeHandler','rowclick'])
 const props = defineProps({
     action: String,
     cellLayout: String,
@@ -20,6 +20,8 @@ const props = defineProps({
     apiParam: Object,
     parameterAction: String,
     fields: Array,
+    selectIndex:Number,
+    selectedRowBackColor:String,
     formListactionRouter: {
         type: Array,
         default: [],
@@ -315,6 +317,9 @@ function changeHandler(field) {
         emit("changeHandler", field, props.vmodel.$sourceIndex);
     }
 }
+function rowClickHandle(){
+    emit("rowclick", props.rowindex);
+}
 </script>
 <style scoped>
 .ct-Layout {

package/src/components/app/ComboBox.vue

@@ -98,6 +98,7 @@
 </template>
 <script lang="ts" setup>
 import { ref } from 'vue'
+import Axios from 'axios';
 import { initData, changeHandler } from '../../utils/mixins';
 import ComboBox from '../../loader/src/ComboBox';
 const emit = defineEmits(['click', 'input', 'change', 'popupSearchList'])
@@ -110,19 +111,29 @@ const model = initData(props, ComboBox)
 const showPicker = ref(false)
 const searchText = ref('')
 const checkboxRefs = ref([])
+let cancelTokenSource = null; // 用于存储取消令牌
 function visibleChange() {
-    if(model.value.locked){
+    if (model.value.locked) {
         return;
     }
-    model.value.getOptions(props.parameterAction, searchText.value, function (data) {
+    getOptions();
+}
+function getOptions() {
+    if (cancelTokenSource) {
+        // 取消上一次未完成的请求
+        cancelTokenSource.cancel('取消上一次请求');
+    }
+
+    // 创建新的取消令牌
+    cancelTokenSource = Axios.CancelToken.source();
+    model.value.getOptions(props.parameterAction, searchText.value, cancelTokenSource, function (data) {
         model.value.options = data
         showPicker.value = true
     })
 }
-
 function change(item) {
     showPicker.value = false;
-  
+
     model.value.value = item.code;
     model.value.setcode(item.code)
     if (model.value.isList) {
@@ -145,9 +156,7 @@ function onConfirm() {
     changeHandler(model.value, emit)
 }
 function searchInputHandle() {
-    model.value.getOptions(props.parameterAction, searchText.value, function (data) {
-        model.value.options = data;
-    })
+    getOptions();
 }
 function itemOnClick(index, item) {
     if (model.value.locked || item.locked) {

package/src/components/app/PhotoSelect.vue

@@ -2,7 +2,7 @@
     <div class="van-uploader" style="margin:10px 10px 0 10px; " v-if="model">
         <div class="van-uploader__wrapper">
             <div ref="uploadImgItem">
-                <template v-for="(element, index) in  model.fileList" :key="element.mediaCode">
+                <template v-for="(element, index) in model.fileList" :key="element.mediaCode">
                     <div class="van-uploader__preview" style="display:inline-block;"
                         @click="viewerfile(model.fileList, index)">
                         <div class="van-image van-uploader__preview-image">
@@ -117,7 +117,7 @@ function handleOpen() {
         chooseList.push(n);
     });
     var dialogOption = {
-        title: common.LocalizedString('选择','選擇') + model.value.controlLabel || common.LocalizedString('选择图片','選擇圖片'),
+        title: common.LocalizedString('选择', '選擇') + model.value.controlLabel || common.LocalizedString('选择图片', '選擇圖片'),
         pane: common.getParentPane(),
         content: [{
             component: "ct-photoselectlist",
@@ -166,16 +166,21 @@ function selfValidExcute(eventName) {
 }
 
 function viewerfile(list, index) {
+    var file = list[index];
+    if (file && file.mediaTypeID == 4 && !common.isVideoFile(file.mediaUrl) && common.getDataDrivenOpts().handler.openUrlInBrowse) {
+        common.getDataDrivenOpts().handler.openUrlInBrowse(file.mediaUrl)
+    }
+    else {
+        var MediaAlbum = [{ albumName: model.value.controlLabel || "媒体", medias: [] as any }];
 
-    var MediaAlbum = [{ albumName: model.value.controlLabel || "媒体", medias: [] as any }];
-
-    let fileList = list.filter((item) => {
-        return item.flagDeleted !== true;
-    });
-    fileList.forEach((v) => {
-        MediaAlbum[0].medias.push(v);
-    });
-    common.viewerfile((model.value.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.value.mediaViewPageType);
+        let fileList = list.filter((item) => {
+            return item.flagDeleted !== true;
+        });
+        fileList.forEach((v) => {
+            MediaAlbum[0].medias.push(v);
+        });
+        common.viewerfile((model.value.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.value.mediaViewPageType);
+    }
 }
 
 

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

@@ -181,7 +181,9 @@ function load(data) {
     model.value.flagApp = true
     tableError.value = false
     tableLoading.value = false
-    model.value.$vue = { loadStats, updateCurrentRow, doAction, itemKey, emit, tableError, refreshTableColumns, getPage, setTableHeight };
+    model.value.scripts.formData = model.value.formData;
+    model.value.scripts.formData.formTable = model.value;
+    model.value.$vue = { loadStats, updateCurrentRow, doAction, itemKey,toolbarClickHandler, emit, tableError, refreshTableColumns, getPage, setTableHeight };
     emit("loaded");
     if (model.value.rowCount == model.value.$total) {
         finished.value = true;

package/src/components/app/searchScreen.vue

@@ -220,7 +220,7 @@ function open(field) {
     field.showLabel = false;
     field.isList = true;
     if (field.is == 'ct-combobox') {
-        field.getOptions(model.value.parameterAction, '', function (data) {
+        field.getOptions(model.value.parameterAction, '',null, function (data) {
             field.options = data
         })
     }

package/src/components/web/ComboBox.vue

@@ -167,7 +167,7 @@ function handleCompositionEnd() {
 }
 //弹出选择列表
 function popupSearchListHandle() {
-    emit('popupSearchList', false, model, model.value.moreActionRouter, (optionArr) => {
+    emit('popupSearchList', !model.value.multiple, model, model.value.moreActionRouter, (optionArr) => {
         selectOptionArr(optionArr);
     });
 }

package/src/components/web/File.vue

@@ -74,9 +74,6 @@
           </el-dropdown>
         </span>
 
-
-
-
         <template #file="{ file }">
           <div :title="file.fileName">
             <div class="cover-list-item">
@@ -536,7 +533,6 @@ function CheckQRCodeStatus() {
   }
 }
 function GetQRCodeUploadPhoto() {
-
   clearInterval(model.value.qrtimer);
   File.getQRCode(model.value, function (data) {
     model.value.qrCodeImg = data.qrCode;
@@ -624,13 +620,10 @@ function addClass(el, className) {
 
 
 //预览文件
-
 function viewerfile(file) {
   File.viewerfile(file, model.value)
 }
 
-
-
 function PasteUpload(event) {
   if (!model.value.locked && !model.value.disableUpload) {
     // 获取粘贴板中的图片

package/src/components/web/Form.vue

@@ -242,7 +242,7 @@ function init() {
 function load(data) {
     model.value = data
     model.value.parentModelForm = props.parentModelForm
-    model.value.$vue = { fieldClickHandler, clickHandler, validExcute, emit, getFormObj, changeCallBackHandler, getFileData, Form, load, init, updateFields, itemKey,downloadUrl };
+    model.value.$vue = { fieldClickHandler, clickHandler, validExcute, emit, getFormObj, changeCallBackHandler, getFileData, Form, load, init, updateFields, itemKey,downloadUrl,doAction };
     model.value.$vue.openType = props.openType
     model.value.isIframe = props.isIframe
     if (model.value.scripts) {
@@ -269,7 +269,9 @@ function failLoad() {
 function getFileData(field) {
     return Form.getFileData(field, model.value);
 }
-
+function doAction(data) {
+  Form.doAction(data)
+}
 //判断是否有滚动条
 function getisScroll() {
     if (Fields.value) {

package/src/components/web/FormList.vue

@@ -57,7 +57,7 @@
                                     </el-col>
                                 </template>
                             </el-row>
-                            <div class="list-button" v-if="i > 0">
+                            <div class="list-delbutton" v-if="i > 0">
                                 <el-button v-if="v.delete" type="success" size="small" class="btn-del" :icon="Delete"
                                     @click="deleteRow(i, v.$sourceIndex)">
                                     删除
@@ -136,7 +136,8 @@
                                 </span>
                                 <!--可点击的列-->
                                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">
-                                    <span>{{ scope.row.isSet }}</span>
+                                  <Tablecurrency :router="v.router" :colValue="scope.row[v.fieldName1].code1" :rowData="scope.row" @click="rolRouterClickHandler">
+                                  </Tablecurrency>
                                 </span>
                                 <ct-span v-else-if="scope.row[v.fieldName1]" :vmodel="scope.row[v.fieldName1]"
                                     :rowNum="scope.row.$sourceIndex" :rowData="scope.row"></ct-span>
@@ -191,6 +192,7 @@ import { ElMessage } from 'element-plus'
 import Enum from '../../utils/Enum'
 import common from '../../utils/common'
 import FormList from '../../loader/src/FormList'
+import Tablecurrency from './SearchList/Tablecurrency.vue';
 import { initData } from '../../utils/mixins';
 import draggable from "vuedraggable";
 const emit = defineEmits(['click', 'input', 'change', 'popupSearchList', 'tableButtonClick'])
@@ -275,6 +277,7 @@ function addRow() {
         model.value.currentRow.isNew = true;
         model.value.currentRow.index = model.value.tableData.length - 1;
         if (model.value.flagRepeat) {
+            model.value.addSourceRow(newRow);
             FormList.allhiddenHandle(newRow, newRow.$sourceIndex, model.value)
         }
     }
@@ -491,12 +494,15 @@ function setcolumnminWidth(column) {
 function buttonClick(row, button) {
     var submitData = {};
     button.submitFormField.forEach((v) => {
-        submitData[v] = row[common.initialsToUpperCase(v)].code1;
+        submitData[v] = row[v].code1;
     });
     model.value.currentRowIndex = model.value.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex);
 
     emit('tableButtonClick', button, submitData);
 }
+function rolRouterClickHandler(field, rowData,rowindex) {
+  buttonClick(rowData, field);
+}
 function insertOrUpdateRow(row) {
     FormList.insertOrUpdateRow(row, true, model.value);
 }
@@ -616,11 +622,10 @@ defineExpose({
     width: 45%;
 }
 
-.ct-form-repeat .list-button {
+.ct-form-repeat .list-delbutton {
     padding-bottom: 5px;
-    text-align: right;
-    display: inline-table;
-    float: right;
+    justify-content: right;
+    display: flex;
 }
 
 .ct-form-repeat .ct-form-repeat-el-col {

package/src/components/web/RadioButton.vue

@@ -2,12 +2,15 @@
     
     <ct-field :vmodel="model" v-if="model">
         <template #Control>
-            <div class="ct-Radio">
+            <div class="ct-Radio"  :class="[model.code1 !== '' && !model.locked ? 'hasValue' : '']">
                 <el-radio-group v-model="model.code1" @change="change">
                     <el-radio v-bind="model.attrs" v-for="(item, index) in model.selectItems1" :key="index"
                         :label="item.code" :disabled="model.locked">
                         {{ item.name }}
                     </el-radio>
+                    <el-icon @click="clearClickHandle" class="el-range__close-icon" style="margin-left: 10px;" v-if="!common.flagHK()">
+                    <CircleClose />
+                </el-icon>
                 </el-radio-group>
             </div>
         </template>
@@ -16,6 +19,7 @@
 <script lang="ts" setup>
 import { initData, changeHandler } from '../../utils/mixins';
 import RadioButton from '../../loader/src/RadioButton';
+import common from '../../utils/common'
 const emit = defineEmits(['click', 'change','search'])
 const props = defineProps({
     parameterAction: String,

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

@@ -206,7 +206,8 @@
             <div v-else>
                 <div v-for="(row, rowindex) in model.listData" :key="rowindex">
                     <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex" :key="itemKey"
-                        @rolRouterclick="rolRouterCellClickHandler" :actionRouter="model.actionRouter">
+                        @rolRouterclick="rolRouterCellClickHandler" :actionRouter="model.actionRouter"
+                        :selectIndex="model.selectIndex" :selectedRowBackColor="model.selectedRowBackColor" @rowclick="rowLayoutClickHandle">
                     </ct-layout>
                 </div>
             </div>
@@ -215,7 +216,7 @@
             v-if="!isLoading && model && !model.isLayout"></Tabletip>
         <Tabletip ref="refFooter" class="ct-search-table-footer" style="width: 100%;"
             :tip="model.footer + model.companyName" v-if="!isLoading && model && !model.isLayout"></Tabletip>
-        <div ref="popupButton" v-if="flagPopupSearchlist"
+        <div ref="refPopupButton" v-if="flagPopupSearchlist"
             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">
@@ -323,6 +324,7 @@ const refListHeader = ref()
 const refListFooter = ref()
 const refTableStats = ref()
 const refTableParent = ref()
+const refPopupButton = ref()
 const refRows = ref<HTMLElement[]>([]);
 const getRowsRef = (el, index) => {
     if (el) {
@@ -350,7 +352,7 @@ onActivated(() => {
     })
 })
 onDeactivated(() => {
-  downloadUrl.value=''
+    downloadUrl.value = ''
 })
 
 //查询数据
@@ -376,7 +378,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,toolbarClickHandler };
+    model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage, toolbarClickHandler };
     model.value.isIframe = props.isIframe
     //自动查询 调用合并列
     if (model.value.listData.length > 0) {
@@ -588,18 +590,18 @@ function importComplete(res, field) {
     }
     else {
         if (field && field.callBackFunName) {
-          changeCallBackHandler(field, field.callBackFunName, res.content);
+            changeCallBackHandler(field, field.callBackFunName, res.content);
         }
         else {
-          doAction(res)
+            doAction(res)
         }
     }
 }
 function changeCallBackHandler(field, callBackFunName, callBackPara) {
-  if (callBackFunName) {
-      model.value.scripts.$fd = field.id;
-      common.excuteFunStr.call(model.value.scripts, callBackFunName, callBackPara);
-  }
+    if (callBackFunName) {
+        model.value.scripts.$fd = field.id;
+        common.excuteFunStr.call(model.value.scripts, callBackFunName, callBackPara);
+    }
 }
 //计算数据合并行
 function tdRowspan(column, row) {
@@ -678,6 +680,9 @@ function rowClickHandle(ev, index) {
     ev.cancelBubble = true;
     ev.stopPropagation();
 }
+function rowLayoutClickHandle(index) {
+    model.value.selectIndex = index;
+}
 
 //表单列表操作
 function rolRouterClickHandler(field, rowData, rowindex, visible, columnName) {
@@ -805,14 +810,18 @@ function setTableHeight() {
             if (refTableStats.value && refTableStats.value.tableStatistics) {
                 h7 = refTableStats.value.tableStatistics.offsetHeight + 10 | 0;
             }
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - 16;
+            var h8 = 0;
+            if (refPopupButton.value) {
+              h8 = refPopupButton.value.offsetHeight + 21 | 0;
+            }
+
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 16;
             model.value.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             nextTick(() => {
                 getScrollAttr();
             });
         }
     })
-
 }
 //表头拖动开始
 function thMouseMoveHandle(ev) {

package/src/components/web/SearchList.vue

@@ -138,6 +138,7 @@ onActivated(() => {
             if (RefSideRight.value.detailSearchlist) {
                 RefSideRight.value.detailSearchlist.refreshPage(listHeight.value);
             }
+            resizeSearchList();
         }
     })
 })

package/src/loader/src/ComboBox.js

@@ -160,7 +160,7 @@ const ComboBox = function (source) {
             }
             return source.code1 === '' ? [] : [{ value: source.code1, label: source.name1 }]
         },
-        getOptions(paramsAction, searchText, cancelTokenSource,CallBack) {
+        getOptions(paramsAction, searchText, cancelTokenSource, CallBack) {
             var apiAddrs = paramsAction;
             var params = {
                 action: apiAddrs,
@@ -171,13 +171,24 @@ const ComboBox = function (source) {
                     key: searchText
                 }
             };
-            request.postTokenHandler(common.globalUri(), params,cancelTokenSource).then((response) => {
-                if (response.rtnCode === 200) {
-                    if (CallBack) {
-                        CallBack(response.content)
+            if (cancelTokenSource) {
+                request.postTokenHandler(common.globalUri(), params, cancelTokenSource).then((response) => {
+                    if (response.rtnCode === 200) {
+                        if (CallBack) {
+                            CallBack(response.content)
+                        }
                     }
-                }
-            });
+                });
+            }
+            else{
+                request.postHandler(common.globalUri(), params).then((response) => {
+                    if (response.rtnCode === 200) {
+                        if (CallBack) {
+                            CallBack(response.content)
+                        }
+                    }
+                });
+            }
         },
     };
     rtn = base.copy(source, rtn);

package/src/loader/src/File.js

@@ -376,6 +376,8 @@ function setPublicClassify(classify, model) {
 function setClassify(classify, model) {
     classify.file.mediaLabelName = classify.option[model.optionModel.optionAttrs.label];
     classify.file.mediaLabelID = classify.option[model.optionModel.optionAttrs.value];
+    classify.file.source.mediaLabelName = classify.option[model.optionModel.optionAttrs.label];
+    classify.file.source.mediaLabelID = classify.option[model.optionModel.optionAttrs.value];
 }
 //上传成功
 function handleAvatarSuccess(res, file, fileList, model) {

package/src/loader/src/Form.js

@@ -71,7 +71,7 @@ function loadFromModel(source, isFormList) {
         }
       },
       getValueByFieldNameFromParent(id, attrKey) {
-        if(this.form && this.form.parentModelForm){
+        if (this.form && this.form.parentModelForm) {
           return this.form.parentModelForm.getValueByFieldName(id, attrKey);
         }
         return null;
@@ -111,14 +111,14 @@ function loadFromModel(source, isFormList) {
             if (attrKey == 'name1') {
               rtn1["options"][0]["label"] = attrValue
             }
-            if(rtn1.itemKey)rtn1.itemKey=Math.random()
+            if (rtn1.itemKey) rtn1.itemKey = Math.random()
           }
           hiddenHandle(rtn1, this.form);
           requiredHandle(rtn1, this.form);
         }
       },
       setValueByFieldNameFromParent(id, attrKey, attrValue) {
-        if(this.form && this.form.parentModelForm){
+        if (this.form && this.form.parentModelForm) {
           return this.form.parentModelForm.setValueByFieldName(id, attrKey, attrValue);
         }
         return null;
@@ -411,24 +411,24 @@ function loadFromModel(source, isFormList) {
         common.message(message, type, center, duration, showClose, dangerouslyUseHTMLString)
       },
 
-    },    
+    },
     getValueByFieldName(id, attrKey) {
       attrKey = common.initialsToLowerCase(attrKey);
       var rtn1 = this.fieldsDic[id];
       if (rtn1) {
-          return rtn1[attrKey];
+        return rtn1[attrKey];
       }
     },
     setValueByFieldName(id, attrKey, attrValue) {
       attrKey = common.initialsToLowerCase(attrKey);
       var rtn1 = this.fieldsDic[id];
       if (rtn1) {
-        if(attrKey=='code1' && rtn1.controlType===4 
-          && attrValue!=undefined && attrValue!=null && attrValue!=''){
-            if(rtn1.decimals1 != undefined && rtn1.decimals1 != null && rtn1.decimals1>-1){
-              attrValue = Number(attrValue).toFixed(rtn1.decimals1)
-            }
+        if (attrKey == 'code1' && rtn1.controlType === 4
+          && attrValue != undefined && attrValue != null && attrValue != '') {
+          if (rtn1.decimals1 != undefined && rtn1.decimals1 != null && rtn1.decimals1 > -1) {
+            attrValue = Number(attrValue).toFixed(rtn1.decimals1)
           }
+        }
         rtn1[attrKey] = attrValue;
         // this.self.hatchHandle(id, attrKey, attrValue, rtn1);
 
@@ -727,7 +727,7 @@ function loadFromModel(source, isFormList) {
             Object.assign(rtnFormObj, customizeColumnsObj);
           }
           else {
-            if(f.hasOwnProperty('getFormObj') && typeof f.getFormObj === "function"){
+            if (f.hasOwnProperty('getFormObj') && typeof f.getFormObj === "function") {
               Object.assign(rtnFormObj, f.getFormObj());
             }
           }
@@ -758,7 +758,7 @@ function loadFromModel(source, isFormList) {
       return submitData;
     },
     //获取父级关联数据
-    getParentFieldPara(parentFieldNameArr,model) {
+    getParentFieldPara(parentFieldNameArr, model) {
       let submitData = {};
       var tempFormData = rtn.getFormObj();
       parentFieldNameArr.forEach((v) => {
@@ -886,7 +886,7 @@ function requiredHandle(item, model) {
 //清除关联当前组件的组件值
 function clearRelatedHandle(field, fields) {
   var f = fields.filter((v) => {
-    return v.parentField && field.fieldName1 && (','+v.parentField+',').indexOf(','+field.fieldName1+',') > -1;
+    return v.parentField && field.fieldName1 && (',' + v.parentField + ',').indexOf(',' + field.fieldName1 + ',') > -1;
   });
   f.forEach((v) => {
     if (v.reset) {
@@ -931,12 +931,16 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
 
   let check = true;
   let checkMsg;
+  var i = 0;
   router.submitFormField.forEach((v) => {
     Fields.forEach((f) => {
       if (f.model && f.model.fieldName1 === v) {
         if (typeof f.model.validExcute !== 'undefined') {
           if (!f.model.validExcute()) {
-            common.message(f.model.displayValidMessage)
+            if (i == 0) {
+              common.message(f.model.displayValidMessage)
+            }
+            i++;
             verified = false;
             return;
           }
@@ -1018,9 +1022,9 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
               callBack(option);
             }
             if (typeof option === 'object' && option !== null && option.flagAlert) {
-              common.confirm(option.content, option.caption? option.caption : "提示", {
-                confirmButtonText: option.confirmButtonText? option.confirmButtonText : "确定",
-                cancelButtonText: option.cancelButtonText? option.cancelButtonText : "取消",
+              common.confirm(option.content, option.caption ? option.caption : "提示", {
+                confirmButtonText: option.confirmButtonText ? option.confirmButtonText : "确定",
+                cancelButtonText: option.cancelButtonText ? option.cancelButtonText : "取消",
                 center: Enum.HalignType.Center
               }).then(() => {
                 model.$vue.changeCallBackHandler(field, router.callBackFunName, option);

package/src/loader/src/FormList.js

@@ -314,10 +314,11 @@ function FormListModel(source, master,actionRouters) {
                 if(form.fieldsDic[f]){
                   let newField={...form.fieldsDic[f]};
                   newField.is='ct-label';
-                  newField.type=Enum.ControlType.Label;
+                  newField.controlType=Enum.ControlType.Label;
                   newField.colspan=24;
                   newField.required=false;
                   newField.labelClass='';
+                  newField.value=newField.code1;
                   relfields.push(newField);
                 }
               });

package/src/loader/src/SearchScreen.js

@@ -320,8 +320,6 @@ function isHandle(type) {
     let result = false;
     switch (type) {
         case Enum.ControlType.CheckBoxList://复选列表
-        case Enum.ControlType.MultiSelectNoSearch:
-        case Enum.ControlType.MultiSelectWithSearch:
             result = true;
             break;
         default:

package/src/main.js

@@ -64,7 +64,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1-a7289bb2-9f1e-4a04-9016-1e555bf39188"}',
-                authObject: '{EmpID:"Token_00f32936-8123-45d4-b1b2-2206150ab06e",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_00f32936-8123-45d4-b1b2-2206150ab06e",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_15dc3fe3-b962-4bd2-85e2-2ce843676353",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_15dc3fe3-b962-4bd2-85e2-2ce843676353",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作