cloud-web-corejs 1.0.54-dev.257 → 1.0.54-dev.259

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.257",
+  "version": "1.0.54-dev.259",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/excelExport/button.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dropdown trigger="hover">
+  <el-dropdown trigger="hover" :disabled="showIndexViewDialog">
     <el-button type="primary" class="button-sty" size="mini">
       <span>{{ $t2('列表导出', 'components.excelExport.listExport') }}</span><span class="line"></span> <i
       class="el-icon-arrow-down el-icon--right"></i>

package/src/components/excelExport/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="inner-dialog">
+<!--    <span v-if="isMinimize"><a href="javascript:void(0)" @click="handleMinimize">导出进度：{{percentageNum+"%"}}</a></span>-->
     <exportFieldDialog :visiable.sync="showExportFieldDialog" v-if="showExportFieldDialog" :param="param" @close="closeExportFieldDialog"
                        @confirm="confirmExportFieldDialog"></exportFieldDialog>
     <el-dialog
@@ -14,6 +15,11 @@
       :modal-append-to-body="false"
       @close="dialogClose2"
     >
+<!--      <el-button class="isFullIcon" @click="handleMinimize">
+        <el-tooltip effect="dark" content="缩小" placement="top">
+          <i class="el-icon-minus"></i>
+        </el-tooltip>
+      </el-button>-->
       <div class="export-box">
         <div class="tips">{{ $t2('导出中，请勿关闭当前窗口', 'components.excelExport.tip') }}</div>
         <el-progress :text-inside="true" :stroke-width="26" :percentage="percentageNum"
@@ -59,4 +65,20 @@ export default {
 ::v-deep .el-dialog__wrapper {
   top: 20px !important;
 }
+::v-deep .el-dialog__body {
+  padding: 0;
+
+  .isFullIcon {
+    position: absolute;
+    top: 0;
+    right: 69px;
+    border: none !important;
+    background: none !important;
+    box-shadow: none !important;
+    color: #464646d6;
+    height: 42px;
+    line-height: 42px;
+    padding: 0;
+  }
+}
 </style>

package/src/components/excelExport/mixins.js

@@ -89,7 +89,9 @@ function getGrid(that, tableRef) {
         excTime: 0,
         showExportFieldDialog: false,
         leafColumns: [],
-        columns: []
+        columns: [],
+        queryParam:{},
+        isMinimize:false
       }
     },
     created() {
@@ -100,6 +102,7 @@ function getGrid(that, tableRef) {
     },
     beforeDestroy() {
       this.clearExportTimer()
+      this.unlockMenu();
     },
     methods: {
       exc() {
@@ -121,10 +124,19 @@ function getGrid(that, tableRef) {
             return;
           }
         }
+        this.lockMenu()
+
+        this.isMinimize = false;
         this.showExportFieldDialog = true;
 
       },
+      handleMinimize(){
+        let result = !this.showImportDialog2;
+        this.isMinimize = !result;
+        this.showImportDialog2 = result
+      },
       dialogClose2() {
+        if(this.isMinimize)return;
         let loadingObj = window.$vueRoot.$baseLoading({
           target: document.body,
           background: 'unset'
@@ -149,6 +161,10 @@ function getGrid(that, tableRef) {
         this.createCountTimer();
         this.tableTarget = getGrid(this.option.vue, this.option.targetRef);
 
+        //获取查询条件
+        let originOption = this.tableTarget.originOption;
+        this.queryParam = this.$baseLodash.cloneDeep(originOption.param() || {});
+
         let that = this;
         let options = this.option;
         let title = options.title || this.$t2('导出', 'components.excelExport.title');
@@ -451,7 +467,8 @@ function getGrid(that, tableRef) {
           let originOption = target.originOption;
           let url = originOption.exportPath || originOption.path;
 
-          let params = originOption.param() || {};
+          // let params = originOption.param() || {};
+          let params = that.queryParam;
           let aParam = {
             current: pageNumber,
             size: pPageSize,
@@ -901,7 +918,30 @@ function getGrid(that, tableRef) {
             this.startProcess();
           }
         });
-      }
+      },
+      lockMenu(){
+        let path = this.$route.path;
+        let visitedViews =  this.$store.state.tagsView.visitedViews
+        if(visitedViews){
+          let currentItem = visitedViews.find(item=>item.path == path)
+          if(currentItem && !currentItem.meta.affix){
+            this.$set(currentItem.meta, "affix",true)
+            this.$set(currentItem.meta, "user_affix",true)
+          }
+        }
+
+      },
+      unlockMenu(){
+        let path = this.$route.path;
+        let visitedViews =  this.$store.state.tagsView.visitedViews
+        if(visitedViews){
+          let currentItem = visitedViews.find(item=>item.path == path)
+          if(currentItem && currentItem.meta.user_affix){
+            currentItem.meta.affix = false
+            currentItem.meta.user_affix = false
+          }
+        }
+      },
     }
   };
 })();

