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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.335",
+  "version": "1.0.54-dev.336",
   "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/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/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -32,6 +32,9 @@
     <el-form-item label="批量导入">
       <el-switch v-model="optionModel.importMultiple"></el-switch>
     </el-form-item>
+    <el-form-item label="批量导入大小">
+      <base-input-number v-model="optionModel.importMultiSize" :max="200"></base-input-number>
+    </el-form-item>
 
     <el-form-item label="启用图片处理">
       <el-switch v-model="optionModel.enabledImportPreHandle"></el-switch>

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

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <el-form-item :label="i18nt('脚本编码')">
+      <el-input type="text" v-model="optionModel.formScriptCode"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('日志类型')">
+      <el-input type="text" v-model="optionModel.oplogTypeCode" placeholder="默认表单模板编码"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('业务唯一字段')">
+      <el-input type="text" v-model="optionModel.oplogBusinessKey" placeholder="默认单据id"></el-input>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "../../../utils/i18n"
+
+  export default {
+    name: "oplogFlag-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -116,6 +116,8 @@ const COMMON_PROPERTIES = {
   'dropdownMenuFlag': 'dropdown-menu-editor',
   'dropdownItemFlag': 'dropdown-item-editor',
 
+  'oplogFlag': 'oplogFlag-editor',
+
   //弹框
   title: "title-editor",
   width: "width-editor",

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

@@ -3044,6 +3044,7 @@ export const advancedFields = [
       hiddenByWf: true,
       ...defaultWidgetShowRuleConfig,
       importMultiple:false,
+      importMultiSize: 1,
       importFileLimitSize: 200,
       importEntity: "",
       importAttachCode: "",
@@ -3680,6 +3681,29 @@ export const businessFields = [
       ...defaultWidgetShowRuleConfig,
     },
   },
+  {
+    type: "oplog",
+    icon: "uploadbox",
+    commonFlag: !0,
+    formItemFlag: !1,
+    options: {
+      name: "",
+      // label: "操作日志",
+      disabled: !1,
+      hidden: !1,
+
+      oplogFlag:1,
+      formScriptCode: "listUserLog",
+      oplogTypeCode:null,
+      oplogBusinessKey:null,
+
+
+      customClass: "",
+      onCreated: "",
+      onMounted: "",
+
+    },
+  },
 ];
 
 export const keyNamePrefixMap = {

package/src/components/xform/lang/zh-CN.js

@@ -112,6 +112,7 @@ export default {
       "user-project-tag": "用户（多选）",
       "saleOrg-project-tag": "机构（多选）",
       "tempStorage": "暂存按钮",
+      "oplog": "操作日志",
     },
     hint: {
       formulaSetting: "公式设置",