cloud-web-corejs 1.0.54-dev.234 → 1.0.54-dev.236

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

@@ -115,6 +115,9 @@ export default {
     refreshWidget() {
       this.initStatusForDesign();
       this.$refs.statusTag.init();
+    },
+    getFieldModelLabel(){
+      return this.$refs.statusTag.getShowLabel();
     }
 
   }

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

@@ -246,8 +246,7 @@ modules = {
       let row = rowParam.row;
       let params = rowParam.column.params;
       let widgetId = fieldWidget ? fieldWidget.id : params.widget.id;
-      let fieldSchem = this.fieldSchemaMap[row._X_ROW_KEY];
-      let widget = fieldSchem && fieldSchem[widgetId] ? fieldSchem[widgetId] : null;
+      let widget = this.fieldSchemaMap[row._X_ROW_KEY][widgetId]
       return widget;
     },
     loopHandleWidgetByName(name, callback) {
@@ -270,7 +269,7 @@ modules = {
     },
     getRowWidgetKey(rowParam, fieldWidget) {
       let widget = this.getRowWidget(rowParam, fieldWidget);
-      let key = widget?.id
+      let key = widget.id
       return key;
     },
     getGridTableName() {
@@ -868,19 +867,6 @@ modules = {
       if (this.widget.options.hideGridCheckBox) {
         otherConfig.checkBoxRequired = false;
       }
-
-      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
-      }
-
       let tableOption = {
         // vue: this,
         tableRef: tableRef,
@@ -1741,7 +1727,7 @@ modules = {
               data: reqData,
               successMsg: true,
               isConfirm: true,
-              confirmText: this.$t1("您确定要保存吗？"),
+              confirmText: "您确定要保存吗？",
               success: (res0) => {
                 this.getRowData(res0.objx, (res) => {
                   if (obj.row.id == res.objx.id) {

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

@@ -13,7 +13,7 @@
             class="button-sty"
             icon="el-icon-set-up"
             @click="openOtherAuthDialog"
-            v-if="isDev && !!dataId && menuKindAuth.editAuth === 1 && !readonly && !otherFlag"
+            v-if="isDev && !!dataId && menuKindAuth.editAuth === 1 && !readonly && !otherFlag && !formTemplate"
           >
             {{ $t1("分派") }}
           </el-button>

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

@@ -117,7 +117,7 @@
                class="designer-drawer" :class="[isFullscreen ? 'is-fullscreen' : '']" @close="handleFormDesignClose">
       <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
         <el-tab-pane :label="$t1('设计器')" name="first">
-          <designer ref="designer" :formCode.sync="formCode" @reflushTemplateList="reflushTemplateList"></designer>
+          <designer ref="designer" :formCode.sync="formCode" @reflushTemplateList="reflushTemplateList" :readonly="designerReadonly"></designer>
         </el-tab-pane>
         <el-tab-pane :label="$t1('后端脚本')" name="second">
           <formScriptList :formCode="formCode" :formTemplate="currentFormTemplate"

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

@@ -157,8 +157,10 @@ modules = {
       });
     },
     openDesignDialog() {
+      let readonly = !this.menuKindAuth.editAuth
       this.$emit('openDesignDialog', {
         row: this.formTemplate,
+        readonly,
         callback: () => {
           this.$baseReload()
         }

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

@@ -139,6 +139,7 @@ modules = {
       isDev: true,
       menuKindAuth: {},
       showTree: false,
+      designerReadonly: false
     };
   },
   computed: {
@@ -188,16 +189,42 @@ modules = {
         this.$refs.xTabs.openEditTab(row);
       }
     },
-    openDesingerDialog(row, callback) {
+    openDesingerDialogByAuth(row) {
+      if (!this.otherFlag) {
+        this.openDesingerDialog(row);
+      } else {
+        this.getOtherMenuKindAuth(row, (editAuth) => {
+          this.openDesingerDialog(row, null, !editAuth);
+        })
+      }
+    },
+    getOtherMenuKindAuth(row, callback) {
+      if (row.sid) {
+        this.$http({
+          aes: true,
+          url: USER_PREFIX + "/form_template_auth/getAuth",
+          method: `post`,
+          data: {stringOne: row.sid},
+          isLoading: true,
+          success: (res) => {
+            let menuKindAuth = res.objx || {};
+            callback(!!menuKindAuth.editAuth)
+          },
+        });
+      }
+    },
+    openDesingerDialog(row, callback, readonly = false) {
       this.formCode = row.formCode;
       this.formName = row.formName;
       this.currentFormTemplate = row;
       this.isFullscreen = false;
+
+      this.designerReadonly = readonly
       this.showDesingerDialog = true;
       this.designerSaveCallback = callback ?? null;
     },
-    openDesingerDialogByChild({row, callback}) {
-      this.openDesingerDialog(row, callback);
+    openDesingerDialogByChild({row, readonly, callback}) {
+      this.openDesingerDialog(row, callback, readonly);
     },
     reflushTemplateList() {
       this.searchEvent();
@@ -379,7 +406,7 @@ modules = {
                     iconName: "iconfont icon-liuchengguanli-shejiqi_liucheng",
                     content: this.$t1("表单设计"),
                     onclick: () => {
-                      this.openDesingerDialog(row);
+                      this.openDesingerDialogByAuth(row);
                     },
                   },
                 ]);

package/src/views/bd/setting/menu_kind/mixins/authDialog.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";
 

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

@@ -140,7 +140,7 @@ export default {
           {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},
+          {field: 'groupName', title: this.$t1('用户组'), width: 250},
           {
             width: 47,
             fixed: 'right',