cloud-web-corejs 1.0.121 → 1.0.123

package/src/components/wf/wfTaskUserRangeDialog.vue

@@ -47,7 +47,7 @@
 				<i class="el-icon-close el-icon"></i>
 				{{ $t1('取 消') }}
 			</el-button>
-			<el-button type="primary" @click="dialogPrimary" class="button-sty">
+			<el-button type="primary" @click="confirmDialog" class="button-sty">
 				<i class="el-icon-check el-icon"></i>
 				{{ $t1('确 定') }}
 			</el-button>
@@ -57,76 +57,9 @@
 
 <script>
 import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import mixin from "./mixins/wfTaskUserRangeDialog";
 
 export default {
-  props: ['visiable', 'multi', 'rows','rangeTableDatas', 'param','current_prefix','modelId','taskDefinitionKey'],
-  mixins: [selectDialogMixins],
-  created() {
-    this.initSetting();
-  },
-  mounted() {
-    this.initTableM1();
-  },
-  data() {
-    var that = this;
-    return {
-      showDialog: true,
-      falseValue: false,
-      selectMulti: true,
-      formData: {},
-      vxeOption: {},
-      tableData: [],
-      fieldKey:"userId"
-    };
-  },
-  methods: {
-    initTableM1() {
-      this.tableData = this.$baseLodash.cloneDeep(this.rangeTableDatas || []);
-      let that = this;
-      let tableOption = {
-        vue: that,
-        tableRef: 'table-m1',
-        tableName: 'wf_task_user_range_dialog-m1',
-        /*path: this.current_prefix + '/wf_task_user_range/list',
-         param: () => {
-          return {
-            modelId:this.modelId,
-            taskDefinitionKey:this.taskDefinitionKey,
-          }
-        }, */
-        columns: [
-          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
-          {
-            title: this.$t1('候选人姓名'),
-            field: 'nickName',
-            width: 250,
-            fixed: 'left'
-          },
-          {
-            width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
-        ],
-        config: {
-          checkboxConfig: {
-            checkStrictly: true,
-            showHeader: this.selectMulti,
-            trigger: 'row'
-          },
-          /* proxyConfig: {
-            props: {
-              result: "objx",
-              total: "objx.length",
-            }
-          } */
-        }
-      };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-        that.vxeOption = opts;
-      });
-    }
-  }
+  mixins: [selectDialogMixins,mixin]
 };
 </script>

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

@@ -1,105 +1,131 @@
 <template>
-  <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
-                     :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">
-    <el-input-number ref="fieldEditor" v-model="fieldModel" class="full-width-input"
-                     :disabled="field.options.disabled"
-                     :size="field.options.size" :controls-position="field.options.controlsPosition"
-                     :placeholder="getI18nLabel(field.options.placeholder)"
-                     :min="field.options.min" :max="field.options.max"
-                     :precision="field.options.precision" :step="field.options.step"
-                     @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
-                     @change="handleChangeEvent"
-					 :class="[field.options.showbutton ? '' : 'noButton']"
-					 >
+  <form-item-wrapper
+    :designer="designer"
+    :field="field"
+    :rules="rules"
+    :design-state="designState"
+    :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"
+  >
+    <el-input-number
+      ref="fieldEditor"
+      v-model="numberValue"
+      class="full-width-input"
+      :disabled="field.options.disabled"
+      :size="field.options.size"
+      :controls-position="field.options.controlsPosition"
+      :placeholder="getI18nLabel(field.options.placeholder)"
+      :min="field.options.min"
+      :max="field.options.max"
+      :precision="field.options.precision"
+      :step="field.options.step"
+      @focus="handleFocusCustomEvent"
+      @blur="handleBlurCustomEvent"
+      @change="handleChangeEvent"
+      :class="[field.options.showbutton ? '' : 'noButton']"
+    >
     </el-input-number>
   </form-item-wrapper>
 </template>
 
 <script>
-  import FormItemWrapper from './form-item-wrapper'
-  import emitter from '../../../../../components/xform/utils/emitter'
-  import i18n from "../../../../../components/xform/utils/i18n";
-  import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
+import FormItemWrapper from "./form-item-wrapper";
+import emitter from "../../../../../components/xform/utils/emitter";
+import i18n from "../../../../../components/xform/utils/i18n";
+import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
 
-  export default {
-    name: "number-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: ''
-      },
+export default {
+  name: "number-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,
     },
-    components: {
-      FormItemWrapper,
+
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    inject: ['refList', 'globalOptionData', 'globalModel'],
-    data() {
-      return {
-        oldFieldValue: null, //field组件change之前的值
-        fieldModel: undefined,
-        rules: [],
-      }
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    computed: {
-
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-    beforeCreate() {
-      /* 这里不能访问方法和属性！！ */
+  },
+  components: {
+    FormItemWrapper,
+  },
+  inject: ["refList", "globalOptionData", "globalModel"],
+  data() {
+    return {
+      oldFieldValue: null, //field组件change之前的值
+      fieldModel: null,
+      rules: [],
+    };
+  },
+  computed: {
+    numberValue: {
+      get() {
+        let fieldModel = this.fieldModel;
+        return fieldModel === null ? undefined : fieldModel;
+      },
+      set(val) {
+        let newValue = val === undefined ? null : val;
+        this.fieldModel = newValue
+        let currentData =
+        this.tableParam && this.tableParam.row
+          ? this.tableParam.row
+          : this.formModel;
+        currentData[this.fieldKeyName] = newValue;
+      },
     },
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
 
-    created() {
-      /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
-      this.registerToRefList()
-      this.initFieldModel()
-      this.initEventHandler()
-      this.buildFieldRules()
+    this.registerToRefList();
+    this.initFieldModel();
+    this.initEventHandler();
+    this.buildFieldRules();
 
-      this.handleOnCreated()
-    },
+    this.handleOnCreated();
+  },
 
-    mounted() {
-      this.handleOnMounted()
-    },
+  mounted() {
+    this.handleOnMounted();
+  },
 
-    beforeDestroy() {
-      this.unregisterFromRefList()
-    },
-
-    methods: {
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
 
-    }
-  }
+  methods: {},
+};
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
-
-  .full-width-input {
-    width: 100% !important;
-  }
+@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
+.full-width-input {
+  width: 100% !important;
+}
 </style>