Merge branch 'master' of https://a.leanwo.com:3000/prodog-client-2023/client-base-v4

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.79",
+  "version": "4.0.81",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry http://wuzhixin.vip:4873",

src/index.js

@@ -76,6 +76,7 @@ import CasLogin  from './client/CasLogin.vue';
 import PrinterConfiguration from '../src/printer/PrinterConfiguration.vue';
 import CurdWindow1 from './window1/CurdWindow.vue';
 import CurdWindowModal from './window1/CurdWindowModal.vue';
+import AuthImage from './widget/AuthImage.vue';
 
 export {
   App,
@@ -142,4 +143,5 @@ export {
   PrinterConfiguration,
   CurdWindow1,
   CurdWindowModal,
+  AuthImage,
 };

src/main.js

@@ -116,6 +116,7 @@ const router = createRouter({
 
 
 import CurdWindowModal from './window1/CurdWindowModal.vue';
+import AuthImage from './widget/AuthImage.vue';
 
 const app = createApp(App);
 app.use(Antd);
@@ -129,6 +130,8 @@ app.mount('#app');
 
 // 全局注册组件， CURD窗口模态框编辑器
 app.component('CurdWindowModal', CurdWindowModal);
+// 图片显示
+app.component('AuthImage', AuthImage);
 
 window.app = app;
 

src/window1/CurdWindowModal.vue

@@ -3,7 +3,7 @@
     v-if="openTabEditModal"
     v-model:open="openTabEditModal" :is-restore-data="tabEditViewIsRestoreData"
     :window-no="mCurdWindowNo" :tab-index="mTabIndex" :type="tabEditViewType" :model-data-id="tabEditViewRecordId"
-    width="100%" :current-page="tabEditViewCurrentPage" :current-index="tabEditViewCurrentIndex"
+    width="90%" :current-page="tabEditViewCurrentPage" :current-index="tabEditViewCurrentIndex"
     :total-records="tabEditViewTotalRecords" :task-info-id="tabEditViewTaskInfoId"
     :workflow-type="tabEditViewWorkflowType" :mask-closable="false" :model-data-create="modelDataCreate"
     @open-tab-form-view="openTabFormView"
@@ -11,7 +11,7 @@
   <TabFormViewModal
     v-if="openTabViewModal"
     v-model:open="openTabViewModal" :window-no="mCurdWindowNo" :tab-index="mTabIndex"
-    :type="tabFormViewType" :model-data-id="tabFormViewRecordId" width="100%" :current-page="tabFormViewCurrentPage"
+    :type="tabFormViewType" :model-data-id="tabFormViewRecordId" width="90%" :current-page="tabFormViewCurrentPage"
     :current-index="tabFormViewCurrentIndex" :total-records="tabFormViewTotalRecords"
     :task-info-id="tabFormViewTaskInfoId" :workflow-type="tabFormViewWorkflowType" :mask-closable="false"
     @open-tab-edit-view="openTabEditView"

src/window1/tabGridView/GridColumnDef.vue

@@ -1,22 +1,9 @@
 <template>
   <div class="btn-group">
-    <!-- <button
-      type="button"
-      class="btn btn-default dropdown-toggle"
-      aria-haspopup="true"
-      aria-expanded="false"
-      @click="reverseShow"
-    >
-      <span class="fa fa-bars" />
-    </button> -->
     <div class="table_style" @click="reverseShow">
-      <ProfileTwoTone style="font-size: 16px;" /> 
-      <span style="color: black;">表格过滤</span>
+      <span>字段设置</span>
     </div>
-    <Modal v-model:show="modal">
-      <template #header>
-        {{ $t("lang.gridColumnDef.gridField") }}
-      </template>
+    <a-modal v-model:open="modal" :title="$t('lang.gridColumnDef.gridField')" :footer="null">
       <vuedraggable v-model="gridFields" item-key="id" class="wrapper" draggable=".column-dragable" @end="sortChaned()">
         <template #item="{element}">
           <div class="column-dragable">
@@ -39,7 +26,7 @@
           </div>
         </template>
       </vuedraggable>
-    </Modal>
+    </a-modal>
   </div>
 </template>
 
@@ -51,14 +38,12 @@ import GridColumnDef from './GridColumnDef.js';
 import Language from '../../common/Language.js';
 
 import vuedraggable from 'vuedraggable';
-import { ProfileTwoTone } from '@ant-design/icons-vue';
 
 export default {
 
 
   components: {
     vuedraggable,
-    ProfileTwoTone,
   },
   /**
      * 页签表单字段
@@ -185,5 +170,6 @@ ul label {
 }
 .table_style{
   cursor: pointer;
+  color: #277fd0;
 }
 </style>

src/window1/tabGridView/GridColumnDef1.vue

@@ -1,181 +0,0 @@
-<template>
-  <div class="btn-group">
-    <button
-      type="button"
-      class="btn btn-default dropdown-toggle"
-      aria-haspopup="true"
-      aria-expanded="false"
-      @click="reverseShow"
-    >
-      <span class="fa fa-bars" />
-    </button>
-    <Modal v-model:show="modal">
-      <template #header>
-        {{ $t("lang.gridColumnDef.gridField") }}
-      </template>
-      <vuedraggable v-model="gridFields" item-key="id" class="wrapper" draggable=".column-dragable" @end="sortChaned()">
-        <template #item="{element}">
-          <div class="column-dragable">
-            <div class="column">
-              <input
-                :id="'GridFieldDefItem' + '_' + windowNo + '_' + tabIndex + '_' + element.fieldName + '_' + element.entityFieldIndex"
-                v-model="element.visible"
-                autocomplete="off"
-                class="visible-checkbox"
-                type="checkbox"
-                :disabled="element.mandatory && element.visible"
-                @change="visibleChanged(element)"
-              />
-              <label
-                :for="'GridFieldDefItem' + '_' + windowNo + '_' + tabIndex + '_' + element.fieldName + '_' + element.entityFieldIndex"
-                class="column-name"
-                :class="{'column-red' : element.mandatory == true}"
-              >{{ Language.getDisplayNameTrl($i18n.locale, element) }}</label>
-            </div>
-          </div>
-        </template>
-      </vuedraggable>
-    </Modal>
-  </div>
-</template>
-
-<script>
-
-import Common from '../../common/Common.js';
-
-import GridColumnDef from './GridColumnDef.js';
-import Language from '../../common/Language.js';
-
-import vuedraggable from 'vuedraggable';
-
-
-export default {
-
-
-  components: {
-    vuedraggable,
-  },
-  /**
-     * 页签表单字段
-     */
-  // eslint-disable-next-line
-  props: ['windowNo', 'tabIndex', 'tabGridFields'],
-
-  data: function () {
-    this.Language = Language;
-    return {
-      gridFieldItemMap: {},
-      gridFields: [],
-      modal: false,
-    };
-  },
-  watch: {
-    'tabGridFields': function () {
-      this.cloneTabGridFields();
-    },
-  },
-  mounted: function () {
-    this.cloneTabGridFields();
-  },
-
-  methods: {
-    /**
-         * 克隆页签表单字段
-         */
-    cloneTabGridFields: function () {
-      var _self = this;
-      if (_self.tabGridFields == null) {
-        return;
-      }
-      _self.gridFields.splice(0, _self.gridFields.length);
-      let tempGridFields = [];
-      for (var i = 0, len1 = _self.tabGridFields.length; i < len1; i++) {
-        let tempSortNo = _self.tabGridFields[i].sortNo;
-        var tabGridFieldClone = {
-          'fieldName': _self.tabGridFields[i].fieldName,
-          'displayName': _self.tabGridFields[i].displayName,
-          'displayNameEng': _self.tabGridFields[i].displayNameEng,
-          'entityFieldIndex': _self.tabGridFields[i].entityFieldIndex,
-          'mandatory': _self.tabGridFields[i].mandatory,
-          'visible': _self.tabGridFields[i].visible,
-          'key':('GridFieldDef_' + _self.windowNo + '_'+_self.tabIndex+'_' + _self.tabGridFields[i].fieldName + '_' + _self.tabGridFields[i].entityFieldIndex),
-          'sortNo': (tempSortNo == null) ? 100 : tempSortNo,
-          'width':_self.tabGridFields[i].width,
-        };
-        tempGridFields.push(tabGridFieldClone);
-      }
-      tempGridFields.sort(function(a,b){
-        return a.sortNo - b.sortNo;
-      });
-      tempGridFields.forEach(function(tempGridField){
-        _self.gridFields.push(tempGridField);
-      });
-
-    },
-
-    /**
-         * 表格字段的显示属性发生改变
-         * @param { object } gridField 表格字段
-         */
-    visibleChanged: function (gridField) {
-      var _self = this;
-      if (gridField.mandatory) {
-        gridField.visible = true;
-        return;
-      }
-      GridColumnDef.saveGridFieldDef(_self.windowNo, _self.tabIndex, _self.gridFields).then(successData => {
-        _self.$emit('propertyChanged', _self.gridFields);
-      }, errorData => {
-        Common.processException(errorData);
-      });
-    },
-
-    /**
-         * 显示表单编辑模态框
-         */
-    reverseShow: function () {
-      this.modal = true;
-    },
-
-    /**
-         * 排序发生改变
-         */
-    sortChaned:function(){
-      console.log('sortChaned');
-      var _self = this;
-      for (var i = 0, len1 = _self.gridFields.length; i < len1; i++) {
-        _self.gridFields[i].sortNo = i * 10;
-      }
-      GridColumnDef.saveGridFieldDef(_self.windowNo, _self.tabIndex, _self.gridFields).then(successData => {
-        _self.$emit('propertyChanged', _self.gridFields);
-      }, errorData => {
-        console.log(errorData);
-      });
-    },
-  },
-};
-
-</script>
-<style scoped>
-.visible-checkbox {
-    width: 17px;
-    height: 17px;
-    text-align: center;
-    margin-right: 15px;
-    margin-left: 15px;
-    margin-top: 8px;
-}
-.column-name {
-    height: 25px;
-    line-height: 25px;
-}
-.column-red {
-    color: red;
-}
-.m-dropdown-menu {
-    display: block;
-}
-ul label {
-    cursor: pointer;
-}
-</style>

src/window1/tabGridView/NewTabButton.vue

@@ -64,15 +64,6 @@
         </a-button>
         <a-button v-else :icon="h(LayoutTwoTone)">{{ item.name }}</a-button>
       </template>
-
-      <!-- <a-space>
-        <GridColumnDef
-          :window-no="windowNo"
-          :tab-index="tabIndex"
-          :tab-grid-fields="tabGridFields"
-          @property-changed="propertyChanged($event)"
-        />
-      </a-space> -->
     </a-space>
     <a-space size="small">
       <template v-for="(item, index) in rightTabButton" :key="index">

src/window1/tabGridView/TabGridEdit.vue

@@ -7,7 +7,14 @@
       v-if="
         tab && tab.tabDataSource && tab.tabDataSource.tabDataSourceGroupDtos
       " :tab-props="tab.tabDataSource.tabDataSourceGroupDtos" @get-now-tab="getNowTab"
-    />
+    >
+      <GridColumnDef
+        :window-no="windowNo"
+        :tab-index="tabIndex"
+        :tab-grid-fields="tabGridFields"
+        @property-changed="propertyChanged($event)"
+      />
+    </WindowTab>
     <div
       class="grid-container" :style="{
         'padding-right': showComplexFilterPanel == true ? '360px' : '0px',
@@ -149,6 +156,11 @@ import { Notify, Uuid, CssUtil } from 'pc-component-v3';
 import WindowTab from './WindowTab.vue';
 import NewTabButton from './NewTabButton.vue';
 
+import GridColumnDef from '../tabGridView/GridColumnDef.vue';
+
+
+
+
 import {
   PlusCircleTwoTone,
   PlusSquareTwoTone,
@@ -182,6 +194,7 @@ export default {
     CheckSquareTwoTone,
     CloseCircleTwoTone,
     IdcardTwoTone,
+    GridColumnDef,
   },
   props: {
     windowNo: {

src/window1/tabGridView/WindowTab.vue

@@ -13,6 +13,9 @@
     <li class="help-box">
       <span>使用帮助</span>
     </li>
+    <li class="help-box">
+      <slot />
+    </li>
   </ul>
 </template>