cloud-web-corejs 1.0.54-dev.191 → 1.0.54-dev.193

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -157,6 +157,9 @@ export default {
 
     this.selectMulti = this.option.multiple ?? true;
     this.dataTableOption.config.checkboxConfig.showHeader = this.selectMulti;
+    if(this.option.queryParam){
+      this.dataTableOption.queryParam = this.option.queryParam;
+    }
     this.getReportTemplate();
   },
   methods: {

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

@@ -0,0 +1,77 @@
+<template>
+  <span>{{ getI18nLabel(field.options.label) }}</span>
+</template>
+
+<script>
+import emitter from '../../../../../components/xform/utils/emitter'
+import i18n from "../../../../../components/xform/utils/i18n";
+import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
+
+export default {
+  name: "dropdown-item-widget",
+  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false
+    },
+
+    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
+      type: String,
+      default: ''
+    },
+
+  },
+  components: {
+
+  },
+  computed: {
+
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList()
+    this.initEventHandler()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+
+  methods: {
+
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+
+</style>

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

@@ -0,0 +1,106 @@
+<template>
+  <static-content-wrapper :designer="designer" :field="field" :design-state="designState"
+                          :display-style="field.options.displayStyle"
+                          :parent-widget="parentWidget" :parent-list="parentList"
+                          :index-of-parent-list="indexOfParentList"
+                          :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
+                          :sub-form-row-id="subFormRowId">
+    <el-dropdown trigger="hover">
+
+      <el-button type="primary" class="button-sty" size="mini">
+        <span>{{ getI18nLabel(field.options.label) }}</span><span class="line"></span> <i
+        class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <template v-for="(subWidget,index) in field.widgetList">
+          <el-dropdown-item v-if="!subWidget.options.hidden" :key="index" :icon="subWidget.options.icon"
+                            @click.native="handleSubButtonWidgetClick(index)">
+<!--            {{ getI18nLabel(subWidget.options.label) }}-->
+            <dropdownItemWidget :field="subWidget" :parent-list="field.widgetList"
+                                :index-of-parent-list="index" :parent-widget="field" :tableParam="tableParam"
+                                :formItemProp="formItemProp" :ref="'item'+index">
+            </dropdownItemWidget>
+          </el-dropdown-item>
+
+        </template>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </static-content-wrapper>
+</template>
+
+<script>
+import StaticContentWrapper from './static-content-wrapper'
+import emitter from '../../../../../components/xform/utils/emitter'
+import i18n from "../../../../../components/xform/utils/i18n";
+import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
+import dropdownItemWidget from '../../../../../components/xform/form-designer/form-widget/field-widget/dropdown-item-widget.vue';
+
+export default {
+  name: "dropdown-menu-widget",
+  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false
+    },
+
+    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
+      type: String,
+      default: ''
+    },
+
+  },
+  components: {
+    StaticContentWrapper,
+    dropdownItemWidget
+  },
+  computed: {},
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList()
+    this.initEventHandler()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+
+  methods: {
+    handleSubButtonWidgetClick(index) {
+      this.$refs["item"+index].handleButtonWidgetClick()
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+
+</style>

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

@@ -908,9 +908,15 @@ modules = {
         }
       }
 
+      // dialogQueryParam.
+      let queryParam = null;
+      if(searchDialogConfig.dialogQueryParam){
+        queryParam = this.handleCustomEvent(searchDialogConfig.dialogQueryParam)
+      }
       this.getFormRef().openSearchDialog({
         formCode: formCode,
         rows,
+        queryParam,
         multiple: searchDialogConfig.multipleChoices || false,
         confirm: (rows) => {
           this.handleConfirmSearchDialog(rows, false, flag);

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

@@ -12,7 +12,8 @@
 import emitter from '../../../../../components/xform/utils/emitter'
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-import FormItemWrapper from "../../../../../components/xform/form-designer/form-widget/field-widget/form-item-wrapper.vue";
+import FormItemWrapper
+  from "../../../../../components/xform/form-designer/form-widget/field-widget/form-item-wrapper.vue";
 
 export default {
   name: "status-widget",
@@ -104,7 +105,7 @@ export default {
         let value = null;
         let statusParam = this.field.options.statusParam;
         if (statusParam.length) {
-          value = statusParam[0].value ?? 0
+          value = this.field.options.defaultValue ?? (statusParam[0].value ?? 0)
         } else {
           value = 0;
         }

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

@@ -8,9 +8,14 @@
       </el-radio-group>
     </el-form-item>
 
-<!--    <el-form-item label="选项值为数值">
-      <el-switch v-model="optionModel.isNumericOptionItemValue" @change="changeValueType"></el-switch>
-    </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>
+    </el-form-item>
 		<el-radio-group
 			v-if="selectedWidget.type === 'radio' || (selectedWidget.type === 'select' && !selectedWidget.options.multiple)"
 			v-model="optionModel.defaultValue"

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

@@ -501,6 +501,27 @@ import i18n from "../../../../../../components/xform/utils/i18n";
 import Sortable from "sortablejs";
 import {generateId} from "../../../../../../components/xform/utils/util";
 import columnRenderDialog from "./columnRenderDialog.vue"
+import {businessFields} from "@base/components/xform/form-designer/widget-panel/widgetsConfig";
+
+let businessOptions = [
+  {
+    value: "_createBy",
+    label: "创建人",
+  },
+  {
+    value: "_modifyBy",
+    label: "更新人",
+  },
+  {
+    value: "create_date",
+    label: "创建时间",
+  },
+  {
+    value: "modify_date",
+    label: "更新时间",
+  },
+];
+let userFields = ["_createBy","_modifyBy","create_date","modify_date"]
 
 export default {
   mixins: [i18n],
@@ -512,6 +533,7 @@ export default {
   components: {columnRenderDialog},
   inject: ["openWidgetPropertyDialog"],
   data() {
+
     return {
       pictLoading: true,
       tableColumnConfigTitle: null,
@@ -534,6 +556,8 @@ export default {
           label: "right",
         },
       ],
+      businessOptions,
+      userFields,
       op: [
         {
           label: "edit Format",
@@ -633,6 +657,11 @@ export default {
             },
           ],
         },
+
+        {
+          label: "业务模块",
+          options: businessOptions
+        },
         {
           label: "Date Format",
           options: [
@@ -1151,6 +1180,15 @@ export default {
         if (!row.width || row.width == 47) row.width = 150;
         if (!row.prop) row.prop = tmpId;
         if (!row.label) row.label = tmpId;
+
+        if(this.userFields.includes(row.formatS)){
+          let item = this.businessOptions.find(item=>item.value==row.formatS);
+          if(item){
+            row.prop = item.value;
+            row.label = item.label;
+          }
+        }
+
         row.sortable = true;
 
         if (row.formatS == "editAttachment") {

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

@@ -9,6 +9,13 @@
     <el-form-item label="弹框表单编码">
       <el-input type="text" v-model="eventConfig.formCode"></el-input>
     </el-form-item>
+    <el-form-item label="弹框参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option2)">
+        <span>{{ eventConfig.dialogQueryParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
     <template v-if="selectedWidget.type == 'vabsearch'">
       <el-form-item label="关联来源字段">
         <el-input type="text" v-model="eventConfig.valueSourceField"></el-input>
@@ -157,6 +164,15 @@ export default {
           this.eventConfig.confirmCallback = code;
           this.$forceUpdate()
         }
+      },
+      option2:{
+        customCode:()=>{
+          return this.eventConfig.dialogQueryParam;
+        },
+        callback:(code)=>{
+          this.eventConfig.dialogQueryParam = code;
+          this.$forceUpdate()
+        }
       }
     }
   },

package/src/components/xform/form-designer/setting-panel/property-editor/field-dropdown-menu/dropdown-item-editor.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+
+  </div>
+</template>
+<script>
+import i18n from "@base/components/xform/utils/i18n";
+
+export default {
+  name: "dropdown-menu-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <el-form-item :label="i18nt('designer.setting.tabPaneSetting')"></el-form-item>
+    <el-form-item label-width="0" class="panes-setting">
+      <draggable tag="ul" :list="selectedWidget.widgetList"
+                 v-bind="{group:'panesGroup', ghostClass: 'ghost', handle: '.drag-option'}" class="draggable-box">
+        <li v-for="(tpItem, tpIdx) in selectedWidget.widgetList" :key="tpIdx" class="col-item">
+          <el-input type="text" v-model="tpItem.options.label" style="width:calc(100% - 65px) !important;"></el-input>
+          <i class="el-icon-s-operation drag-option"></i>
+          <el-button circle plain size="mini" type="danger" @click="deleteTabPane(selectedWidget, tpIdx)"
+                     icon="el-icon-minus" class="col-delete-button"></el-button>
+        </li>
+        <div>
+          <el-button type="text" @click="addTabPane(selectedWidget)" icon="el-icon-circle-plus-outline" class="add-option">{{i18nt('designer.setting.addTabPane')}}</el-button>
+        </div>
+      </draggable>
+    </el-form-item>
+  </div>
+</template>
+<script>
+import i18n from "@base/components/xform/utils/i18n";
+import Draggable from 'vuedraggable'
+import {deepClone} from "../../../../../../components/xform/utils/util";
+
+export default {
+  name: "dropdown-menu-editor",
+  components: {Draggable},
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  methods: {
+    onTabPaneActiveChange(evt, tpItem) {
+      //TODO: !!!
+    },
+
+    addTabPane(curTabs) {
+      this.designer.addDropdownItem(curTabs)
+      this.designer.emitHistoryChange()
+    },
+
+    deleteTabPane(curTabs, tpIdx) {
+      if (curTabs.widgetList.length === 1) {
+        this.$message.info(this.i18nt('designer.hint.lastPaneCannotBeDeleted'))
+        return
+      }
+
+      this.designer.deleteDropdownItem(curTabs, tpIdx)
+      this.designer.emitHistoryChange()
+    },
+
+  }
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -2,7 +2,7 @@
   <div>
     <el-form-item label="状态配置">
       <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
-        <span>{{ optionModel.statusParam.length?"已维护":"" }}</span>
+        <span>{{ optionModel.statusParam.length ? "已维护" : "" }}</span>
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
@@ -21,14 +21,24 @@
       @closed="closeHandle"
     >
       <div class="cont">
-        <el-form-item label="选项值类型">
-<!--          <el-switch v-model="optionItemValueType" @change="changeValueType"></el-switch>-->
+        <el-form-item label="选项值类型" style="width: 350px;">
+          <!--          <el-switch v-model="optionItemValueType" @change="changeValueType"></el-switch>-->
           <el-radio-group v-model="optionItemValueType" @change="changeValueType">
             <el-radio :label="0">文本</el-radio>
             <el-radio :label="1">数值</el-radio>
             <el-radio :label="2">布尔值</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="默认值" style="width: 300px;">
+          <el-input v-model="defaultValue" v-if="!optionItemValueType"></el-input>
+          <base-input-number v-model="defaultValue" ref="defaultNumberInput"
+                             v-if="optionItemValueType==1"/>
+          <el-select v-model="defaultValue" v-if="optionItemValueType===2" clearable
+                     @clear="defaultValue=null">
+            <el-option :value="true" label="true"></el-option>
+            <el-option :value="false" label="false"></el-option>
+          </el-select>
+        </el-form-item>
         <el-table
           ref="singleTable"
           width="100%"
@@ -55,8 +65,8 @@
           <el-table-column label="字段值" width="150" prop="value">
             <template slot-scope="scope">
               <el-input v-model="scope.row.value" v-if="optionItemValueType===0"></el-input>
-              <base-input-number v-model="scope.row.value"  v-if="optionItemValueType===1"></base-input-number>
-              <template v-if="optionItemValueType===2">{{scope.row.value}}</template>
+              <base-input-number v-model="scope.row.value" v-if="optionItemValueType===1"></base-input-number>
+              <template v-if="optionItemValueType===2">{{ scope.row.value }}</template>
             </template>
           </el-table-column>
           <el-table-column label="状态颜色" width="100" prop="type">
@@ -128,14 +138,15 @@ export default {
     selectedWidget: Object,
     optionModel: Object,
   },
-  data(){
+  data() {
     return {
-      showDialog:false,
-      tableData:[],
-      optionItemValueType:0
+      showDialog: false,
+      tableData: [],
+      optionItemValueType: 0,
+      defaultValue: null
     }
   },
-  methods:{
+  methods: {
     dragSort: function () {
       var e = this.$refs.singleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0],
         t = this.tableData;
@@ -150,51 +161,59 @@ export default {
         }
       });
     },
-    closeHandle(){
+    closeHandle() {
       this.showDialog = false;
     },
-    openDialog(){
+    openDialog() {
       this.optionItemValueType = this.optionModel.optionItemValueType
+      this.defaultValue = this.optionModel.defaultValue == null ? undefined : null
       this.tableData = this.$baseLodash.cloneDeep(this.optionModel.statusParam);
       this.showDialog = true;
       this.$nextTick(function () {
         this.dragSort();
       });
     },
-    addItem(){
+    addItem() {
       this.tableData.push({
-        value:null,
-        label:null,
-        type:null
+        value: null,
+        label: null,
+        type: null
       })
     },
-    confirmDialog(){
+    confirmDialog() {
       this.optionModel.optionItemValueType = this.optionItemValueType;
+      this.optionModel.defaultValue = (this.defaultValue === "" || this.defaultValue === undefined) ? null : this.defaultValue;
       this.optionModel.statusParam = this.$baseLodash.cloneDeep(this.tableData);
       this.showDialog = false;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         let fieldWidget = this.designer.formWidget.getWidgetRef(this.optionModel.name);
         fieldWidget.refreshWidget();
       })
 
     },
-    deleteItem(rowIndex){
-      this.tableData.splice(rowIndex,1);
+    deleteItem(rowIndex) {
+      this.tableData.splice(rowIndex, 1);
     },
-    changeValueType(val){
+    changeValueType(val) {
       this.tableData = [];
-      if(val==2){
+      if (val == 2) {
         this.tableData.push({
-          label:"是",
-          value:true,
-          type:"success"
+          label: "是",
+          value: true,
+          type: "success"
         });
         this.tableData.push({
-          label:"否",
-          value:false,
-          type:"danger"
+          label: "否",
+          value: false,
+          type: "danger"
         });
       }
+      if (val == 1) {
+        this.defaultValue = undefined
+      } else {
+        this.defaultValue = null
+      }
+
     }
   }
 }

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

@@ -111,6 +111,9 @@ const COMMON_PROPERTIES = {
   'showRuleFlag': 'showRuleFlag-editor',
   'widgetShowRuleFlag': 'widgetShowRuleFlag-editor',
 
+  'dropdownMenuFlag': 'dropdown-menu-editor',
+  'dropdownItemFlag': 'dropdown-item-editor',
+
   //弹框
   title: "title-editor",
   width: "width-editor",

package/src/components/xform/form-designer/widget-panel/index.vue

@@ -65,6 +65,8 @@
             </el-collapse-item>
             <!-- -->
 
+
+
           </el-collapse>
 
         </el-tab-pane>
@@ -112,6 +114,20 @@
               </draggable>
             </el-collapse-item>
 
+            <el-collapse-item name="5" :title="i18nt('业务组件')">
+              <draggable tag="ul" :list="businessFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
+                         :move="checkFieldMove"
+                         :clone="handleFieldWidgetClone" ghost-class="ghost" :sort="false">
+                <li v-for="(fld, index) in businessFields" :key="index" class="field-widget-item"
+                    :title="fld.displayName"
+                    @dblclick="addFieldByDbClick(fld)">
+              <span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
+              <span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
+              </span>
+                </li>
+              </draggable>
+            </el-collapse-item>
+
             <el-collapse-item v-if="!!metaFields.main.entityName" name="1" :title="metaFields.main.entityLabel">
               <draggable tag="ul" :list="metaFields.main.fieldList"
                          :group="{name: 'dragGroup', pull: 'clone', put: false}"

package/src/components/xform/form-designer/widget-panel/indexMixin.js

@@ -4,7 +4,8 @@ import {
   containers,
   basicFields,
   advancedFields,
-  customFields
+  customFields,
+  businessFields
 } from "./widgetsConfig"
 import {
   formTemplates
@@ -43,6 +44,7 @@ modules = {
       basicFields: baseRefUtil.basicFields,
       advancedFields: baseRefUtil.advancedFields,
       customFields: baseRefUtil.customFields,
+      businessFields:businessFields,
       commonAdvancedFields: [],
       chartContainers: [],
       chartWidgets: [],
@@ -186,6 +188,15 @@ modules = {
         return !this.isBanned(fld.type) && this.getIsShow(fld);
       });
 
+      this.businessFields = this.businessFields.map(fld => {
+        return {
+          ...fld,
+          displayName: this.i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`)
+        };
+      }).filter(fld => {
+        return !this.isBanned(fld.type) && this.getIsShow(fld);
+      });
+
       this.commonAdvancedFields = advancedFields.map(fld => {
         return {
           ...fld,