cloud-web-corejs 1.0.54-dev.338 → 1.0.54-dev.339

package/package.json

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

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

@@ -1,23 +1,35 @@
 <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
+    :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 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事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -28,106 +40,108 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-
   },
   components: {
     StaticContentWrapper,
   },
   computed: {
-    showLabel(){
-      return this.field.options.labelHidden? null: this.label;
+    showLabel() {
+      return this.field.options.labelHidden ? null : this.label;
     },
     label() {
-      return this.field.options.isFormLabel ? this.currentValue : this.getI18nLabel(this.field.options.label);
+      return this.field.options.isFormLabel
+        ? this.currentValue
+        : this.getI18nLabel(this.field.options.label);
     },
     widgetClass() {
       let list = [];
-      let optionModel = this.field.options
+      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
-    }
+      if (optionModel.underline) list.push("underLine");
+      if (optionModel.disabled) list.push("is-disabled");
+      return list;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },
-  data(){
+  data() {
     return {
-      m1Option:{},
-      oplogDTOs:[]
-    }
+      m1Option: {},
+      oplogDTOs: [],
+    };
   },
 
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.registerToRefList()
-    this.initEventHandler()
+    this.registerToRefList();
+    this.initEventHandler();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
     this.initOplogDTOs();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    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
-        },
+        tableRef: "table-m1",
+        tableName: "xform-oplog-oplogList-m1Grid",
+        columns: [
           {
-            title: this.$t2('操作时间', 'components.oplogTable.createDate'),
-            field: 'createDate',
-            width: 150
+            type: "checkbox",
+            fixed: "left",
+            width: 48,
+            resizable: false,
           },
           {
-            title: this.$t2('操作人员', 'components.oplogTable.createBy'),
-            field: '_createBy',
-            width: 150
+            title: this.$t2("操作时间", "components.oplogTable.createDate"),
+            field: "create_date",
+            width: 150,
           },
           {
-            title: this.$t2('操作日志', 'components.oplogTable.content'),
-            field: 'content',
-            width: 150
+            title: this.$t2("操作人员", "components.oplogTable.createBy"),
+            field: "_createBy",
+            width: 150,
+          },
+          {
+            title: this.$t2("操作日志", "components.oplogTable.content"),
+            field: "content",
+            width: 250,
           },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
-        ]
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
+        ],
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.m1Option = opts;
       });
       this.initData();
@@ -140,7 +154,7 @@ export default {
       let oplogBusinessKey = this.field.options.oplogBusinessKey || "id";
       if (!scriptCode) return;
       let business_code = this.formModel[oplogBusinessKey];
-      if(!business_code) return;
+      if (!business_code) return;
       this.formHttp({
         scriptCode: scriptCode,
         data: {
@@ -148,18 +162,19 @@ export default {
           formVersion: reportTemplate.formVersion,
           data: {
             log_type: oplogTypeCode,
-            business_code: business_code
-          }
+            business_code: business_code,
+          },
         },
-        callback: res => {
+        addCreateInfo: true,
+        queryCreateInfo: true,
+        callback: (res) => {
           let rows = res.objx || [];
           this.oplogDTOs = rows;
-        }
+        },
       });
     },
-  }
-
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -167,5 +182,4 @@ export default {
 a.is-disabled {
   cursor: not-allowed;
 }
-
 </style>