cloud-web-corejs 1.0.54-dev.335 → 1.0.54-dev.337

package/package.json

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

package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js

@@ -774,10 +774,23 @@ tmixins = {
                 } else {
                   // error_win(resultMsg);
                   // layer.close(opts.dialogObjIndex);
-                  that.$errorMsg(resultMsg);
+
+                  let items = param.map(item=>{
+                    return {
+                      ...item,
+                      _resultType: "error",
+                      _resultContent: resultMsg.content,
+                    }
+                  })
+                  failNum = failNum + items.length;
+                  that.failRows.push(...items);
+
+                  that.failRows = that.failRows.sort(compareV('impSeq'));
+
+                  /* that.$errorMsg(resultMsg);
                   that.showContent = false;
                   that.clearImportTimer();
-                  return;
+                  return; */
                 }
               } else {
                 var data = that.resultData.data[index];

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

@@ -548,6 +548,14 @@ modules = {
       }
     },
     initOptionItemsHandle() {
+      if(this.tableParam){
+        if(this.field._syncInited){
+          this.handleCustomEvent(
+            this.field.options.formScriptSuccess
+          );
+        }
+        return
+      }
       this.initGloatOptionItems(true);
     },
     initGloatOptionItems(initFlag) {
@@ -560,7 +568,8 @@ modules = {
         this.field.type === "radio" ||
         this.field.type === "checkbox" ||
         this.field.type === "select" ||
-        this.field.type === "cascader"
+        this.field.type === "cascader" ||
+        this.field.type === "status"
       ) {
         /* this.field.options.optionItems.forEach(item=>{
           if (!item.hasOwnProperty('disabled')) {
@@ -643,7 +652,8 @@ modules = {
         this.getOptionItemLabelKey(),
         this.getOptionItemValueKey()
       );
-      this.field.options.optionItems = optionItems
+      // this.field.options.optionItems = optionItems
+      this.setOptionItems(optionItems)
       let tableParam = this.tableParam;
       if (tableParam) {
         if (initFlag) {
@@ -652,6 +662,15 @@ modules = {
         this.loadTableOtions(optionItems)
       }
     },
+    setOptionItems(rows){
+      let formScriptEnabledTypes = ['select', 'checkbox', 'radio',"cascader"]
+      let widgetType = this.field.type;
+      if(formScriptEnabledTypes.includes(widgetType)){
+        this.field.options.optionItems = rows || [];
+      }else if(widgetType=="status"){
+        widget.options.statusParam = rows || [];
+      }
+    },
     loadTableOtions(e) {
       let tableParam = this.tableParam;
       if (tableParam) {
@@ -1400,7 +1419,8 @@ modules = {
         this.getOptionItemLabelKey(),
         this.getOptionItemValueKey()()
       );
-      this.field.options.optionItems = optionItems
+      // this.field.options.optionItems = optionItems
+      this.setOptionItems(optionItems)
     },
     loadOptions: function (e, rowOptionFlag) {
       let optionItems = baseRefUtil.translateOptionItems(
@@ -1409,7 +1429,8 @@ modules = {
         this.getOptionItemLabelKey(),
         this.getOptionItemValueKey()
       );
-      this.field.options.optionItems = optionItems
+      // this.field.options.optionItems = optionItems
+      this.setOptionItems(optionItems)
     },
     getOptionKey() {
       let key = "optionItems-" + this.field.options.name
@@ -1430,7 +1451,8 @@ modules = {
         this.getOptionItemLabelKey(),
         this.getOptionItemValueKey()
       );
-      this.field.options.optionItems = optionItems;
+      // this.field.options.optionItems = optionItems;
+      this.setOptionItems(optionItems)
     },
     getOptions: function () {
       return this.getOptionItems();

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

@@ -62,11 +62,13 @@ export default {
   methods: {
     importHandle() {
       let multi = this.field.options.importMultiple || false;
+      let multiSize = this.field.options.importMultiSize || 1;
       this.getFormRef().openImportDialog({
         target: this,
         importOption: this.field.options,
         importFrontOnly: false,
         multi,
+        multiSize,
         callback: (resultData, file, done) => {
 
         }

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

@@ -0,0 +1,171 @@
+<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">
+    <vxe-grid ref="table-m1" :data="oplogDTOs" v-bind="m1Option" @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"></vxe-grid>
+  </static-content-wrapper>
+</template>
+
+<script>
+import StaticContentWrapper from './static-content-wrapper'
+import emitter from '../../../utils/emitter'
+import i18n from "../../../utils/i18n";
+import fieldMixin from "./fieldMixin";
+
+export default {
+  name: "oplog-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,
+  },
+  computed: {
+    showLabel(){
+      return this.field.options.labelHidden? null: this.label;
+    },
+    label() {
+      return this.field.options.isFormLabel ? this.currentValue : this.getI18nLabel(this.field.options.label);
+    },
+    widgetClass() {
+      let list = [];
+      let optionModel = this.field.options
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
+      if (optionModel.underline) list.push('underLine');
+      if (optionModel.disabled) list.push('is-disabled');
+      return list
+    }
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+  data(){
+    return {
+      m1Option:{},
+      oplogDTOs:[]
+    }
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList()
+    this.initEventHandler()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+    this.initOplogDTOs();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+
+  methods: {
+    initOplogDTOs() {
+      const tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'xform-oplog-oplogList-m1Grid',
+        columns: [{
+          type: 'checkbox',
+          fixed: 'left',
+          width: 48,
+          resizable: false
+        },
+          {
+            title: this.$t2('操作时间', 'components.oplogTable.createDate'),
+            field: 'createDate',
+            width: 150
+          },
+          {
+            title: this.$t2('操作人员', 'components.oplogTable.createBy'),
+            field: '_createBy',
+            width: 150
+          },
+          {
+            title: this.$t2('操作日志', 'components.oplogTable.content'),
+            field: 'content',
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.m1Option = opts;
+      });
+      this.initData();
+    },
+    initData(option) {
+      let reportTemplate = this.getFormRef().reportTemplate;
+      let formCode = reportTemplate.formCode;
+      let scriptCode = this.field.options.formScriptCode;
+      let oplogTypeCode = this.field.options.oplogTypeCode || formCode;
+      let oplogBusinessKey = this.field.options.oplogBusinessKey || "id";
+      if (!scriptCode) return;
+      let business_code = this.formModel[oplogBusinessKey];
+      if(!business_code) return;
+      this.formHttp({
+        scriptCode: scriptCode,
+        data: {
+          formCode: formCode,
+          formVersion: reportTemplate.formVersion,
+          data: {
+            log_type: oplogTypeCode,
+            business_code: business_code
+          }
+        },
+        callback: res => {
+          let rows = res.objx || [];
+          this.oplogDTOs = rows;
+        }
+      });
+    },
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+a.is-disabled {
+  cursor: not-allowed;
+}
+
+</style>

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

@@ -4,10 +4,10 @@
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
     <template v-for="(item,index) in field.options.statusParam">
-      <span
-        v-if="fieldModel===item.value"
-        :key="index" class="list-tag"
-        :class="item.type">{{ getI18nLabel(item.label) }}</span>
+      <template v-if="fieldModel===item[valueField]">
+        <span v-if="field.options.formScriptEnabled || field.options.commonAttributeEnabled"  :key="index" >{{ getI18nLabel(item[labelField]) }}</span>
+        <span v-else :key="index" class="list-tag" :class="item.type">{{ getI18nLabel(item[labelField]) }}</span>
+      </template>
     </template>
   </form-item-wrapper>
 </template>
@@ -64,6 +64,14 @@ export default {
       statusParam: [],
     }
   },
+  computed: {
+    labelField(){
+      return this.getOptionItemLabelKey();
+    },
+    valueField(){
+      return this.getOptionItemValueKey();
+    }
+  },
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
@@ -85,6 +93,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
+    this.initOptionItemsHandle()
     // this.initStatusParam();
   },