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

package-lock.json

@@ -1,15 +1,12 @@
 {
   "name": "client-base-v4",
-  "version": "4.0.76",
+  "version": "4.0.77",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client-base-v4",
-      "version": "4.0.76",
-      "dependencies": {
-        "ant-design-vue": "^4.2.1"
-      },
+      "version": "4.0.77",
       "devDependencies": {
         "@babel/core": "^7.17.5",
         "@babel/eslint-parser": "^7.17.0",
@@ -71,6 +68,7 @@
       "resolved": "http://wuzhixin.vip:4873/@ant-design/colors/-/colors-6.0.0.tgz",
       "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ctrl/tinycolor": "^3.4.0"
       }
@@ -79,13 +77,15 @@
       "version": "4.4.2",
       "resolved": "http://wuzhixin.vip:4873/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz",
       "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@ant-design/icons-vue": {
       "version": "7.0.1",
       "resolved": "http://wuzhixin.vip:4873/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz",
       "integrity": "sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ant-design/colors": "^6.0.0",
         "@ant-design/icons-svg": "^4.2.1"
@@ -1876,6 +1876,7 @@
       "resolved": "http://wuzhixin.vip:4873/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
       "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -1894,13 +1895,15 @@
       "version": "0.9.2",
       "resolved": "http://wuzhixin.vip:4873/@emotion/hash/-/hash-0.9.2.tgz",
       "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@emotion/unitless": {
       "version": "0.8.1",
       "resolved": "http://wuzhixin.vip:4873/@emotion/unitless/-/unitless-0.8.1.tgz",
       "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
@@ -2325,6 +2328,7 @@
       "resolved": "http://wuzhixin.vip:4873/@simonwep/pickr/-/pickr-1.8.2.tgz",
       "integrity": "sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "core-js": "^3.15.1",
         "nanopop": "^2.1.0"
@@ -3076,6 +3080,7 @@
       "resolved": "http://wuzhixin.vip:4873/ant-design-vue/-/ant-design-vue-4.2.5.tgz",
       "integrity": "sha512-dh5CBXSaxJZBFQBd156sOUuZPfxI7pZsNXDYpHNBt/JyKZoYlbetRp/nJmSragS2Oo0mVC23Ote+TQSGc0TX6g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ant-design/colors": "^6.0.0",
         "@ant-design/icons-vue": "^7.0.0",
@@ -3143,7 +3148,8 @@
       "version": "2.1.0",
       "resolved": "http://wuzhixin.vip:4873/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
       "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/array-union": {
       "version": "1.0.2",
@@ -3172,7 +3178,8 @@
       "version": "4.2.5",
       "resolved": "http://wuzhixin.vip:4873/async-validator/-/async-validator-4.2.5.tgz",
       "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/babel-loader": {
       "version": "8.3.0",
@@ -3710,7 +3717,8 @@
       "version": "1.0.20",
       "resolved": "http://wuzhixin.vip:4873/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
       "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -3864,6 +3872,7 @@
       "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -4026,7 +4035,8 @@
       "version": "1.11.13",
       "resolved": "http://wuzhixin.vip:4873/dayjs/-/dayjs-1.11.13.tgz",
       "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/debounce": {
       "version": "1.2.1",
@@ -4228,7 +4238,8 @@
       "version": "1.12.4",
       "resolved": "http://wuzhixin.vip:4873/dom-align/-/dom-align-1.12.4.tgz",
       "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/dom-converter": {
       "version": "0.2.0",
@@ -4244,7 +4255,8 @@
       "version": "2.0.1",
       "resolved": "http://wuzhixin.vip:4873/dom-scroll-into-view/-/dom-scroll-into-view-2.0.1.tgz",
       "integrity": "sha512-bvVTQe1lfaUr1oFzZX80ce9KLDlZ3iU+XGNE/bz9HnGdklTieqsbmsLHe+rT2XWqopvL0PckkYqN7ksmm5pe3w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/dom-serializer": {
       "version": "1.4.1",
@@ -6140,6 +6152,7 @@
       "resolved": "http://wuzhixin.vip:4873/is-plain-object/-/is-plain-object-3.0.1.tgz",
       "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6475,7 +6488,8 @@
       "version": "4.17.21",
       "resolved": "http://wuzhixin.vip:4873/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
@@ -6496,6 +6510,7 @@
       "resolved": "http://wuzhixin.vip:4873/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -6826,7 +6841,8 @@
       "version": "2.4.2",
       "resolved": "http://wuzhixin.vip:4873/nanopop/-/nanopop-2.4.2.tgz",
       "integrity": "sha512-NzOgmMQ+elxxHeIha+OG/Pv3Oc3p4RU2aBhwWwAqDpXrdTbtRylbRLQztLy8dMMwfl6pclznBdfUhccEn9ZIzw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
@@ -7755,7 +7771,8 @@
       "version": "1.5.1",
       "resolved": "http://wuzhixin.vip:4873/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
       "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/resolve": {
       "version": "1.22.8",
@@ -7918,6 +7935,7 @@
       "resolved": "http://wuzhixin.vip:4873/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
       "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "compute-scroll-into-view": "^1.0.20"
       }
@@ -8159,7 +8177,8 @@
       "version": "1.2.1",
       "resolved": "http://wuzhixin.vip:4873/shallow-equal/-/shallow-equal-1.2.1.tgz",
       "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
@@ -8406,7 +8425,8 @@
       "version": "4.3.4",
       "resolved": "http://wuzhixin.vip:4873/stylis/-/stylis-4.3.4.tgz",
       "integrity": "sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
@@ -8590,6 +8610,7 @@
       "resolved": "http://wuzhixin.vip:4873/throttle-debounce/-/throttle-debounce-5.0.2.tgz",
       "integrity": "sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12.22"
       }
@@ -9136,6 +9157,7 @@
       "resolved": "http://wuzhixin.vip:4873/vue-types/-/vue-types-3.0.2.tgz",
       "integrity": "sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "is-plain-object": "3.0.1"
       },
@@ -9164,6 +9186,7 @@
       "resolved": "http://wuzhixin.vip:4873/warning/-/warning-4.0.3.tgz",
       "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.0.0"
       }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.76",
+  "version": "4.0.78",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry http://wuzhixin.vip:4873",
@@ -63,8 +63,5 @@
   "repository": {
     "type": "http",
     "url": "https://a.leanwo.com:3000/prodog-client-2023/client-base-v4.git"
-  },
-  "dependencies": {
-    "ant-design-vue": "^4.2.1"
   }
 }

public/index-release.html

@@ -29,6 +29,7 @@
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="../static/css/jQuery.resizableColumns.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="../static/css/jquery.treegrid.css">
 	<!-- <link rel="stylesheet" type="text/css" media="screen" href="../static/plugin/converse_7.0.4/dist/converse.min.css"> -->
+	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="./api/file/getThemeCss">
 
 
 

src/index.js

@@ -141,5 +141,5 @@ export {
   CreateIdentity,
   PrinterConfiguration,
   CurdWindow1,
-  CurdWindowModal
+  CurdWindowModal,
 };

src/window1/CurdWindowModal.vue

@@ -90,10 +90,10 @@ const props = defineProps({
 });
 
 
-const mCurdWindowNo = ref('20240910_193059');
+const mCurdWindowNo = ref(null);
 const mTabIndex = ref(0);
 
-const openTabEditModal = ref(true);
+const openTabEditModal = ref(false);
 const tabEditViewType = ref('create');
 const tabEditViewRecordId = ref(null);
 const tabEditViewCurrentPage = ref(null);
@@ -131,10 +131,16 @@ onMounted(() => {
     openTabViewModal.value = false;
     return;
   }
+
+  mCurdWindowNo.value = props.curdWindowNo;
+  mTabIndex.value = props.tabIndex;
+
+
   // 窗口类型
   // Edit:编辑界面,可选项如下(create:创建数据,edit:编辑数据,editRestore:恢复数据)
   // View:表单界面,可选项如下(view:视图数据,viewRestore:恢复数据)
   if(props.viewType == 'create' || props.viewType == 'edit' || props.viewType == 'editRestore'){
+    
     openTabEditView({
       type: props.viewType,
       windowNo: props.curdWindowNo,

src/window1/tabGridView/GridBody.vue

@@ -1,11 +1,11 @@
 <template>
   <tr v-if="showTabGridTitleFields" height="40px" :style="{ 'background-color': warningColor }" :class="{ 'warning': isSelected }">
-    <td rowspan="2">{{ serialNumber }}</td>
-    <td rowspan="2" class="text-center">
+    <td rowspan="2" class="sticky-col">{{ serialNumber }}</td>
+    <td rowspan="2" class="text-center sticky-col" style="left:50px">
       <input v-model="isSelected" autocomplete="off" type="checkbox" @click="clickModelData(modelData)" />
     </td>
 
-    <td v-if="isShowEdit == undefined || isShowEdit" rowspan="2">
+    <td v-if="isShowEdit == undefined || isShowEdit" rowspan="2" class="sticky-col" style="left:80px">
       <template v-if="showEditButton">
         <span class="operation-delete" aria-hidden="true" @click="editRecord">
           <i class="fa" :class="{ 'fa-pencil': !modelData.editMode, 'fa-check': modelData.editMode }" />
@@ -29,7 +29,7 @@
             <CellItem
               v-else :ref="'cellItem' + index" :scroll-object="scrollObject" :field-item="tabGridTitleField"
               :model-data="modelData" :parent-model-data="parentModelData" :class-name="className" :window-no="windowNo"
-              :tab-index="tabIndex" style="display: inline-block;"
+              :tab-index="tabIndex" style="display: inline-block; min-width: 200px;"
               :class="{ 'table-cell-searchwidget': fieldUtil.isSearchType(tabGridTitleField) }"
               @value-changed="valueChanged($event, tabGridTitleField)"
               @execute-callout="executeCallout(tabGridTitleField)"
@@ -41,12 +41,12 @@
   </tr>
   <tr :style="{ 'background-color': warningColor }" :class="{ 'warning': isSelected }" height="40px">
     <template v-if="!showTabGridTitleFields">
-      <td>{{ serialNumber }}</td>
-      <td class="text-center">
+      <td class="sticky-col">{{ serialNumber }}</td>
+      <td class="text-center sticky-col" style="left:50px">
         <input v-model="isSelected" autocomplete="off" type="checkbox" @click="clickModelData(modelData)" />
       </td>
 
-      <td v-if="isShowEdit == undefined || isShowEdit">
+      <td v-if="isShowEdit == undefined || isShowEdit" class="sticky-col" style="left:80px">
         <template v-if="showEditButton">
           <span class="operation-delete" aria-hidden="true" @click="editRecord">
             <i class="fa" :class="{ 'fa-pencil': !modelData.editMode, 'fa-check': modelData.editMode }" />
@@ -431,4 +431,14 @@ export default {
   margin-left: 5px;
   margin-right: 10px;
 }
+
+
+/* 固定列 */
+.sticky-col {
+  position: -webkit-sticky; /* Safari */
+  position: sticky;
+  left: 0;
+  background: #fafafa;
+  z-index: 1; /* 确保固定列在其他内容之上 */
+}
 </style>

src/window1/tabGridView/GridHeader.vue

@@ -1,24 +1,24 @@
 <template>
-  <tr>
+  <tr class="sticky-row">
     <th
       v-if="$i18n.locale === 'zh-CN'"
-      class="text-center"
+      class="text-center sticky-col"
       width="50px"
     >
       <div>{{ $t('lang.gridHeader.serialNumber') }}</div>
     </th>
     <th
       v-else
-      class="text-center"
+      class="text-center sticky-col"
       width="100px"
     >
       <div>{{ $t('lang.gridHeader.serialNumber') }}</div>
     </th>
     <th
-      class="text-center"
+      class="text-center sticky-col"
       width="30px"
       :class="{'mulitiple-select': multipleSelect}"
-      @click.self="changeSelectMode"
+      style="left:50px" @click.self="changeSelectMode"
     >
       <input
         v-model="isSelectAll"
@@ -29,8 +29,9 @@
     </th>
     <th
       v-if="isShowEdit == undefined || isShowEdit"
-      class="text-center"
+      class="text-center sticky-col"
       width="95px"
+      style="left:80px"
     >
       <div>
         {{ $t('lang.gridHeader.operate') }}
@@ -44,6 +45,7 @@
         v-tooltip="tabGridField.help"
         class="text-center"
         :width="tabGridField.width + 'px'"
+        style="position: relative;"
         @dragover="ondragover($event, tabGridField)"
         @click="onSort(tabGridField)"
       >
@@ -284,8 +286,8 @@ th {
 
 
 <style scoped>
-table.fixed-table th {
-    position: relative;
+table.curd-table th {
+    /* position: relative; */
     min-width: 25px;
 }
 
@@ -304,16 +306,17 @@ table th {
     background-color: #f8f8f8;
 }
 
-table.fixed-table th .rz-handle {
+.rz-handle {
     width: 10px;
     height: 100%;
     position: absolute;
     top: 0;
     right: 0;
     cursor: ew-resize !important;
+    z-index: 3;
 }
 
-table.fixed-table th .rz-handle.rz-handle-active {
+.rz-handle.rz-handle-active {
     border-right: 2px solid #000;
     transform: scaleX(100);
     background: rgba(0, 0, 0, 0.05) 2px;
@@ -322,4 +325,23 @@ table.fixed-table th .rz-handle.rz-handle-active {
 .rz-handle:hover {
     background: rgba(0, 0, 0, 0.2) 4px;
 }
+
+
+/* 固定列 */
+.sticky-col {
+  position: -webkit-sticky; /* Safari */
+  position: sticky;
+  left: 0;
+  background: #fafafa;
+  z-index: 1; /* 确保固定列在其他内容之上 */
+}
+
+/* 固定行 */
+.sticky-row {
+  position: -webkit-sticky; /* Safari */
+  position: sticky;
+  top: 0;
+  background: #fafafa;
+  z-index: 2; /* 确保固定列在其他内容之上 */
+}
 </style>

src/window1/tabGridView/SubTabGridEdit.vue

@@ -90,8 +90,7 @@
             >
               <div :id="scrollObject.tableOutDivUuid2" ref="tableContainer2">
                 <table
-                  id="fixedTbody"
-                  class="fixed-table table-striped table-bordered float-table"
+                  class="curd-table table-striped table-bordered float-table"
                   :width="tableWidth"
                 >
                   <thead>

src/window1/tabGridView/TabGridEdit.vue

@@ -47,7 +47,7 @@
         <div v-if="tab != null && tab.tabGridView != null">
           <div :id="scrollObject.tableOutDivUuid1" ref="tableContainer1" style="padding-left: 0px">
             <div :id="scrollObject.tableOutDivUuid2" ref="tableContainer2">
-              <table id="fixedTbody" class="fixed-table table-striped table-bordered" :width="tableWidth">
+              <table class="curd-table table-striped table-bordered" :width="tableWidth">
                 <thead>
                   <GridHeader
                     :is-show-edit="!tab.tabDataSource.readOnly" :tab-grid-fields="tabGridFields"
@@ -787,8 +787,6 @@ export default {
 
           _self.loading = false;
           _self.refreshCommand = false;
-
-          _self.fixedTableHeader();
         },
         function () {
           _self.loading = false;
@@ -1743,19 +1741,6 @@ export default {
       }
     },
 
-    /**
-     * 冻结表头
-     */
-    fixedTableHeader: function () {
-      let _self = this;
-      _self.$nextTick(function () {
-        var $th = $('.tableFixHead').find('thead');
-        $('.tableFixHead').on('scroll', function () {
-          $th.css('transform', 'translateY(' + this.scrollTop + 'px)');
-        });
-      });
-    },
-
     backupView: function () {
       let _self = this;
       // 请勿修改，会影响生单的功能