cloud-web-corejs 1.0.109 → 1.0.111

package/src/components/xform/form-designer/setting-panel/option-items-setting.vue

@@ -9,12 +9,22 @@
     </el-form-item>
 
     <el-form-item label="默认值">
-      <el-input v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="!optionModel.optionItemValueType"></el-input>
-      <base-input-number v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="optionModel.optionItemValueType==1" />
-      <el-select v-model="optionModel.defaultValue" style="width: 100px" v-if="optionModel.optionItemValueType===2" clearable @clear="optionModel.defaultValue=null">
-        <el-option :value="true" label="true"></el-option>
-        <el-option :value="false" label="false"></el-option>
-      </el-select>
+      <template  v-if="selectedWidget.type === 'checkbox' || (selectedWidget.type === 'select' && selectedWidget.options.multiple)">
+        <a href="javascript:void(0);" class="a-link link-oneLind"
+           @click="openTableDataEdit()">
+          <span>{{ getDefaultValue() }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </template>
+      <template v-else>
+        <el-input v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="!optionModel.optionItemValueType"></el-input>
+        <base-input-number v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="optionModel.optionItemValueType==1" />
+        <el-select v-model="optionModel.defaultValue" style="width: 100px" v-if="optionModel.optionItemValueType===2" clearable @clear="optionModel.defaultValue=null">
+          <el-option :value="true" label="true"></el-option>
+          <el-option :value="false" label="false"></el-option>
+        </el-select>
+      </template>
+
     </el-form-item>
 		<el-radio-group
 			v-if="selectedWidget.type === 'radio' || (selectedWidget.type === 'select' && !selectedWidget.options.multiple)"
@@ -112,6 +122,31 @@
 				<el-button size="large" type="" @click="showImportCascaderDialogFlag = false">{{ i18nt('designer.hint.cancel') }}</el-button>
 			</div>
 		</el-dialog>
+    <el-dialog
+      v-if="dataDialogVisible"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('默认值编辑')"
+      :visible.sync="dataDialogVisible"
+      :show-close="!0"
+      append-to-body=""
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      width="75%"
+      v-dialog-drag
+    >
+      <template slot="footer">
+        <div class="dialog-footer">
+          <el-button type="" @click="dataDialogVisible = !1" class="button-sty" icon="el-icon-close">
+            {{ i18nt('designer.hint.cancel') }}
+          </el-button>
+          <el-button type="primary" @click="saveTableData" class="button-sty" icon="el-icon-check">
+            {{ i18nt('designer.hint.confirm') }}
+          </el-button>
+        </div>
+      </template>
+      <code-editor mode="json" :readonly="!1" v-model="tableDataOptions"></code-editor>
+    </el-dialog>
 	</div>
 </template>
 
@@ -138,7 +173,9 @@ export default {
 			showImportCascaderDialogFlag: false,
 
 			//separator: '||',
-			separator: ','
+			separator: ',',
+      dataDialogVisible:false,
+      tableDataOptions:[],
 		};
 	},
 	computed: {
@@ -237,7 +274,7 @@ export default {
 			if (this.selectedWidget.type === 'checkbox' || (this.selectedWidget.type === 'select' && this.selectedWidget.options.multiple)) {
 				this.optionModel.defaultValue = [];
 			} else {
-				this.optionModel.defaultValue = null;
+				this.optionModel.defaultValue = undefined;
 			}
 
 			this.emitDefaultValueChange();
@@ -261,7 +298,8 @@ export default {
 		},
     changeValueType(val){
       let optionItems = this.optionModel.optionItems;
-      this.optionModel.defaultValue = null;
+      // this.optionModel.defaultValue = undefined;
+      this.resetDefault();
       this.optionModel.optionItems.length = 0;
       if(val==2){
         optionItems.push({
@@ -277,7 +315,28 @@ export default {
       }
       this.$forceUpdate()
       this.emitDefaultValueChange();
-    }
+    },
+
+
+    openTableDataEdit: function () {
+      (this.dataDialogVisible = !0), (this.tableDataOptions = JSON.stringify(this.optionModel.defaultValue, null, '  '));
+    },
+    saveTableData: function () {
+      try {
+        (this.optionModel.defaultValue = JSON.parse(this.tableDataOptions)), (this.dataDialogVisible = !1);
+      } catch (e) {
+        this.$message.error(this.i18nt('designer.hint.invalidOptionsData') + e.message);
+      }
+    },
+    getDefaultValue(){
+      let result = this.optionModel.defaultValue;
+      if(result){
+        if(Array.isArray(result)){
+          result = result.join(",");
+        }
+      }
+      return result;
+    },
 	}
 };
 </script>

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/container-data-table/data-table-editor.vue

@@ -31,6 +31,30 @@
     <el-form-item :label="i18nt('是否隐藏复选框')">
       <el-switch v-model="optionModel.hideGridCheckBox"></el-switch>
     </el-form-item>
+
+    <el-form-item label="默认每页查询数">
+      <base-input-number v-model="optionModel.gridPageSize" size="mini" :min="1" :max="10000"/>
+    </el-form-item>
+    <el-form-item :label="i18nt('可选择每页查询数')"></el-form-item>
+    <el-form-item label-width="0">
+      <template v-if="optionModel.gridPageSizeList">
+        <draggable tag="ul" class="draggable-box" :list="optionModel.gridPageSizeList"
+                   v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }">
+          <li v-for="(item, index) in optionModel.gridPageSizeList" :key="index" class="col-item">
+            <i class="el-icon-s-operation drag-option"></i>
+            <base-input-number v-model="item.value" :min="1" :max="10000" style="width: 200px;"></base-input-number>
+            <el-button circle plain size="mini" type="danger" @click="optionModel.gridPageSizeList.splice(index,1)"
+                       icon="el-icon-minus" class="col-delete-button" style="position: unset;"></el-button>
+          </li>
+        </draggable>
+      </template>
+      <div>
+        <el-button type="text" @click="addGridPageSizeList" icon="el-icon-circle-plus-outline" class="add-option">
+          {{ i18nt('新增分页数') }}
+        </el-button>
+      </div>
+    </el-form-item>
+
     <!--    <el-form-item :label="i18nt('显示导出')">
           <el-switch v-model="optionModel.showExportBtn"></el-switch>
         </el-form-item>-->
@@ -484,7 +508,7 @@
 
 <script>
 import i18n from '../../../../../../components/xform/utils/i18n';
-// import Draggable from 'vuedraggable';
+import Draggable from 'vuedraggable';
 import {deepClone, generateId} from '../../../../../../components/xform/utils/util';
 import Sortable from 'sortablejs';
 import requestaccessDialog from '../../../../../../views/user/form/report_requestaccess/dialog.vue'
@@ -499,6 +523,7 @@ export default {
   componentName: 'PropertyEditor',
   mixins: [i18n, eventMixin],
   components: {
+    Draggable,
     requestaccessDialog,
     conditionEditor,
     tableColumnDialog
@@ -1034,6 +1059,12 @@ export default {
       let xformImportTemplateFile = setttingConfig.xformImportTemplateFile || defaultUrl;
       if (!xformImportTemplateFile) return;
       this.$commonFileUtil.downloadFile(xformImportTemplateFile, "通用导入模板.xlsx");
+    },
+    addGridPageSizeList() {
+      if (this.optionModel.gridPageSizeList === undefined) {
+        this.$set(this.optionModel, "gridPageSizeList", [])
+      }
+      this.optionModel.gridPageSizeList.push({value: 50})
     }
   }
 };

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -272,7 +272,21 @@
             ></el-button>
           </template>
         </el-table-column>
-
+<el-table-column
+          :label="i18nt('显示名称颜色')"
+          width="100"
+          prop="fixed"
+        >
+          <template #default="scope">
+            <el-select  v-model="scope.row.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>
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作" width="150" fixed="right">
           <template slot="header">
@@ -967,7 +981,8 @@ export default {
         exportType: null,
         footerDataType: null,
         footerMethodConfg: null,
-        widgetList: []
+        widgetList: [],
+        labelColor:null
         // treeNode: false,
       };
       return row;

package/src/components/xform/form-designer/setting-panel/property-editor/container-detail-pane/detail-pane-editor.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-<!--    <el-form-item :label="i18nt('绑定数据列表key')">
-      <el-input v-model="optionModel.tableRef"></el-input>
-    </el-form-item>-->
+    <el-form-item :label="i18nt('内容默认收起')">
+      <el-switch v-model="optionModel.defaultCollapse"></el-switch>
+    </el-form-item>
   </div>
 </template>
 

package/src/components/xform/form-designer/setting-panel/property-editor/field-button/clickBindEvent-editor.vue

@@ -6,8 +6,17 @@
         <el-option value="2" label="列表添加数据"></el-option>
       </el-select>
     </el-form-item>
-    <searchDialogEventEditor :designer="designer" :selectedWidget="selectedWidget" :optionModel.sync="optionModel" v-if="optionModel.clickBindEvent=='1'"></searchDialogEventEditor>
-    <addTableDataEventEditor :designer="designer" :selectedWidget="selectedWidget" :optionModel.sync="optionModel" v-if="optionModel.clickBindEvent=='2'"></addTableDataEventEditor>
+    <el-form-item label="点击前置事件" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onBeforeClickButton', evnentParams)">
+        <span>{{ optionModel.onBeforeClickButton }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <searchDialogEventEditor :designer="designer" :selectedWidget="selectedWidget" :optionModel.sync="optionModel"
+                             v-if="optionModel.clickBindEvent=='1'"></searchDialogEventEditor>
+    <addTableDataEventEditor :designer="designer" :selectedWidget="selectedWidget" :optionModel.sync="optionModel"
+                             v-if="optionModel.clickBindEvent=='2'"></addTableDataEventEditor>
   </div>
 </template>
 <script>
@@ -15,53 +24,59 @@ import searchDialogEventEditor from "./search-dialog-event-editor.vue";
 import addTableDataEventEditor from "./addTableData-event-editor.vue";
 import {defaultSearchDialogConfig} from "../../../../../../components/xform/form-designer/widget-panel/widgetsConfig";
 
-
 import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 let clickBindEventConfig = {
-  searchDialogConfig:{
+  searchDialogConfig: {
     ...defaultSearchDialogConfig
   },
-  addTableDataConfig:{
-    tableRef:null,
-    tableData:{}
+  addTableDataConfig: {
+    tableRef: null,
+    tableData: {}
   }
 }
 
 export default {
   name: "clickBindEvent-editor",
-  mixins: [i18n],
+  mixins: [i18n, eventMixin],
   props: {
     designer: Object,
     selectedWidget: Object,
     optionModel: Object,
   },
-  components:{
+  components: {
     searchDialogEventEditor,
     addTableDataEventEditor
   },
-  provide(){
+  provide() {
+    return {
+      defaultClickBindEventConfig: clickBindEventConfig
+    }
+  },
+  data() {
     return {
-      defaultClickBindEventConfig:clickBindEventConfig
+      evnentParams: ["dataId", "formCode", "done"]
     }
   },
   created() {
-    if(!this.optionModel.addTableDataConfig){
+    if (!this.optionModel.addTableDataConfig) {
       this.$set(this.optionModel, 'addTableDataConfig', this.$baseLodash.cloneDeep(clickBindEventConfig.addTableDataConfig));
     }
-    if(!this.optionModel.searchDialogConfig){
+    if (!this.optionModel.searchDialogConfig) {
       this.$set(this.optionModel, 'searchDialogConfig', this.$baseLodash.cloneDeep(clickBindEventConfig.searchDialogConfig));
     }
-    if(this.optionModel.searchDialogConfig.multipleChoices === void 0){
-      if(this.selectedWidget.type=='vabsearch'){
-        this.$set(this.optionModel.searchDialogConfig,'multipleChoices',false);
-      }else{
-        this.$set(this.optionModel.searchDialogConfig,'multipleChoices',true);
+    if (this.optionModel.searchDialogConfig.multipleChoices === void 0) {
+      if (this.selectedWidget.type == 'vabsearch') {
+        this.$set(this.optionModel.searchDialogConfig, 'multipleChoices', false);
+      } else {
+        this.$set(this.optionModel.searchDialogConfig, 'multipleChoices', true);
       }
     }
   },
-  methods:{
-    changeEventType(val){
+  methods: {
+    changeEventType(val) {
       // this.optionModel.clickBindEventConfig = clickBindEventConfig;
       // this.$set(this.optionModel, "clickBindEventConfig", clickBindEventConfig);
     }

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

@@ -12,9 +12,9 @@
     <el-form-item :label="i18nt('显示文件大小')">
       <el-switch v-model="optionModel.showFileSize"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('显示创建人')">
+<!--    <el-form-item :label="i18nt('显示创建人')">
       <el-switch v-model="optionModel.showFileCreateBy"></el-switch>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item :label="i18nt('显示创建时间')">
       <el-switch v-model="optionModel.showFileCreateDate"></el-switch>
     </el-form-item>

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

@@ -7,6 +7,10 @@
       <el-switch v-model="optionModel.formScriptEnabled" @change="changeFormScriptEnabled"></el-switch>
     </el-form-item>
     <template>
+
+<!--      <el-form-item label="请求表单编码" v-if="optionModel.formScriptEnabled">
+        <el-input v-model="optionModel.httpFormCode" clearable></el-input>
+      </el-form-item>-->
       <el-form-item label="表单脚本编码" v-if="optionModel.formScriptEnabled">
         <el-input v-model="optionModel.formScriptCode" clearable></el-input>
       </el-form-item>

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-show="false">
+  <div>
     <el-form-item
       :label="i18nt('designer.setting.formula')"
       v-if="optionModel.formulaEnabled"

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

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item v-show="false" :label="i18nt('designer.setting.formulaEnabled')">
+  <el-form-item :label="i18nt('designer.setting.formulaEnabled')">
     <el-switch v-model="optionModel.formulaEnabled" @change="handleChangeEvent"></el-switch>
   </el-form-item>
 </template>

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/property-editor/labelIconClass-editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show="false">
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{i18nt('designer.setting.customLabelIcon')}}</el-divider>
     </el-form-item>

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

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.labelIconPosition')">
+  <el-form-item :label="i18nt('designer.setting.labelIconPosition')" v-show="false">
     <el-select v-model="optionModel.labelIconPosition">
       <el-option v-for="item in labelIconPosition" :key="item.value" :label="item.label"
                  :value="item.value">

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

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.labelTooltip')">
+  <el-form-item :label="i18nt('designer.setting.labelTooltip')" v-show="false">
     <el-input type="text" v-model="optionModel.labelTooltip"></el-input>
   </el-form-item>
 </template>

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

@@ -1,32 +1,32 @@
 <template>
-  <el-form-item
-    :label="i18nt('designer.setting.required')"
-    v-show="showProperty()"
-  >
-    <el-switch v-model="optionModel.required"></el-switch>
+  <el-form-item :label="i18nt('designer.setting.required')">
+    <el-switch v-model="optionModel.required" @change="handleChangeEvent"></el-switch>
   </el-form-item>
 </template>
 
 <script>
-import i18n from "../../../../../components/xform/utils/i18n";
+  import i18n from "../../../../../components/xform/utils/i18n"
 
-export default {
-  name: "required-editor",
-  mixins: [i18n],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  methods: {
-    showProperty() {
-      let widgetRef = this.designer.vueInstance.getWidgetRef(
-        this.selectedWidget.options.name
-      );
-      return widgetRef?.$attrs["table-condition"] !== true;
+  export default {
+    name: "required-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
     },
-  },
-};
+    methods: {
+      handleChangeEvent(val) {
+        const wRef = this.designer.formWidget.getSelectedWidgetRef()
+        if (wRef && wRef.setRequired) {
+          wRef.setRequired(val)
+        }
+      },
+
+    }
+  }
 </script>
 
-<style scoped></style>
+<style scoped>
+
+</style>

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

@@ -5,10 +5,10 @@
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../components/xform/utils/i18n"
+import propertyMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
 
-  export default {
+export default {
     name: "requiredHint-editor",
     mixins: [i18n, propertyMixin],
     props: {