cloud-web-corejs 1.0.54-dev.33 → 1.0.54-dev.331

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

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-form-item :label="i18nt('启用流程')">
+<!--    <el-form-item :label="i18nt('启用流程')">
       <el-switch v-model="optionModel.wfEnabled"></el-switch>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{ i18nt('designer.setting.columnSetting') }}</el-divider>
     </el-form-item>

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/container-grid-col/grid-col-offset-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colOffsetTitle')">
-    <el-input-number v-model.number="optionModel.offset" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.offset" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-pull-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colPullTitle')">
-    <el-input-number v-model.number="optionModel.pull" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.pull" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-push-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colPushTitle')">
-    <el-input-number v-model.number="optionModel.push" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.push" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-list-h5/list-h5-editor.vue

@@ -694,14 +694,6 @@ export default {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
-
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
         columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));

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

@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-form-item label="复制数据处理" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('copyDataHandle', copyDataHandleParams)">
+        <span>{{ optionModel.copyDataHandle }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n"
+  import eventMixin
+    from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+
+  export default {
+    name: "copyButton-editor",
+    mixins: [i18n,eventMixin],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+    data(){
+      return {
+        copyDataHandleParams: ["dataId", "formCode", "copyData"]
+      }
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin.js

@@ -10,12 +10,12 @@ export default {
       if(funStr) name = "已维护"
       return name;
     },
-    editEventHandler(eventName, eventParams, isFormSetting) {
+    editEventHandler(eventName, eventParams, option) {
       this.dispatch(
         "SettingPanel",
         "editEventHandler",
         [eventName, [...eventParams]],
-        isFormSetting
+        option
       );
     },
   },

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onAfterConfirmFile-editor.vue

@@ -0,0 +1,32 @@
+<template>
+  <el-form-item label="onAfterConfirmFile" label-width="150px">
+    <a href="javascript:void(0);" class="a-link link-oneLind"
+       @click="editEventHandler('onAfterConfirmFile', eventParams)">
+      <span>{{ optionModel.onAfterConfirmFile }}</span>
+      <i class="el-icon-edit"></i>
+    </a>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+
+export default {
+  name: "onAfterConfirmFile-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: ["dataId", "formCode", "attachments", "fileInfos"],
+    };
+  },
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onClick-editor.vue

@@ -26,9 +26,9 @@ export default {
   },
   computed:{
     eventParams(){
-      let eventParams = ["dataId", "formCode"];
+      let eventParams = ["dataId", "formCode","event"];
       if (this.optionModel.rowFlag) {
-        eventParams.push("row", "index");
+        eventParams.push("row", "index","event");
       }
       return eventParams;
     }

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-button/search-dialog-event-editor.vue

@@ -4,12 +4,28 @@
       <el-divider class="custom-divider">选择弹框配置</el-divider>
     </el-form-item>
     <el-form-item label="是否多选">
-      <el-switch v-model="eventConfig.multipleChoices"></el-switch>
+      <el-switch v-model="eventConfig.multipleChoices"
+                 v-if="selectedWidget.type !== 'singerSearch' && selectedWidget.type !== 'multiSearch'"></el-switch>
+      <span v-else>{{eventConfig.multipleChoices?'是':'否'}}</span>
     </el-form-item>
     <el-form-item label="弹框表单编码">
       <el-input type="text" v-model="eventConfig.formCode"></el-input>
     </el-form-item>
-    <template v-if="selectedWidget.type == 'vabsearch'">
+    <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>
+    <el-form-item label="弹框自定义参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('dialogCustomParam', ['dataId', 'formCode','rows'], option3)">
+        <span>{{ eventConfig.dialogCustomParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <template v-if="hasConfig('vabsearchFlag')">
       <el-form-item label="关联来源字段">
         <el-input type="text" v-model="eventConfig.valueSourceField"></el-input>
       </el-form-item>
@@ -21,7 +37,7 @@
     <!--      <el-form-item label="多选">
           <el-switch v-model="optionModel.multiple"></el-switch>
         </el-form-item>-->
-    <template v-if="selectedWidget.type != 'vabsearch'">
+    <template v-if="!hasConfig('vabsearchFlag')">
       <el-form-item label="关联表格">
         <el-switch v-model="eventConfig.tableEnabled"></el-switch>
       </el-form-item>
@@ -40,6 +56,13 @@
         }}
       </el-button>
     </el-form-item>
+    <el-form-item label="确认回调">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option1)">
+        <span>{{ eventConfig.confirmCallback }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
 
     <el-dialog
       custom-class="dialog-style list-dialog"
@@ -51,7 +74,7 @@
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
       top="5vh"
-      width="500px"
+      width="600px"
       v-dialog-drag
     >
       <div class="cont">
@@ -69,6 +92,11 @@
               <el-input v-model="scope.row.targetField"></el-input>
             </template>
           </el-table-column>
+          <el-table-column label="目标数据属性名称" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetFormField"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="来源字段" width="150" prop="sourceField">
             <template slot-scope="scope">
               <el-input v-model="scope.row.sourceField"></el-input>
@@ -107,6 +135,7 @@
         </el-table>
       </div>
       <div class="dialog-footer" slot="footer">
+        <span class="fl tips">注：'目标字段'与'目标数据属性名称'只需要维护一个即可。</span>
         <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
           {{ i18nt('designer.hint.cancel') }}
         </el-button>
@@ -120,9 +149,12 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n"
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
 
 export default {
-  mixins: [i18n],
+  mixins: [i18n, eventMixin, propertyMixin],
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -133,6 +165,33 @@ export default {
     return {
       showDialog: false,
       tableData: [],
+      option1: {
+        customCode: () => {
+          return this.eventConfig.confirmCallback;
+        },
+        callback: (code) => {
+          this.eventConfig.confirmCallback = code;
+          this.$forceUpdate()
+        }
+      },
+      option2: {
+        customCode: () => {
+          return this.eventConfig.dialogQueryParam;
+        },
+        callback: (code) => {
+          this.eventConfig.dialogQueryParam = code;
+          this.$forceUpdate()
+        }
+      },
+      option3: {
+        customCode: () => {
+          return this.eventConfig.dialogCustomParam;
+        },
+        callback: (code) => {
+          this.eventConfig.dialogCustomParam = code;
+          this.$forceUpdate()
+        }
+      },
     }
   },
   computed: {

package/src/components/xform/form-designer/setting-panel/property-editor/field-date-range/date-range-defaultTime-editor.vue

@@ -0,0 +1,27 @@
+<template>
+
+  <el-form-item :label="i18nt('默认时间')">
+    <el-time-picker v-model="optionModel.defaultTime" is-range @change="emitDefaultValueChange"
+                    format="HH:mm:ss" value-format="HH:mm:ss" style="width: 100%">
+    </el-time-picker>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n"
+import propertyMixin from "../propertyMixin"
+
+export default {
+  name: "date-range-defaultTime-editor",
+  mixins: [i18n, propertyMixin],
+  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-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>