centaline-data-driven-v3 0.0.59 → 0.0.60

package/package.json

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

package/src/assets/commonWeb.css

@@ -408,7 +408,6 @@ body {
   display: inline-block;
   display: inline;
   zoom: 1;
-  height: 24px;
   line-height: 24px;
   float: left;
 }

package/src/components/app/PhotoSelect.vue

@@ -1,16 +1,16 @@
 <template>
-    <div class="van-uploader" style="margin:10px 10px 0 10px; ">
+    <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 photoList" :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(photoList, index)">
+                        @click="viewerfile(model.fileList, index)">
                         <div class="van-image van-uploader__preview-image">
                             <img :src="element.thumbnailUrl" class="van-image__img" style="object-fit: cover;">
                             <div class="van-uploader__preview-cover">
                                 <div class="preview-cover van-ellipsis">{{ element.mediaLabelName }}</div>
                             </div>
-                            <div class="swiper-i" @click="viewerfile(photoList, index)"
+                            <div class="swiper-i" @click="viewerfile(model.fileList, index)"
                                 v-if="element.mediaTypeID == '7'">
                                 <img :src="util.getAssetsImage('p3602x.png')" class="hous-icon" />
                             </div>
@@ -24,7 +24,7 @@
                     </div>
                 </template>
             </div>
-            <div class="van-uploader__upload" v-if="!model.locked && photoList.length < max" @click="handleOpen()">
+            <div class="van-uploader__upload" v-if="!model.locked && model.fileList.length < max" @click="handleOpen()">
                 <i class="van-badge__wrapper van-icon van-icon-plus van-uploader__upload-icon"></i>
             </div>
         </div>
@@ -43,7 +43,6 @@ const props = defineProps({
     api: String,
 })
 const max = ref(99999)
-const photoList = ref([])
 const uploadImgItem = ref()
 
 onMounted(() => {
@@ -74,10 +73,10 @@ const initDragSort = () => {
                     // 获取旧的索引和新索引
                     const { oldIndex, newIndex } = evt
                     // 交换位置
-                    const movedItem = photoList.value.splice(oldIndex, 1)[0]
-                    photoList.value.splice(newIndex, 0, movedItem)
+                    const movedItem = model.value.fileList.splice(oldIndex, 1)[0]
+                    model.value.fileList.splice(newIndex, 0, movedItem)
 
-                    PhotoSelect.setfileSourceList(photoList.value, model.value);
+                    PhotoSelect.setfileSourceList(model.value.fileList, model.value);
                 }
             })
         }
@@ -89,14 +88,13 @@ function load(data) {
     model.value.validExcute = () => {
         return selfValidExcute("valid");
     }
-    photoList.value = data.fileList;
 
     max.value = data.max ? data.max : 99999;
     selfValidExcute("valid");
 }
 function handleRemove(item, index) {
     PhotoSelect.deletePhoto(item, model.value);
-    photoList.value.splice(index, 1);
+    model.value.fileList.splice(index, 1);
     selfValidExcute("valid");
 }
 
@@ -115,7 +113,7 @@ function handleOpen() {
         parentValue: model.value.getFormParentFieldPara(),
         extraData: model.value.getFormRefFieldPara(),
     };
-    photoList.value.forEach((n) => {
+    model.value.fileList.forEach((n) => {
         chooseList.push(n);
     });
     var dialogOption = {
@@ -148,7 +146,7 @@ function handleOpen() {
                             }
                         }
                         PhotoSelect.setSelectfileSourceList(List, model.value);
-                        photoList.value = List;
+                        model.value.fileList = List;
                         // selfValidExcute("valid");
                         common.closeDialog(dialogOption);
                     });

package/src/components/web/Field.vue

@@ -21,7 +21,9 @@
 
             </slot>
             <!-- 插槽--控件后面的内容 -->
-            <slot name="SufLabel" v-if="model.controlType != Enum.ControlType.CheckBox&&model.controlType != Enum.ControlType.Switch">
+            <slot name="SufLabel" v-if="model.controlType != Enum.ControlType.CheckBox
+            &&model.controlType != Enum.ControlType.MultiLineText
+            &&model.controlType != Enum.ControlType.Switch">
                 <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
             </slot>
             <!-- 插槽--验证提示的内容 -->

