cloud-web-corejs 1.0.54-dev.231 → 1.0.54-dev.233

package/package.json

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

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

@@ -75,7 +75,15 @@
       },
       optionItems(){
         return this.getOptionItems();
-      }
+      },
+      fieldModelLabel() {
+        let fieldModel = this.fieldModel;
+        let optionItems = this.field.options.optionItems;
+        let valueField = this.valueField;
+        let labelField = this.labelField;
+        let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+        return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */

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

@@ -74,10 +74,10 @@ export default {
     }
   },
   computed: {
-    labelField(){
+    labelField() {
       return this.field.options.labelKey || "label";
     },
-    valueField(){
+    valueField() {
       return this.field.options.valueKey || "value";
     },
     allowDefaultFirstOption() {
@@ -86,10 +86,12 @@ export default {
     fieldModelLabel() {
       let fieldModel = this.fieldModel;
       let optionItems = this.field.options.optionItems;
-      let optionItem = optionItems.find(item => item.value === fieldModel)
-      return optionItem && optionItem.label ? optionItem.label : null;
+      let valueField = this.valueField;
+      let labelField = this.labelField;
+      let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+      return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
     },
-    optionItems(){
+    optionItems() {
       return this.getOptionItems();
     }
 

package/src/components/xform/form-render/indexMixin.js

@@ -36,6 +36,7 @@ import scriptHttpMixin from "../../../components/xform/mixins/scriptHttp";
 import defaultHandleMixin from "../../../components/xform/mixins/defaultHandle";
 import xeUtils from "xe-utils";
 import {extendDeeply} from "@base/utils/index.js";
+import '@base/components/xform/utils/directive'
 
 let modules = {};
 const baseRefUtil = {

package/src/index.js

@@ -150,7 +150,7 @@ import langImport from '@base/components/langImport/index.js';
 Vue.use(langImport);
 
 //vform
-import '@base/components/xform/utils/directive'
+// import '@base/components/xform/utils/directive'
 
 
 import i18n from '@base/lang/index.js'

package/src/views/bd/setting/form_script/mixins/otherAuthDialog.js

@@ -1,4 +1,4 @@
-import userDialog from "@base/views/user/user/dialog.vue";
+import userDialog from "@base/views/user/user/form_dialog.vue";
 import {getJsxBtn} from "@base/views/bd/setting/utils/index";
 import {getBdEnv} from "@base/api/user";
 
@@ -77,7 +77,15 @@ modules = {
             width: 250
           },
           {
-            width: 100,
+            title: this.$t1('编辑'),
+            field: 'editAuth',
+            width: 150,
+            slots: {
+              default: "switch"
+            }
+          },
+          {
+            width: 47,
             fixed: 'right',
             title: '',
             sortable: false,

package/src/views/bd/setting/form_script/otherAuthDialog.vue

@@ -8,7 +8,7 @@
       :visible.sync="showDialog"
       :modal="false"
       custom-class="dialog-style list-dialog dialog-checkbox pd_0"
-      width="500px"
+      width="650px"
       @close="dialogClose"
       v-el-drag-dialog
       v-el-dialog-center
@@ -49,7 +49,7 @@
             </template>
             <template #switch="{row,column,rowIndex}">
               <el-switch v-model="row[column.field]" :key="column.field+rowIndex" :active-value="1"
-                         :inactive-value="0" :disabled="column.params.disabled"></el-switch>
+                         :inactive-value="0"></el-switch>
             </template>
           </vxe-grid>
         </div>

package/src/views/bd/setting/form_template/mixins/otherAuthDialog.js

@@ -1,4 +1,4 @@
-import userDialog from "@base/views/user/user/dialog.vue";
+import userDialog from "@base/views/user/user/form_dialog.vue";
 import {getJsxBtn} from "@base/views/bd/setting/utils/index";
 import {getBdEnv} from "@base/api/user";
 
@@ -77,7 +77,15 @@ modules = {
             width: 250
           },
           {
-            width: 100,
+            title: this.$t1('编辑'),
+            field: 'editAuth',
+            width: 150,
+            slots: {
+              default: "switch"
+            }
+          },
+          {
+            width: 47,
             fixed: 'right',
             title: '',
             sortable: false,

package/src/views/bd/setting/form_template/otherAuthDialog.vue

@@ -8,7 +8,7 @@
       :visible.sync="showDialog"
       :modal="false"
       custom-class="dialog-style list-dialog dialog-checkbox pd_0"
-      width="500px"
+      width="650px"
       @close="dialogClose"
       v-el-drag-dialog
       v-el-dialog-center
@@ -49,7 +49,7 @@
             </template>
             <template #switch="{row,column,rowIndex}">
               <el-switch v-model="row[column.field]" :key="column.field+rowIndex" :active-value="1"
-                         :inactive-value="0" :disabled="column.params.disabled"></el-switch>
+                         :inactive-value="0"></el-switch>
             </template>
           </vxe-grid>
         </div>

package/src/views/bd/setting/table_model/mixins/otherAuthDialog.js

@@ -1,4 +1,4 @@
-import userDialog from "@base/views/user/user/dialog.vue";
+import userDialog from "@base/views/user/user/form_dialog.vue";
 import {getJsxBtn} from "@base/views/bd/setting/utils/index";
 import {getBdEnv} from "@base/api/user";
 
@@ -80,7 +80,15 @@ modules = {
             width: 250
           },
           {
-            width: 100,
+            title: this.$t1('编辑'),
+            field: 'editAuth',
+            width: 150,
+            slots: {
+              default: "switch"
+            }
+          },
+          {
+            width: 47,
             fixed: 'right',
             title: '',
             sortable: false,

package/src/views/bd/setting/table_model/otherAuthDialog.vue

@@ -8,7 +8,7 @@
       :visible.sync="showDialog"
       :modal="false"
       custom-class="dialog-style list-dialog dialog-checkbox pd_0"
-      width="500px"
+      width="650px"
       @close="dialogClose"
       v-el-drag-dialog
       v-el-dialog-center
@@ -49,7 +49,7 @@
             </template>
             <template #switch="{row,column,rowIndex}">
               <el-switch v-model="row[column.field]" :key="column.field+rowIndex" :active-value="1"
-                         :inactive-value="0" :disabled="column.params.disabled"></el-switch>
+                         :inactive-value="0"></el-switch>
             </template>
           </vxe-grid>
         </div>

package/src/views/user/user/form_dialog.vue

@@ -0,0 +1,158 @@
+<template>
+  <el-dialog
+    :title="$t1('用户列表')"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+    width="1200px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div class="cont" style="height:65vh">
+      <vxe-grid
+        class="is-pointer"
+        ref="table-m1"
+        v-bind="vxeOption"
+        @resizable-change="$vxeTableUtil.onColumnWitchChange"
+        @custom="$vxeTableUtil.customHandle"
+        @checkbox-change="addDataTable"
+        @checkbox-all="checkAll"
+        @cell-dblclick="checkWithSubmit"
+      >
+        <template #form>
+          <div class="clearfix screen-btns">
+            <div class="fr">
+              <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
+                          plain>{{ $t1('重置') }}
+              </vxe-button>
+              <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                {{ $t1('搜索') }}
+              </vxe-button>
+            </div>
+          </div>
+          <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
+                    @reset="resetEvent">
+            <vxe-form-item :title="$t1('登录名')+':'" field="loginAccount">
+              <template v-slot>
+                <el-input v-model="formData.loginAccount" size="small" clearable/>
+              </template>
+            </vxe-form-item>
+            <vxe-form-item :title="$t1('姓名')+':'" field="nickName">
+              <template v-slot>
+                <el-input v-model="formData.nickName" size="small" clearable/>
+              </template>
+            </vxe-form-item>
+            <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
+          </vxe-form>
+        </template>
+      </vxe-grid>
+    </div>
+    <label id="labBtn" class="transverse">
+      <div class="icon">
+        <i class="el-icon-more"></i>
+        <i class="el-icon-more"></i>
+      </div>
+    </label>
+    <div class="multipleChoice">
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
+        class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
+      <div class="list">
+        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
+          <p>{{ getCheckLabel(checkRow,'nickName') }}</p>
+          <a class="el-icon-close" @click="clearTable1Select(index)"></a>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
+			<el-button type="primary" plain class="button-sty" @click="dialogClose">
+				<i class="el-icon-close el-icon"></i>
+				{{ $t1('取 消') }}
+			</el-button>
+			<el-button type="primary" @click="dialogPrimary" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t1('确 定') }}
+			</el-button>
+		</span>
+  </el-dialog>
+</template>
+
+<script>
+import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+
+export default {
+  name: 'userDialog',
+  props: ['visiable', 'multi', 'rows', 'param'],
+  mixins: [selectDialogMixins],
+  created() {
+    this.initSetting();
+    if (this.param) {
+      if (this.param.userType !== null) {
+        this.userType = this.param.userType;
+      }
+    }
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      userType: 0,
+      formData: {
+        saleOrgId: '',
+        saleOrgName: ''
+      },
+      selectMulti: true,
+      vxeOption: {}
+    };
+  },
+  methods: {
+    initTableM1() {
+      var that = this;
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'user_user_form_dialog-m1',
+        path: USER_PREFIX + '/user/listCurrentPage',
+        param: () => {
+          // this.formData.userType = this.userType;
+          return {
+            enabled: true,
+            ...this.formData,
+            ...this.param
+          }
+        },
+        config: {
+          checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+            trigger: 'row'
+          }
+        },
+        columns: [
+          {type: 'checkbox', width: 50, resizable: false, fixed: 'left'},
+          {title: this.$t1('登录名'), field: 'loginAccount', width: 250, fixed: 'left'},
+          {field: 'nickName', title: this.$t1('姓名'), width: 150},
+          {field: 'companyNames', title: this.$t1('所属组织'), width: 250},
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>