centaline-data-driven-v3 0.0.56 → 0.0.58

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

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

package/src/components/web/SearchList.vue

@@ -20,7 +20,9 @@
                 @refreshParent="refreshParentHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler"
                 @closeSideBar="closeSideBar" @popupClickHandler="popupClickHandler" :dragStartItem="dragStartItem"
                 :dragStartName="dragStartName"
-                @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
+                @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                @drag="drag" 
+                >
             </searchTable>
         </div>
         <div ref="refSidebar" v-if="flagSideBar && flagSideBarOfData"
@@ -43,7 +45,7 @@ import SearchCategory from './SearchList/SearchCategory.vue';
 import SearchSideMenu from './SearchList/SearchSideMenu.vue';
 import SearchSideRight from './SearchList/SearchSideRight.vue';
 import { ref, nextTick, onMounted, watch, onActivated } from 'vue'
-const emit = defineEmits(['loaded', 'failLoad', 'tableLoaded', 'scrollHandle', 'rowClickHandle', 'refreshParent', 'submit', 'flagNotificationParentAfterContentChanged'])
+const emit = defineEmits(['loaded', 'failLoad', 'tableLoaded', 'scrollHandle', 'rowClickHandle', 'refreshParent', 'submit', 'flagNotificationParentAfterContentChanged','drag'])
 const props = defineProps({
     vmodel: Object,
     parameterAction: String,
@@ -451,6 +453,9 @@ function popupClickHandler(tempListData) {
 function flagNotificationParentAfterContentChanged() {
     emit('flagNotificationParentAfterContentChanged');
 }
+function drag(row, column,type) {
+    emit('drag',row,column,type);
+}
 watch(() => props.pageHeight, (value) => {
     if (props.pageHeight) {
         pageHeightReal.value = props.pageHeight;

package/src/components/web/Steps.vue

@@ -1,16 +1,18 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
+          <div style="width: 100%;">
             <el-steps :space="model.code2.space" :direction="model.code2.direction" :active="model.code2.active"
                 :simple="model.code2.simple" :process-status="model.code2.processStatus"
                 :finish-status="model.code2.finishStatus" :align-center="model.code2.alignCenter">
-                <el-step v-for="(step, index) in model.code1" :key="index" :title="step.title" :icon="step.icon">
+                <el-step v-for="(step, index) in model.code1" :key="index" :title="step.title" :icon="step.icon" :status="step.status">
                     <template #description>
                         <div v-html="step.description">
                         </div>
                     </template>
                 </el-step>
             </el-steps>
+          </div>
         </template>
     </ct-field>
 </template>

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/DatePicker.js

@@ -9,11 +9,19 @@ const DatePicker = function (source) {
             if (source.controlType == Enum.ControlType.DateTime || source.controlType == Enum.ControlType.DateTimeRange || this.flagtime) {
                 return 'yyyy-MM-dd HH:mm:ss'
             }
+            else if(source.controlType == Enum.ControlType.DateYearMonth  
+              || source.controlType == Enum.ControlType.MonthRange){
+              return 'yyyy-MM'
+            }
             return 'yyyy-MM-dd'
         },
         //APP格式
         get valueFormatAPP() {
-            return ['year', 'month', 'day']
+          if(source.controlType == Enum.ControlType.DateYearMonth  
+            || source.controlType == Enum.ControlType.MonthRange){              
+            return ['year', 'month']
+          }
+          return ['year', 'month', 'day']
         },
         //是否时间
         get flagtime() {
@@ -24,20 +32,25 @@ const DatePicker = function (source) {
         },
         //是否区间
         get flagrange() {
-            if (source.controlType == Enum.ControlType.DateRange || source.controlType == Enum.ControlType.DateTimeRange || source.controlType == Enum.ControlType.TimeRange) {
+            if (source.controlType == Enum.ControlType.DateRange 
+              || source.controlType == Enum.ControlType.DateTimeRange 
+              || source.controlType == Enum.ControlType.MonthRange 
+              || source.controlType == Enum.ControlType.TimeRange) {
                 return true
             }
             return false
         },
         //控件类型
         get dateType() {
-            if (source.controlType == Enum.ControlType.DateTime || source.controlType == Enum.ControlType.DateTimeRange) {
+            if (source.controlType == Enum.ControlType.DateTime 
+              || source.controlType == Enum.ControlType.DateTimeRange) {
                 return 'datetime'
             }
             else if (this.flagtime) {
                 return 'time'
             }
-            else if (source.controlType == Enum.ControlType.DateYearMonth) {
+            else if (source.controlType == Enum.ControlType.DateYearMonth 
+              || source.controlType == Enum.ControlType.MonthRange) {
                 return 'month'
             }
             return 'date'

package/src/loader/src/Field.js

@@ -26,8 +26,8 @@ const Base = function (source, moreActionRouter) {
             if (source.labelDelimiter) {
                 l = l + source.labelDelimiter;
             }
-            if(common.flagApp()){
-                l=l.trim();
+            if (common.flagApp()) {
+                l = l.trim();
             }
             return l;
         },
@@ -235,7 +235,7 @@ const Base = function (source, moreActionRouter) {
         },
         //允许的文件类型（针对上传控件）
         get fileAccept1() {
-            return source.fileAccept1||'';
+            return source.fileAccept1 || '';
         },
         set fileAccept1(v) {
             source.fileAccept1 = v;
@@ -724,8 +724,8 @@ const Base = function (source, moreActionRouter) {
         set lineFeed(v) {
             source.lineFeed = v;
         },
-         // 主要给 表单分组控件使用 控制分组里面的内容是否使用 懒加载
-         get lazyLoad() {
+        // 主要给 表单分组控件使用 控制分组里面的内容是否使用 懒加载
+        get lazyLoad() {
             if (typeof source.lazyLoad !== "undefined") {
                 return source.lazyLoad;
             }
@@ -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,//所属分组
@@ -831,28 +838,30 @@ const Base = function (source, moreActionRouter) {
                     }
 
                 }
-                this.code1 = this.defaultCode1;
-                this.code2 = this.defaultCode2;
-                this.name1 = this.defaultName1;
+                this.code1 = this.defaultCode1 || '';
+                this.code2 = this.defaultCode2 || '';
+                this.name1 = this.defaultName1 || '';
 
             }
             else {
-                if (this.controlType === Enum.ControlType.DateRange || this.controlType === Enum.ControlType.DateTimeRange) {
+                if (this.controlType === Enum.ControlType.DateRange
+                    || this.controlType === Enum.ControlType.DateTimeRange
+                    || this.controlType === Enum.ControlType.MonthRange) {
                     this.code1 = '';
                     this.code2 = '';
                 }
                 else if (this.controlType === Enum.ControlType.CheckBoxList) {
                     this.value = [];
                 }
-                else if (this.controlType === Enum.ControlType.SearchListBox 
-                    || this.controlType === Enum.ControlType.ComboBox 
-                    || this.controlType === Enum.ControlType.MultiSelectNoSearch 
-                    || this.controlType === Enum.ControlType.MultiSelectWithSearch 
+                else if (this.controlType === Enum.ControlType.SearchListBox
+                    || this.controlType === Enum.ControlType.ComboBox
+                    || this.controlType === Enum.ControlType.MultiSelectNoSearch
+                    || this.controlType === Enum.ControlType.MultiSelectWithSearch
                     || this.controlType === Enum.ControlType.PhoneNumberText) {
-                        this.code1 = '';
-                        this.code2 = '';
-                        this.name1 = '';
-                        this.value = '';
+                    this.code1 = '';
+                    this.code2 = '';
+                    this.name1 = '';
+                    this.value = '';
                 }
                 else {
                     this.code1 = '';
@@ -910,6 +919,23 @@ const Base = function (source, moreActionRouter) {
                     configurable: true
                 });
             }
+            else if (source.controlType == Enum.ControlType.NumberWithPlusAndMinus) {
+                Object.defineProperty(rtnFormObj, source.fieldName1, {
+                    get: function () {
+                        if (source.code1) {
+                            let val = source.code1
+                            if (typeof source.code1 === 'string') {
+                                val = JSON.parse(source.code1)
+                            }
+                            return val
+                        }
+                        return []
+
+                    },
+                    enumerable: true,
+                    configurable: true
+                });
+            }
             return rtnFormObj;
         },
 

package/src/loader/src/Form.js

@@ -973,6 +973,80 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
   }
   common.openDialog(dialogOption);
 }
+//弹出分组搜索列表
+function popupGroupListHandler(field, router, model, Fields, props, callBack) {
+  let submitData = {};
+  let verified = true;
+  let flagSearchlist = false;
+  let tempFormData = model.getFormObj();
+
+  let check = true;
+  let checkMsg;
+  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)
+            verified = false;
+            return;
+          }
+        }
+      }
+    });
+    if (!verified) {
+      return;
+    }
+    submitData[v] = common.getDataOfUpperLower(tempFormData, v);
+    if (!submitData[v]) {
+      if (model.fieldsDic[v]) {
+        if (model.fieldsDic[v].required) {
+          checkMsg = "请先录入" + model.fieldsDic[v].controlLabel;
+          check = false;
+        }
+      }
+      else {
+        checkMsg = "未读取到表单项(" + v + ")的值";
+        check = false;
+      }
+    }
+  });
+
+  if (!verified) {
+    return;
+  }
+  if (!check) {
+    common.message(checkMsg, 'warning')
+    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);
+          }
+        },
+      }]
+    };
+  common.openDialog(dialogOption);
+}
 function getFileData(field, model) {
   var submitData = {};
   var tempFormData = model.getFormObj();
@@ -1008,7 +1082,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) {
@@ -1067,6 +1150,7 @@ const Form = {
   clearRelatedHandle,
   doAction,
   popupSearchListHandler,
+  popupGroupListHandler,
   getFileData,
   changeHandler,
   getRouterAndSubmitData,