package/src/components/web/FormList.vue

@@ -178,9 +178,6 @@ 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 + ']'
-    }
     return fieldsValidExcute();
 }
 const Fields = ref()
@@ -379,8 +376,10 @@ function getSummaries(param) {
 //验证
 function fieldsValidExcute() {
     var rtnBool = true;
+    var i = 0;
     if (model.value.required) {
         if (model.value.tableData.length == 0) {
+            model.value.displayValidMessage = common.LocalizedString('请填写', '請填寫') + '[' + model.value.controlLabel + ']'
             return false;
         }
     }
@@ -391,6 +390,12 @@ function fieldsValidExcute() {
                     var f = r[c["fieldName1"]]
                     if (f.validExcute) {
                         if (!f.validExcute()) {
+                            if (i === 0) {
+                                if (f.displayValidMessage) {
+                                    model.value.displayValidMessage = f.displayValidMessage;
+                                } 
+                            }
+                            i++;
                             rtnBool = false;
                         }
                     }
@@ -404,6 +409,10 @@ function fieldsValidExcute() {
         Fields.value.forEach((f) => {
             if (f.model.validExcute) {
                 if (!f.model.validExcute()) {
+                    if (i === 0) {
+                        model.value.displayValidMessage = "【" + model.value.controlLabel + "-" + f.model.controlLabel + "】不能为空！";
+                    }
+                    i++;
                     rtnBool = false;
                 }
             }

package/src/components/web/Progress.vue

@@ -68,7 +68,7 @@ function getApiData() {
             progressFlag.value = true;
             percentage.value = data.percentage;
             if (data.flagFinished) {
-                if (props.progressType == 'export' && data.content) {
+                if (props.progressType == 'export' && data.content && props.flagNotification=='1') {
                     if (data.content.indexOf(".zip") > -1) {
                         window.location.href = encodeURI(data.content);
                     }
@@ -80,11 +80,13 @@ function getApiData() {
                             downloadUrl.value = data.content + "?" + Math.random();
                         }
                     }
-
+                    setTimeout(() => {
+                        emit('finished', data);
+                    }, 800);
+                }
+                else{
+                  emit('finished', data);
                 }
-                setTimeout(() => {
-                    emit('finished', data);
-                }, 800);
             }
             else {
                 setTimeout(() => {

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

@@ -359,7 +359,6 @@ function searchComplate(m, defaultSearch) {
                 searchEnd.value = Date.now();
                 isLoading.value = false;
                 tableLoading.value = false;
-                emit("loadedError");
             });
         }
         if (typeof props.source !== "undefined") {
@@ -374,7 +373,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.$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) {
@@ -385,6 +384,8 @@ function load(data) {
             model.value.setStyleRow(model.value.listData);
         }
     }
+    model.value.scripts.formData = model.value.formData;
+    model.value.scripts.formData.formTable = model.value;
     isLoading.value = false
     emit("loaded");
     setTableHeight()

package/src/components/web/SearchScreen.vue

@@ -47,6 +47,9 @@
                 </div>
             </div>
         </div>
+        <iframe :src="downloadUrl"
+        style="height:0px;width:0px;border-width: 0px;position: absolute;bottom: 0px;display: none;">
+      </iframe>
     </div>
 </template>
 <script setup lang="ts">
@@ -82,6 +85,7 @@ const showScreen = ref(true)
 const highScreen = ref(false)
 const model = ref({ searchData: {} })
 const Fields = ref()
+const downloadUrl = ref('')
 searchComplate()
 //初始化数据
 function searchComplate(flagLoad) {

package/src/components/web/TextBox.vue

@@ -1,6 +1,7 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
+          <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
             <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="change()"
                 :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                 :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
@@ -9,6 +10,16 @@
                     <span v-if="model.unitName1">{{ model.unitName1 }}</span>
                 </template>
             </el-input>
+            <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
+          </div>
+          <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="change()"
+                :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
+                :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
+                :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
+                <template #suffix>
+                    <span v-if="model.unitName1">{{ model.unitName1 }}</span>
+                </template>
+            </el-input>
         </template>
         <template #Sufbutton v-if="model.moreActionRouter">
             <div style="margin-left: 5px;">
@@ -23,6 +34,7 @@
 <script lang="ts" setup>
 import { initData, changeHandler } from '../../utils/mixins';
 import TextBox from '../../loader/src/TextBox';
+import Enum from '../../utils/Enum'
 const emit = defineEmits(['input', 'change', 'click','search','popupSearchList'])
 const props = defineProps({
     parameterAction: String,

package/src/loader/src/Form.js

@@ -81,10 +81,10 @@ function loadFromModel(source, isFormList) {
               attrValue = Number(attrValue).toFixed(rtn1.decimals1)
             }
           }
-          else if (attrKey == 'code1' && (rtn1.controlType === Enum.ControlType.File 
-            || rtn1.controlType === Enum.ControlType.SliceUpload|| rtn1.controlType === Enum.ControlType.PhotoSelect)
+          else if (attrKey == 'code1' && (rtn1.controlType === Enum.ControlType.File
+            || rtn1.controlType === Enum.ControlType.SliceUpload || rtn1.controlType === Enum.ControlType.PhotoSelect)
             && attrValue != undefined && attrValue != null && attrValue != '') {
-            rtn1.jsSetFile(attrValue,rtn1);
+            rtn1.jsSetFile(attrValue, rtn1);
           }
           rtn1[attrKey] = attrValue;
           if (rtn1.controlType === Enum.ControlType.Tags) {
@@ -969,8 +969,21 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
             if (typeof callBack === "function" && !router.callBackFunName) {
               callBack(option);
             }
-            model.$vue.changeCallBackHandler(field, router.callBackFunName, option);
-            common.closeDialog(dialogOption);
+            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 : "取消",
+                center: Enum.HalignType.Center
+              }).then(() => {
+                model.$vue.changeCallBackHandler(field, router.callBackFunName, option);
+                common.closeDialog(dialogOption);
+              }).catch(() => {
+              });
+            }
+            else {
+              model.$vue.changeCallBackHandler(field, router.callBackFunName, option);
+              common.closeDialog(dialogOption);
+            }
           }
         },
       }]
@@ -1025,31 +1038,31 @@ function popupGroupListHandler(field, router, model, Fields, props, callBack) {
     return;
   }
   submitData = router.getActionPara(submitData).para;
-    var dialogOption = {
-      title: router.pageTitle,
-      pane: common.getParentPane(),
-      content: [{
-        component: 'ct-popupgrouplist',
-        width: router.pageWidth + 'px',
-        height: (router.pageHeight || 500) + 'px',
-        documentHeight: props.documentHeight,
-        documentWidth: props.documentWidth,
-        attrs: {
-          searchConditionApi: router.actionForSearchLayout,
-          searchFormApi: router.actionForSearchLayout,
-          searchDataApi: router.actionForSearch,
-          apiParam: submitData,
-          flagPopupSearchlist: flagSearchlist,
-          onSubmit: (option) => {
-            if (typeof callBack === "function" && !router.callBackFunName) {
-              callBack(option);
-            }
-            model.$vue.changeCallBackHandler(field, router.callBackFunName, option);
-            common.closeDialog(dialogOption);
+  var dialogOption = {
+    title: router.pageTitle,
+    pane: common.getParentPane(),
+    content: [{
+      component: 'ct-popupgrouplist',
+      width: router.pageWidth + 'px',
+      height: (router.pageHeight || 500) + 'px',
+      documentHeight: props.documentHeight,
+      documentWidth: props.documentWidth,
+      attrs: {
+        searchConditionApi: router.actionForSearchLayout,
+        searchFormApi: router.actionForSearchLayout,
+        searchDataApi: router.actionForSearch,
+        apiParam: submitData,
+        flagPopupSearchlist: flagSearchlist,
+        onSubmit: (option) => {
+          if (typeof callBack === "function" && !router.callBackFunName) {
+            callBack(option);
           }
-        },
-      }]
-    };
+          model.$vue.changeCallBackHandler(field, router.callBackFunName, option);
+          common.closeDialog(dialogOption);
+        }
+      },
+    }]
+  };
   common.openDialog(dialogOption);
 }
 function getFileData(field, model) {
@@ -1087,10 +1100,10 @@ function changeHandler(field, model) {
     var router = model.actionRouters.find((v) => {
       return v.id === field.onAfterChanged;
     });
-    if(router){
+    if (router) {
       clickHandler(router);
     }
-    else{
+    else {
       if (model.scripts) {
         model.scripts.formData.setExcuteListData(model.fields);
       }

package/src/loader/src/SearchTable.js

@@ -32,6 +32,22 @@ function loadSearchTableApi(action, callBack, searchModel, flagSearch, defaultSe
 }
 function loadSearchTableModel(source, searchModel, defaultSearchData, action, searchAction) {
     var rtn = {
+        formData: {
+            formTable: null,
+            execRouter(routerKey) {
+                var router = this.formTable.buttons.find((v) => {
+                    return v.key === routerKey;
+                });
+                if(router){
+                    this.formTable.$vue.toolbarClickHandler(router);
+                }
+            },
+            //消息提示 type主题:success/warning/info/error。 duration 显示时间, 毫秒。设为 0 则不会自动关闭。 showClose 是否显示关闭按钮。
+            message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
+                common.message(message, type, center, duration, showClose, dangerouslyUseHTMLString)
+            },
+
+        },
         selectAll: false,//全选是否选中
         selectIndex: 0,//选中行的索引
         pageIndex: 1,//当前显示页数
@@ -46,6 +62,20 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         rightShadow: -1, //右阴影个数
         toolbarKey: 0,
         downloadUrl: '',
+        _scripts: null,
+        get scripts() {
+            if (rtn._scripts !== null) {
+                return rtn._scripts;
+            } else {
+                if (typeof source.scripts !== 'undefined') {
+                    rtn._scripts = base.common.eval(source.scripts);
+                    return rtn._scripts;
+                } else {
+                    rtn._scripts = {};
+                    return rtn._scripts;
+                }
+            }
+        },
         //列表标题
         get title() {
             return source.content.title;
@@ -576,13 +606,13 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         //设置行样式
         setStyleRow(rows) {
             rows.forEach((row) => {
-                if (!row.rowStyle) { 
+                if (!row.rowStyle) {
                     row.rowStyle = "";
                 }
                 if (rtn.rowColorColumn && row[rtn.rowColorColumn]) {
                     row.rowStyle = row.rowStyle + "color:" + row[rtn.rowColorColumn] + ";";
                 }
-                 if (row.flagDrag && row.flagDrag=='1') {
+                if (row.flagDrag && row.flagDrag == '1') {
                     row.rowStyle = row.rowStyle + "cursor:move;";
                 }
             });

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-7acf3f06-c2ea-471c-a5fa-07e1c2a81728"}',
-                authObject: '{EmpID:"Token_0cb4ef4e-d86d-4090-9973-d3466ea6429f",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_0cb4ef4e-d86d-4090-9973-d3466ea6429f",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_5f3cda7e-a0b5-4899-8231-f6a4aaae661b",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_5f3cda7e-a0b5-4899-8231-f6a4aaae661b",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/mixins.js

@@ -876,7 +876,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                 }
                                                 model.$vue.updateCurrentRow(field, res);
                                             }
-                                        });
+                                        }, model.scripts);
                                     }).catch(() => {
                                     });
                                 }
@@ -1599,6 +1599,7 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
                                         cancelButtonText: '取消',
                                         type: 'warning'
                                     }).then(() => {
+                                        
                                         submitData.flagHaveAlert = '1';
                                         field.doAction(submitData, (res) => {
                                             if (res.rtnCode === Enum.ReturnCode.Successful) {