package/src/components/xform/form-designer/form-widget/field-widget/a-link-widget.vue

@@ -70,7 +70,7 @@ export default {
     widgetClass() {
       let list = [];
       let optionModel = this.field.options
-      if (optionModel.coloClass) list.push(optionModel.coloClass);
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
       if (optionModel.underline) list.push('underLine');
       if (optionModel.disabled) list.push('is-disabled');
       return list

package/src/components/xform/form-designer/form-widget/field-widget/a-text-widget.vue

@@ -66,7 +66,7 @@ export default {
     widgetClass() {
       let list = [];
       let optionModel = this.field.options
-      if (optionModel.coloClass) list.push(optionModel.coloClass);
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
       if (optionModel.underline) list.push('underLine');
       if (optionModel.disabled) list.push('is-disabled');
       return list

package/src/components/xform/form-designer/form-widget/field-widget/date-widget.vue

@@ -10,7 +10,9 @@
                     :format="field.options.format" :value-format="field.options.valueFormat"
                     :placeholder="getI18nLabel(field.options.placeholder || '选择日期')"
                     @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
-                    @change="handleChangeEvent">
+                    @change="handleChangeEvent"
+                    :picker-options="pickerOptions"
+    >
     </el-date-picker>
   </form-item-wrapper>
 </template>
@@ -60,6 +62,7 @@ export default {
       oldFieldValue: null, //field组件change之前的值
       fieldModel: null,
       rules: [],
+      pickerOptions: {}
     }
   },
   computed: {},
@@ -76,6 +79,15 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
+
+    if(['year','month','date'].includes(this.field.options.type)){
+      this.pickerOptions.shortcuts = [{
+        text: this.$t1('此刻'),
+        onClick(picker) {
+          picker.$emit('pick', new Date());
+        }
+      }]
+    }
   },
 
   mounted() {
@@ -86,7 +98,14 @@ export default {
     this.unregisterFromRefList()
   },
 
-  methods: {}
+  methods: {
+    setNow() {
+      this.$refs.fieldEditor.panel.changeToNow()
+      /*this.selectedDate = new Date();
+      // 可选：点击后自动关闭弹窗
+      this.$refs.datePicker.pickerVisible = false;*/
+    }
+  }
 }
 </script>
 

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -6,7 +6,8 @@ import {
   runDataSourceRequest,
   getReportGlobalMap,
   getAccessUrl,
-  generateId
+  generateId,
+  trim
 } from "../../../../../components/xform/utils/util";
 import FormValidators, {getRegExp} from "../../../../../components/xform/utils/validators";
 import scriptHttpMixin from "../../../../../components/xform/mixins/scriptHttp";
@@ -1005,13 +1006,15 @@ modules = {
       if (this.hasVabsearchFlag()) {
         if (this.field.options.multipleChoices) {
           let fieldKeyName = this.fieldKeyName;
-          let valueField = this.field.options.valueField || fieldKeyName;
-          let vabSearchName = this.field.options.vabSearchName || fieldKeyName;
+          let valueField = trim(this.field.options.valueField || fieldKeyName);
+          let vabSearchName = trim(this.field.options.vabSearchName || fieldKeyName);
+          let valueSourceField = trim(searchDialogConfig.valueSourceField)
+          let labelSourceField = trim(searchDialogConfig.labelSourceField)
 
           rows = (this.fieldModel || []).map((row) => {
             return {
-              [searchDialogConfig.valueSourceField]: row[valueField],
-              [searchDialogConfig.labelSourceField]: row[vabSearchName],
+              [valueSourceField]: row[valueField],
+              [labelSourceField]: row[vabSearchName],
             };
           });
         }
@@ -1057,11 +1060,13 @@ modules = {
       let row = rows && rows.length ? rows[0] : null;
       let multipleChoices =
         optionModel.searchDialogConfig.multipleChoices || false;
+
+      let valueSourceField = trim(searchDialogConfig.valueSourceField)
+      let labelSourceField = trim(searchDialogConfig.labelSourceField)
       if (this.hasVabsearchFlag()) {
         let fieldKeyName = this.fieldKeyName;
-        let valueField = this.field.options.valueField || fieldKeyName;
-        let vabSearchName = this.field.options.vabSearchName || fieldKeyName;
-
+        let valueField = trim(this.field.options.valueField || fieldKeyName);
+        let vabSearchName = trim(this.field.options.vabSearchName || fieldKeyName);
         if (tableParam) {
           let rowData = tableParam.row;
           if (this.getMultipleChoices()) {
@@ -1071,28 +1076,30 @@ modules = {
               rowData[fieldKeyName] = rows.map((item) => {
                 let newData = {};
                 newData[valueField] =
-                  item[searchDialogConfig.valueSourceField] ?? null;
+                  item[valueSourceField] ?? null;
                 newData[vabSearchName] =
-                  item[searchDialogConfig.labelSourceField] ?? null;
+                  item[labelSourceField] ?? null;
                 tableData.forEach((item1) => {
-                  let targetFormField = item1.targetFormField || item1.targetField
-                  newData[targetFormField] = item[item1.sourceField];
+                  let targetFormField = trim(item1.targetFormField || item1.targetField)
+                  let sourceField = trim(item1.sourceField)
+                  newData[targetFormField] = item[sourceField];
                 });
                 return newData;
               });
             }
           } else {
             rowData[fieldKeyName] = !isClear
-              ? row[searchDialogConfig.valueSourceField]
+              ? row[valueSourceField]
               : null;
-            if (searchDialogConfig.labelSourceField)
+            if (labelSourceField)
               rowData[vabSearchName] = !isClear
-                ? row[searchDialogConfig.labelSourceField]
+                ? row[labelSourceField]
                 : null;
             tableData.forEach((item) => {
-              let targetFormField = item.targetFormField || item.targetField;
+              let targetFormField = trim(item.targetFormField || item.targetField);
+              let sourceField = trim(item.sourceField)
               if (!isClear) {
-                rowData[targetFormField] = row[item.sourceField];
+                rowData[targetFormField] = row[sourceField];
               } else {
                 rowData[targetFormField] = null;
               }
@@ -1107,12 +1114,13 @@ modules = {
               rowData = rows.map((item) => {
                 let newData = {};
                 newData[valueField] =
-                  item[searchDialogConfig.valueSourceField] ?? null;
+                  item[valueSourceField] ?? null;
                 newData[vabSearchName] =
-                  item[searchDialogConfig.labelSourceField] ?? null;
+                  item[labelSourceField] ?? null;
                 tableData.forEach((item1) => {
-                  let targetFormField = item1.targetFormField || item1.targetField
-                  newData[targetFormField] = item[item1.sourceField];
+                  let targetFormField = trim(item1.targetFormField || item1.targetField)
+                  let sourceField = trim(item1.sourceField)
+                  newData[targetFormField] = item[sourceField];
                 });
                 return newData;
               });
@@ -1120,20 +1128,22 @@ modules = {
             this.setValue(rowData);
           } else {
             this.fieldModel = !isClear
-              ? row[searchDialogConfig.valueSourceField]
+              ? row[valueSourceField]
               : null;
-            if (searchDialogConfig.labelSourceField) {
+            if (labelSourceField) {
               this.setShowValue(
-                !isClear ? row[searchDialogConfig.labelSourceField] : null
+                !isClear ? row[labelSourceField] : null
               );
             }
             tableData.forEach((item) => {
               // formModel[item.targetField] = row[item.sourceField]
               let value = !isClear ? row[item.sourceField] ?? null : null;
-              if (item.targetField) {
-                this.getWidgetRef(item.targetField).setValue(value);
-              } else if (item.targetFormField) {
-                formModel[item.targetFormField] = value;
+              let targetField = trim(item.targetField)
+              let targetFormField = trim(item.targetFormField)
+              if (targetField) {
+                this.getWidgetRef(targetField).setValue(value);
+              } else if (targetFormField) {
+                formModel[targetFormField] = value;
               }
             });
           }
@@ -1144,25 +1154,28 @@ modules = {
           let addRows = rows.map((rowData) => {
             let itemData = {};
             tableData.forEach((item) => {
-              let targetFormField = item.targetFormField || item.targetField;
-              itemData[targetFormField] = rowData[item.sourceField];
+              let targetFormField = trim(item.targetFormField || item.targetField);
+              let sourceField = trim(item.sourceField)
+              itemData[targetFormField] = rowData[sourceField];
             });
             return itemData;
           });
+          let tableUniqueKey = trim(searchDialogConfig.tableUniqueKey);
           this.getWidgetRef(searchDialogConfig.tableRef).addTableData(
             addRows,
-            searchDialogConfig.tableUniqueKey
+            tableUniqueKey
           );
         } else if (!multipleChoices) {
           tableData.forEach((item) => {
             let value = row[item.sourceField] ?? null;
             // formModel[item.targetField] = value
             // this.getWidgetRef(item.targetField).setValue(value);
-
-            if (item.targetField) {
-              this.getWidgetRef(item.targetField).setValue(value);
-            } else if (item.targetFormField) {
-              formModel[item.targetFormField] = value;
+            let targetField = trim(item.targetField)
+            let targetFormField = trim(item.targetFormField)
+            if (targetField) {
+              this.getWidgetRef(targetField).setValue(value);
+            } else if (targetFormField) {
+              formModel[targetFormField] = value;
             }
 
 

package/src/components/xform/form-designer/form-widget/field-widget/form-item-wrapper.vue

@@ -487,7 +487,7 @@ export default {
     getWidgetClass() {
       let list = [];
       let optionModel = this.field.options.widgetTextLinkConfig?.options || {};
-      if (optionModel.coloClass) list.push(optionModel.coloClass);
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
       if (optionModel.underline) list.push('underLine');
       if (this.field.options.disabled) list.push('is-disabled');
       return list

package/src/components/xform/form-designer/form-widget/field-widget/text-widget.vue

@@ -11,7 +11,7 @@
     :sub-form-col-index="subFormColIndex"
     :sub-form-row-id="subFormRowId"
   >
-    <span>{{ showVaule }}</span>
+    <span :class="field.options.colorClass">{{ showVaule }}</span>
   </form-item-wrapper>
 </template>
 

package/src/components/xform/form-designer/setting-panel/property-editor/a-link-editor.vue

@@ -6,14 +6,14 @@
     <el-form-item :label="i18nt('表单值显示')" v-if="selectedWidget.type!=='a-link2'">
       <el-switch v-model="optionModel.isFormLabel"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('颜色')">
-      <el-select v-model="optionModel.coloClass" clearable>
+<!--    <el-form-item :label="i18nt('颜色')">
+      <el-select v-model="optionModel.colorClass" clearable>
         <el-option value="f-red" label="橙"></el-option>
         <el-option value="f-dred" label="红"></el-option>
         <el-option value="f-green" label="绿"></el-option>
         <el-option value="f-blue" label="蓝"></el-option>
       </el-select>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item :label="i18nt('超链接')">
       <el-input type="text" v-model="optionModel.href"></el-input>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/a-text-editor.vue

@@ -3,14 +3,14 @@
     <el-form-item :label="i18nt('显示下划线')">
       <el-switch v-model="optionModel.underline"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('颜色')">
-      <el-select v-model="optionModel.coloClass" clearable>
+<!--    <el-form-item :label="i18nt('颜色')">
+      <el-select v-model="optionModel.colorClass" clearable>
         <el-option value="f-red" label="橙"></el-option>
         <el-option value="f-dred" label="红"></el-option>
         <el-option value="f-green" label="绿"></el-option>
         <el-option value="f-blue" label="蓝"></el-option>
       </el-select>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item :label="i18nt('超链接')">
       <el-input type="text" v-model="optionModel.href"></el-input>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/colorClass-editor.vue

@@ -0,0 +1,28 @@
+<template>
+  <el-form-item :label="i18nt('颜色')">
+    <el-select v-model="optionModel.colorClass" clearable>
+      <el-option value="f-red" label="橙"></el-option>
+      <el-option value="f-dred" label="红"></el-option>
+      <el-option value="f-green" label="绿"></el-option>
+      <el-option value="f-blue" label="蓝"></el-option>
+    </el-select>
+  </el-form-item>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n"
+
+  export default {
+    name: "colorClass-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/labelColor-editor.vue

@@ -1,21 +1,30 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.labelColor')">
-    <el-color-picker v-model="optionModel.labelColor"></el-color-picker>
+    <div>
+      <el-select style="width: 130px;float: left;margin-right: 5px;" v-model="optionModel.labelColor" clearable>
+        <el-option value="#e6a23c" label="橙"></el-option>
+        <el-option value="#2a6494" label="蓝"></el-option>
+        <el-option value="#30b08f" label="绿"></el-option>
+        <el-option value="#909399" label="灰"></el-option>
+        <el-option value="#ea5353" label="红"></el-option>
+      </el-select>
+      <el-color-picker v-model="optionModel.labelColor"></el-color-picker>
+    </div>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n"
 
-  export default {
-    name: "labelColor-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "labelColor-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+}
 </script>
 
 <style scoped>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -29,7 +29,7 @@ const COMMON_PROPERTIES = {
   'labelHidden': 'labelHidden-editor',
   'rows': 'rows-editor',
   'required': 'required-editor',
-  'requiredHint': 'requiredHint-editor',
+  // 'requiredHint': 'requiredHint-editor',
   'validation': 'validation-editor',
   'validationHint': 'validationHint-editor',
   'readonly': 'readonly-editor',
@@ -157,6 +157,7 @@ const COMMON_PROPERTIES = {
   "tagFormCode": "project-tag-editor",
   "autoValueEnabled": "autoValueEnabled-editor",
   // "commonAttributeEnabled": "commonAttributeEnabled-editor"
+  "colorClass": "colorClass-editor",
 }
 
 const ADVANCED_PROPERTIES = {
@@ -168,7 +169,7 @@ const ADVANCED_PROPERTIES = {
   'controlsPosition': 'controlsPosition-editor',
   'minLength': 'minLength-editor',
   'maxLength': 'maxLength-editor',
-  'showWordLimit': 'showWordLimit-editor',
+  // 'showWordLimit': 'showWordLimit-editor',
   'prefixIcon': 'prefixIcon-editor',
   'suffixIcon': 'suffixIcon-editor',
   'switchWidth': 'switchWidth-editor',