centaline-data-driven-v3 0.0.57 → 0.0.59

package/package.json

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

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

@@ -436,7 +436,7 @@ function nextbnt() {
 }
 function onActionSheet(ev) {
     show.value = false;
-    var field = modeButtons.value.find((v) => {
+    var field = model.value.buttons.find((v) => {
         return v.key == ev.key;
     });
     toolbarClickHandler(field)

package/src/components/web/Button.vue

@@ -64,6 +64,7 @@ import { ElMessage } from 'element-plus'
 const emit = defineEmits(['input', 'fieldClick', 'importComplete'])
 const props = defineProps({
     parameterAction: String,
+    fileData: Object,
     vmodel: Object,
     source: Object,
     flagAppMode: Boolean,
@@ -94,10 +95,9 @@ const headers = computed(() => {
 function clickHandle() {
     emit('fieldClick', model.value);
 }
+
 function handleAvatarSuccess(res) {
-    request.postThenHandler({ data: res }).then(function () {
-        emit('importComplete', res, model.value);
-    });
+    emit('importComplete', res, model.value);
 }
 function handleAvatarError(info) {
     ElMessage({

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

@@ -359,6 +359,7 @@ function searchComplate(m, defaultSearch) {
                 searchEnd.value = Date.now();
                 isLoading.value = false;
                 tableLoading.value = false;
+                emit("loadedError");
             });
         }
         if (typeof props.source !== "undefined") {
@@ -459,41 +460,126 @@ function toolbarClickHandler(field) {
 }
 //导入
 function importComplete(res, field) {
+    if (res && res.rtnCode && res.rtnCode === 201) {
+        if (res.rtnMsg) {
+            ElMessage({
+                message: res.rtnMsg,
+                type: 'warning',
+                showClose: true,
+            });
+        }
+        return;
+    }
+    else if (res && res.rtnCode && res.rtnCode === 202 && res.rtnMsg) {
+        common.confirm(res.rtnMsg, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
+
+        })
+            .catch(() => {
+            });
+    }
     if (field.flagAsync) {
-        if (res.content && res.content.action) {
-            var dialogOption = {
-                title: field.pageTitle || field.label,
-                content: [{
-                    component: 'ct-progress',
-                    width: '350px',
-                    height: '165px',
-                    attrs: {
-                        progressAction: res.content.action,
-                        progressKey: res.content.key,
-                        progressType: 'import',
-                        onFinished(data) {
-                            common.closeDialog(dialogOption);
-                            if (data.rtnMsg) {
+        if (res.rtnCode && res.rtnCode === 202 && res.rtnMsg) {
+            common.confirm(res.rtnMsg, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
+                if (res.content && res.content.action) {
+                    var dialogOption = {
+                        title: field.pageTitle || field.label,
+                        content: [{
+                            component: 'ct-progress',
+                            width: '350px',
+                            height: '165px',
+                            attrs: {
+                                progressAction: res.content.action,
+                                progressKey: res.content.key,
+                                progressType: 'import',
+                                onFinished(data) {
+                                    common.closeDialog(dialogOption);
+                                    if (field.isExport) {
+                                        if (data.content.indexOf(".zip") > -1) {
+                                            window.location.href = encodeURI(data.content);
+                                        }
+                                        else {
+                                            if (data.content.indexOf("?") > -1) {
+                                                downloadUrl.value = data.content + "&" + Math.random();
+                                            }
+                                            else {
+                                                downloadUrl.value = data.content + "?" + Math.random();
+                                            }
+                                        }
+                                    }
+                                    if (data.rtnMsg) {
+                                        ElMessage({
+                                            message: data.rtnMsg,
+                                            type: 'success',
+                                            showClose: true,
+                                        });
+                                    }
+                                    getPage(1, false);
+                                },
+                                onError(data) {
+                                    common.closeDialog(dialogOption);
+                                    ElMessage({
+                                        message: data.rtnMsg,
+                                        type: 'warning',
+                                        showClose: true,
+                                    });
+                                }
+                            },
+                        }]
+                    };
+                    common.openDialog(dialogOption);
+                }
+            })
+                .catch(() => { });
+        }
+        else {
+            if (res.content && res.content.action) {
+                var dialogOption = {
+                    title: field.pageTitle || field.label,
+                    content: [{
+                        component: 'ct-progress',
+                        width: '350px',
+                        height: '165px',
+                        attrs: {
+                            progressAction: res.content.action,
+                            progressKey: res.content.key,
+                            progressType: 'import',
+                            onFinished(data) {
+                                common.closeDialog(dialogOption);
+                                if (field.isExport) {
+                                    if (data.content.indexOf(".zip") > -1) {
+                                        window.location.href = encodeURI(data.content);
+                                    }
+                                    else {
+                                        if (data.content.indexOf("?") > -1) {
+                                            downloadUrl.value = data.content + "&" + Math.random();
+                                        }
+                                        else {
+                                            downloadUrl.value = data.content + "?" + Math.random();
+                                        }
+                                    }
+                                }
+                                if (data.rtnMsg) {
+                                    ElMessage({
+                                        message: data.rtnMsg,
+                                        type: 'success',
+                                        showClose: true,
+                                    });
+                                }
+                                getPage(1, false);
+                            },
+                            onError(data) {
+                                common.closeDialog(dialogOption);
                                 ElMessage({
                                     message: data.rtnMsg,
-                                    type: 'success',
+                                    type: 'warning',
                                     showClose: true,
                                 });
                             }
-                            getPage(1, false);
                         },
-                        onError(data) {
-                            common.closeDialog(dialogOption);
-                            ElMessage({
-                                message: data.rtnMsg,
-                                type: 'warning',
-                                showClose: true,
-                            });
-                        }
-                    },
-                }]
-            };
-            common.openDialog(dialogOption);
+                    }]
+                };
+                common.openDialog(dialogOption);
+            }
         }
     }
     else {
@@ -1051,7 +1137,7 @@ function updateCurrentRow(router, data, flagSimple) {
         SearchTable.getCurrentRowApiData(model.value,
             function () {
                 itemKey.value = Math.random()
-                model.value.selectAll=false
+                model.value.selectAll = false
                 emit("searchComplate");
                 if (data && !flagSimple) {
                     emit("simpleRouterRefreshHandler");

package/src/components/web/SearchList.vue

@@ -19,7 +19,7 @@
                 @rowClickHandle="rowClickHandle" @refreshRowHandle="refreshRowHandle" @scrollHandle="scrollHandle"
                 @refreshParent="refreshParentHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler"
                 @closeSideBar="closeSideBar" @popupClickHandler="popupClickHandler" :dragStartItem="dragStartItem"
-                :dragStartName="dragStartName"
+                :dragStartName="dragStartName" @loadedError="tableLoadedError"
                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
                 @drag="drag" 
                 >
@@ -285,6 +285,9 @@ function tableLoaded() {
     emit('tableLoaded', refTable.value.model);
     emit('loaded', refTable.value.model);
 }
+function tableLoadedError() {
+  pageDisabled.value = false;
+}
 function sideMenuClickHandler(v) {
     drowerClose.value = v;
     let popoverCallTels = document.getElementsByClassName('el-popoverCallTel');

package/src/components/web/other/PopupSearchListTable.vue

@@ -28,9 +28,15 @@
                             </template>
                         </template>
                     </el-table-column>
-                    <template v-else>
-                        <el-table-column v-if="col.show" :prop="col.id" :label="col.name" :min-width="col.width">
+                    <template v-else-if="col.show">
+                        <el-table-column v-if="col.flagHtml" :prop="col.id" :label="col.name" :min-width="col.width">
+                            <template #default="scope">
+                                <span v-html="scope.row[col.id]"></span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column v-else :prop="col.id" :label="col.name" :min-width="col.width">
                         </el-table-column>
+                        
                     </template>
                 </template>
             </el-table>

package/src/loader/src/Field.js

@@ -734,6 +734,13 @@ const Base = function (source, moreActionRouter) {
         set lazyLoad(v) {
             source.lazyLoad = v;
         },
+        // 控件类型为 VueCustomizedComponent 时 对应的 前端vue的组件名称
+        get vueComponentName() {
+            return source.vueComponentName;
+        },
+        set vueComponentName(v) {
+            source.vueComponentName = v;
+        },
         //Field结束
 
         collapseName: -1,//所属分组

package/src/loader/src/Form.js

@@ -81,6 +81,11 @@ 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)
+            && attrValue != undefined && attrValue != null && attrValue != '') {
+            rtn1.jsSetFile(attrValue,rtn1);
+          }
           rtn1[attrKey] = attrValue;
           if (rtn1.controlType === Enum.ControlType.Tags) {
             rtn1["value"] = JSON.parse(attrValue);
@@ -1082,7 +1087,16 @@ function changeHandler(field, model) {
     var router = model.actionRouters.find((v) => {
       return v.id === field.onAfterChanged;
     });
-    clickHandler(router);
+    if(router){
+      clickHandler(router);
+    }
+    else{
+      if (model.scripts) {
+        model.scripts.formData.setExcuteListData(model.fields);
+      }
+      model.scripts.$fd = field.id;
+      common.excute.call(model.scripts, field.onAfterChanged);
+    }
   }
 }
 function getRouterAndSubmitData(field, model) {

package/src/loader/src/LibFunction.js

@@ -247,6 +247,9 @@ const LibFunction = {
                 item = NumberWithPlusAndMinus(item)
                 item.is = 'ct-numberwithplusandminus'
                 break;
+            case Enum.ControlType.VueCustomizedComponent: 
+                item.is = 'ct-'+item.vueComponentName.toLowerCase();
+                break;
             default:
                 item = Label(item)
                 item.is = 'ct-label'

package/src/loader/src/PhotoSelect.js

@@ -32,6 +32,16 @@ const loadModel = function (source, fileSourceList, router, optionApi, sourceLis
             }
             return rtn._fileList;
         },
+        //外部调用赋值
+        jsSetFile(data, model) {
+            var photos = JSON.parse(data);
+            photos.forEach((v) => {
+                if (model.fileSourceList.length < parseInt(model.maxValue1 || 999)) {
+                    model.fileList.push(v);
+                }
+            });
+            PhotoSelect.setSelectfileSourceList(model.fileList, model);
+        },
         getFormObj() {
             var rtnFormObj = {};
             var self = this;
@@ -95,7 +105,7 @@ function setSelectfileSourceList(newfileList, model) {
         let item = newfileList.find(v => {
             return v.mediaID === model.fileSourceList[i].mediaID;
         });
-        if(!item){
+        if (!item) {
             model.fileSourceList[i].flagDefault = false;
             model.fileSourceList[i].flagDeleted = true;
             pushArr.push(model.fileSourceList[i])

package/src/loader/src/Router.js

@@ -17,7 +17,7 @@ const Router = function (source) {
       return source.action;
     },
     set action(v) {
-      return source.action=v;
+      return source.action = v;
     },
     // action的url对应的FieldName，如果此处有值，则忽略action
     get actionField() {
@@ -92,10 +92,24 @@ const Router = function (source) {
       source.hidden = !v;
     },
 
+    //是否显示
+    get vueComponentName() {
+      return source.vueComponentName;
+    },
+    set vueComponentName(v) {
+      source.vueComponentName = vueComponentName;
+    },
+
     //Action 对应的页面样式
     get pageStyle() {
       return source.pageStyle;
     },
+    get isVueComponentInLayer() {
+      return source.pageStyle === Enum.PageStyle.OpenVueComponentInLayer;
+    },
+    get isVueComponentInTab() {
+      return source.pageStyle === Enum.PageStyle.OpenVueComponentInTab;
+    },
     get isOpenForm() {
       return source.pageStyle === Enum.PageStyle.FormPageInLayer;
     },

package/src/main.js

@@ -21,8 +21,8 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
-    baseUrl: "http://10.88.22.66:6060/onecard-api/",
+    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    //baseUrl: "http://10.88.22.66:6060/onecard-api/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
     flagRouterSelf: true,
@@ -63,8 +63,8 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                authObject: '{token:"1-80c31492-53e1-45c8-82ce-67ca89b3e40c"}',
-                //authObject: '{EmpID:"Token_bf5a6050-abc4-4108-b208-2c808c1ef335",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_bf5a6050-abc4-4108-b208-2c808c1ef335",Platform:"IOS"}',
+                //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"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作