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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.337",
+  "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/fieldMixin.js

@@ -259,6 +259,9 @@ modules = {
             this.oldFieldValue = baseRefUtil.deepClone(this.fieldModel),
             void this.initFileList();
         }*/
+       if(this.field.options.name=="status85657"){
+        debugger
+       }
         let defaultValue = this.field.options.defaultValue;
         let dataId = this.getFormRef()?.dataId ?? null;
         let nullValue = null;
@@ -668,7 +671,7 @@ modules = {
       if(formScriptEnabledTypes.includes(widgetType)){
         this.field.options.optionItems = rows || [];
       }else if(widgetType=="status"){
-        widget.options.statusParam = rows || [];
+        this.field.options.statusParam = rows || [];
       }
     },
     loadTableOtions(e) {

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>

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -212,11 +212,11 @@
             <template v-if="isShowColumnStatusWidget(obj,item)">
               <span
               v-if="getTableColumnWidget(obj).options.formScriptEnabled || getTableColumnWidget(obj).options.commonAttributeEnabled"
-              :key="getTableColumnWidget(obj).id+'-'+index">{{ getI18nLabel(item.label) }}</span>
+              :key="getTableColumnWidget(obj).id+'-'+index">{{ getI18nLabel(item[getTableColumnStatusWidgetLabelKey(obj)]) }}</span>
               <span
               v-else
               :key="getTableColumnWidget(obj).id+'-'+index" class="list-tag"
-              :class="item.type">{{ getI18nLabel(item.label) }}</span>
+              :class="item.type">{{ getI18nLabel(item[getTableColumnStatusWidgetLabelKey(obj)]) }}</span>
             </template>
           </template>
         </template>

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -13,7 +13,7 @@ import {
   deepClone,
   loopHandleWidget,
   columnFormatMap,
-  traverseAllWidgetsNew
+  traverseAllWidgetsNew,
 } from "../../../../components/xform/utils/util";
 import { tableTreeMixins } from "../../../../mixins/tableTree/index.js";
 
@@ -177,7 +177,7 @@ modules = {
   },
   mounted: async function () {
     this.handleOnMounted();
-    this.initColumnWidgetConfig(()=>{
+    this.initColumnWidgetConfig(() => {
       this.initTableList();
     });
   },
@@ -185,103 +185,115 @@ modules = {
     this.unregisterFromRefList();
   },
   methods: {
-    getTableColumnWidget(obj){
+    getTableColumnStatusWidgetLabelKey(obj) {
+      let widget = this.getTableColumnWidget(obj);
+      return widget ? this.getOptionItemLabelKey(widget) : null;
+    },
+    getOptionItemValueKey(widget) {
+      return widget.options.valueKey || "value";
+    },
+    getOptionItemLabelKey(widget) {
+      return widget.options.labelKey || "label";
+    },
+    getTableColumnWidget(obj) {
       let item = this.fieldSchemaMap[obj.row._X_ROW_KEY];
-      return item ? item[obj.column.params?.widget.id]: null;
+      return item ? item[obj.column.params?.widget.id] : null;
     },
-    isShowColumnStatusWidget(obj,item){
+    isShowColumnStatusWidget(obj, item) {
       let widget = this.getTableColumnWidget(obj);
-      let valueKey = widget.options.valueKey || "value"
-      return obj.row[this.getTableColumnWidgetFieldKeyName(obj)] === item[valueKey]
+      let valueKey = widget.options.valueKey || "value";
+      return (
+        obj.row[this.getTableColumnWidgetFieldKeyName(obj)] === item[valueKey]
+      );
     },
-    getTableColumnWidgetFieldKeyName(obj){
+    getTableColumnWidgetFieldKeyName(obj) {
       let widget = this.getTableColumnWidget(obj);
-      return widget ? this.getFieldKeyName(widget): null;
+      return widget ? this.getFieldKeyName(widget) : null;
     },
-    initColumnWidgetConfig(callback){
+    initColumnWidgetConfig(callback) {
       let tableColumns = this.widget.options.tableColumns;
       let requests = [];
-      this.loodHandleColumns(tableColumns, (row)=>{
-        requests.push(this.handleColumnWidgetConfig(row.widget))
-        requests.push(this.handleColumnWidgetConfig(row.editWidget))
+      this.loodHandleColumns(tableColumns, (row) => {
+        requests.push(this.handleColumnWidgetConfig(row.widget));
+        requests.push(this.handleColumnWidgetConfig(row.editWidget));
         let widgetList = row.widgetList;
-        if(widgetList && widgetList.length){
-          traverseAllWidgetsNew(widgetList, (widget)=>{
-            requests.push(this.handleColumnWidgetConfig(widget))
-          })
+        if (widgetList && widgetList.length) {
+          traverseAllWidgetsNew(widgetList, (widget) => {
+            requests.push(this.handleColumnWidgetConfig(widget));
+          });
         }
-      })
-      if(requests.length){
-        Promise.all(requests).then(()=>{
-          callback()
-        })
-      }else{
-        callback()
+      });
+      if (requests.length) {
+        Promise.all(requests).then(() => {
+          callback();
+        });
+      } else {
+        callback();
       }
-      
     },
-    fillColumnWidgetOptionItems(widget,rows){
+    fillColumnWidgetOptionItems(widget, rows) {
       let widgetType = widget.type;
-      let formScriptEnabledTypes = ['select', 'checkbox', 'radio']
-      if(formScriptEnabledTypes.includes(widgetType)){
+      let formScriptEnabledTypes = ["select", "checkbox", "radio"];
+      if (formScriptEnabledTypes.includes(widgetType)) {
         widget.options.optionItems = rows || [];
-      }else if(widgetType=="status"){
+      } else if (widgetType == "status") {
         widget.options.statusParam = rows || [];
       }
       widget._syncInited = true;
     },
-    async handleColumnWidgetConfig(widget,callback){
-      if(!widget)return
+    async handleColumnWidgetConfig(widget, callback) {
+      if (!widget) return;
       let widgetType = widget.type;
-      let formScriptEnabledTypes = ['select', 'checkbox', 'radio', 'status']
-      if(!formScriptEnabledTypes.includes(widgetType))return
-      
+      let formScriptEnabledTypes = ["select", "checkbox", "radio", "status"];
+      if (!formScriptEnabledTypes.includes(widgetType)) return;
+
       let formScriptEnabled = widget.options.formScriptEnabled || false;
-      let commonAttributeEnabled = widget.options.commonAttributeEnabled || false;
+      let commonAttributeEnabled =
+        widget.options.commonAttributeEnabled || false;
       let commonAttributeCode = widget.options.commonAttributeCode;
       if (commonAttributeEnabled) {
         if (!commonAttributeCode) return;
       }
 
-      if(!formScriptEnabled && !commonAttributeEnabled)return
+      if (!formScriptEnabled && !commonAttributeEnabled) return;
 
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let scriptCode = widget.options.formScriptCode || "getList";
-      let fieldKeyName = this.getFieldKeyName(widget)
+      let fieldKeyName = this.getFieldKeyName(widget);
 
       if (formScriptEnabled) {
-          let accessParam = this.handleCustomEvent(
-            widget.options.formScriptParam
-          );
-          return this.formHttp({
-            scriptCode: scriptCode,
-            data: {
-              formCode: formCode,
-              formVersion: reportTemplate.formVersion,
-              taBm: fieldKeyName,
+        let accessParam = this.handleCustomEvent(
+          widget.options.formScriptParam
+        );
+        return this.formHttp({
+          scriptCode: scriptCode,
+          data: {
+            formCode: formCode,
+            formVersion: reportTemplate.formVersion,
+            taBm: fieldKeyName,
             data: {
               ...accessParam,
             },
           },
           success: (res) => {
             let rows = res.objx || [];
-            this.fillColumnWidgetOptionItems(widget,rows)
-          }
+            this.fillColumnWidgetOptionItems(widget, rows);
+          },
         });
       } else if (commonAttributeEnabled) {
         let accessParam = this.handleCustomEvent(
           widget.options.formScriptParam
         );
-        
-         return this.$getBaseDicts({
+
+        return this.$getBaseDicts({
           code: commonAttributeCode,
-          data:{
-            ...accessParam
+          data: {
+            ...accessParam,
+          },
+          success: ({ dicts, dictMap }) => {
+            this.fillColumnWidgetOptionItems(widget, dicts);
           },
-          success: ({dicts, dictMap}) => {
-            this.fillColumnWidgetOptionItems(widget,dicts)
-          }
         });
       }
     },
@@ -730,10 +742,6 @@ modules = {
       return this.$baseLodash.cloneDeep(newColumns);
     },
     async initTableList() {
-
-      
-   
-
       let that = this;
       let path = null;
       let paramFun = null;
@@ -982,14 +990,16 @@ modules = {
 
       let gridPageSize = this.widget.options.gridPageSize;
       let gridPageSizeList = this.widget.options.gridPageSizeList || [];
-      if(!gridPageSizeList || !gridPageSizeList.length){
-        pagerConfig.pageSizes = [50,100,200,500]
-        if(!gridPageSize)gridPageSize = 100
-        pagerConfig.pageSize = gridPageSize
-      }else{
-        pagerConfig.pageSizes = gridPageSizeList.filter(item=>item.value).map(item=>item.value);
-        if(!gridPageSize)gridPageSize = pagerConfig.pageSizes[0]
-        pagerConfig.pageSize = gridPageSize
+      if (!gridPageSizeList || !gridPageSizeList.length) {
+        pagerConfig.pageSizes = [50, 100, 200, 500];
+        if (!gridPageSize) gridPageSize = 100;
+        pagerConfig.pageSize = gridPageSize;
+      } else {
+        pagerConfig.pageSizes = gridPageSizeList
+          .filter((item) => item.value)
+          .map((item) => item.value);
+        if (!gridPageSize) gridPageSize = pagerConfig.pageSizes[0];
+        pagerConfig.pageSize = gridPageSize;
       }
 
       //标题颜色
@@ -1322,7 +1332,7 @@ modules = {
       let columnLoopDo = (t, e) => {
         callback && callback(t);
         if (t.children && t.children.length) {
-          this.loodHandleColumns(t.children,callback)
+          this.loodHandleColumns(t.children, callback);
           /* for (let item of t.children) {
             columnLoopDo(item);
           } */
@@ -1608,7 +1618,7 @@ modules = {
         this.removeTreeRow({ row });
         return;
       }
-       delete this.fieldSchemaMap[row._X_ROW_KEY]
+      delete this.fieldSchemaMap[row._X_ROW_KEY];
       let $grid = this.getGridTable();
       $grid.remove(row);
       let tableData = $grid.getTableData();
@@ -1621,46 +1631,60 @@ modules = {
       });
       // this.deleteRowWidgets(row);
     },
-    isSingerlSearch(widget){
+    isSingerlSearch(widget) {
       let widgetType = widget?.type;
-      let result = widgetType === "singerSearch" || (widgetType === 'vabsearch' && !widget.options.multipleChoices)
-      return result
+      let result =
+        widgetType === "singerSearch" ||
+        (widgetType === "vabsearch" && !widget.options.multipleChoices);
+      return result;
     },
-    getColumnNullValue(widget){
-      if(!widget)return null
+    getColumnNullValue(widget) {
+      if (!widget) return null;
       let nullValue = null;
       let widgetType = widget.type;
-      let multiWidgetTypes = ["checkbox","time-range","baseAttachment","vabUpload","project-tag"];
+      let multiWidgetTypes = [
+        "checkbox",
+        "time-range",
+        "baseAttachment",
+        "vabUpload",
+        "project-tag",
+      ];
 
       let defaultValue = widget.options.defaultValue;
-      if (defaultValue !== undefined && defaultValue !== null && defaultValue !== "") {
-          nullValue = defaultValue;
-      } else if (widgetType === 'select' && widget.options.multiple) {
+      if (
+        defaultValue !== undefined &&
+        defaultValue !== null &&
+        defaultValue !== ""
+      ) {
+        nullValue = defaultValue;
+      } else if (widgetType === "select" && widget.options.multiple) {
         nullValue = [];
-      } else if (widgetType === 'date' && widget.options.type == "dates") {
+      } else if (widgetType === "date" && widget.options.type == "dates") {
         nullValue = [];
-      }else if (widgetType === 'vabsearch' && widget.options.multipleChoices) {
+      } else if (widgetType === "vabsearch" && widget.options.multipleChoices) {
         nullValue = [];
-      } else if (multiWidgetTypes.includes(widgetType)){
+      } else if (multiWidgetTypes.includes(widgetType)) {
         nullValue = [];
       }
       return nullValue;
     },
-    getIsFormWidget(widget){
+    getIsFormWidget(widget) {
       let widgetTypes = ["baseAttachment"];
       let result = false;
-      if(widget.formItemFlag){
+      if (widget.formItemFlag) {
         result = true;
       }
       return result;
     },
-    handleWidgetNullValue(widget,newData){
-      if(!widget || !newData)return
-      if(this.getIsFormWidget(widget)){
-        let field = this.getFieldKeyName(widget)
-        let nullValue = newData.hasOwnProperty(field) ? null : this.getColumnNullValue(widget);
+    handleWidgetNullValue(widget, newData) {
+      if (!widget || !newData) return;
+      if (this.getIsFormWidget(widget)) {
+        let field = this.getFieldKeyName(widget);
+        let nullValue = newData.hasOwnProperty(field)
+          ? null
+          : this.getColumnNullValue(widget);
         newData[field] = nullValue;
-        if(this.isSingerlSearch(widget)){
+        if (this.isSingerlSearch(widget)) {
           let vabSearchName = widget.options.vabSearchName;
           if (vabSearchName) newData[vabSearchName] = null;
         }
@@ -1671,28 +1695,27 @@ modules = {
       this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
         if (!item.children?.length && item.prop && item.label) {
           let formatS = !isEdit ? item.formatS : item.editFormatS;
-            let widget = null;
-            if(isEdit){
-              widget = item.editWidget || item.widget;
-            }else {
-              widget = item.widget;
+          let widget = null;
+          if (isEdit) {
+            widget = item.editWidget || item.widget;
+          } else {
+            widget = item.widget;
+          }
+          if (formatS == "widgetRender") {
+            if (item.widgetList) {
+              loopHandleWidget(item.widgetList, (w, p) => {
+                this.handleWidgetNullValue(w, newData);
+              });
             }
-            if (formatS == "widgetRender") {
-              if(item.widgetList){
-                loopHandleWidget(item.widgetList, (w, p) => {
-                  this.handleWidgetNullValue(w, newData);
-                });
-              }
-            }else {
-              if(widget){
-                this.handleWidgetNullValue(widget, newData);
-              }else {
-                newData[item.prop] = null
-              }
+          } else {
+            if (widget) {
+              this.handleWidgetNullValue(widget, newData);
+            } else {
+              newData[item.prop] = null;
             }
+          }
         }
       });
-
       /* let vailColumns = this.widget.options.tableColumns.filter(
         (item) => item.prop && item.label
       );
@@ -1872,7 +1895,7 @@ modules = {
       let rowIndex = Math.max(obj.rowIndex, 0);
 
       let propName = fieldKeyName + "." + rowIndex + "." + property;
-      return propName
+      return propName;
     },
     getColumnProp(widget, obj, isEdit) {
       if (!widget) {
@@ -1883,9 +1906,12 @@ modules = {
       }*/
       let isQueryTable = this.widget.options.isQueryTable || false;
       if (isEdit || !isQueryTable) {
-        let sourceWidgetId = isEdit?obj.column.params.editWidget.id:obj.column.params.widget.id;
-        if(!this.fieldSchemaMap[obj.row._X_ROW_KEY])return "false"
-        let fieldWidget = this.fieldSchemaMap[obj.row._X_ROW_KEY][sourceWidgetId]
+        let sourceWidgetId = isEdit
+          ? obj.column.params.editWidget.id
+          : obj.column.params.widget.id;
+        if (!this.fieldSchemaMap[obj.row._X_ROW_KEY]) return "false";
+        let fieldWidget =
+          this.fieldSchemaMap[obj.row._X_ROW_KEY][sourceWidgetId];
         if (!fieldWidget) {
           return "false";
         }
@@ -1894,8 +1920,8 @@ modules = {
         let rowIndex = Math.max(obj.rowIndex, 0);
 
         let property = this.getFieldKeyName(fieldWidget);
-        if(obj.row[property] && Array.isArray(obj.row[property])){
-          return "false"
+        if (obj.row[property] && Array.isArray(obj.row[property])) {
+          return "false";
         }
         // let property = obj.column.property
         if (this.isVabsearchFlagWidget(fieldWidget)) {