zhujiamin 发布系统代码 [TrainSys，网页端]

app_Web/package.json

@@ -13,13 +13,13 @@
   "dependencies": {
     "@floating-ui/dom": "^1.0.11",
     "@ibiz-template/command": "^0.0.1-beta.50",
-    "@ibiz-template/controller": "^0.0.1-beta.82",
-    "@ibiz-template/core": "^0.0.1-beta.82",
-    "@ibiz-template/model": "^0.0.1-beta.82",
-    "@ibiz-template/runtime": "^0.0.1-beta.82",
-    "@ibiz-template/service": "^0.0.1-beta.82",
-    "@ibiz-template/theme": "^0.0.1-beta.82",
-    "@ibiz-template/vue-util": "^0.0.1-beta.82",
+    "@ibiz-template/controller": "^0.0.1-beta.83",
+    "@ibiz-template/core": "^0.0.1-beta.83",
+    "@ibiz-template/model": "^0.0.1-beta.83",
+    "@ibiz-template/runtime": "^0.0.1-beta.83",
+    "@ibiz-template/service": "^0.0.1-beta.83",
+    "@ibiz-template/theme": "^0.0.1-beta.83",
+    "@ibiz-template/vue-util": "^0.0.1-beta.83",
     "@ibiz/dynamic-model-api": "^2.1.17",
     "@riophae/vue-treeselect": "^0.4.0",
     "dayjs": "^1.11.7",

app_Web/src/components/widgets/grid-control/grid-control.util.ts

@@ -29,6 +29,7 @@ export function generateColumnData(column: GridColumnModel, c: GridController) {
     tooltip: false, // todo 表格提示用title
     resizable: true,
     sortable: !c.noSort && column.source.enableSort ? 'custom' : false,
+    columnType: column.source.columnType,
   };
   if (columnChildren.length > 0) {
     Object.assign(columnData, { children: columnChildren });
@@ -105,6 +106,11 @@ export function useITableColumns(c: GridController) {
         width: undefined,
       };
     }
+    // 如果是操作列，固定右边
+    const uaColumn = copy.find(column => column.columnType === 'UAGRIDCOLUMN');
+    if (uaColumn) {
+      uaColumn.fixed = 'right';
+    }
     return copy;
   });
   return [columns, originColumns];

app_Web/yarn.lock

@@ -651,54 +651,54 @@
   dependencies:
     qx-util "^0.4.8"
 
-"@ibiz-template/controller@^0.0.1-beta.82":
-  version "0.0.1-beta.82"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/controller/-/controller-0.0.1-beta.82.tgz#593a0efd887db6f923e245d279dddf4cf8baf6ca"
-  integrity sha512-Eo/ja4bFBz8i+aatC6wkQiMiYkTEmpu+aGqvq3XIJs0q0H3b5epMsspYWI4vu/o1u2Qmb8dkLsXKU29QRDdT5g==
+"@ibiz-template/controller@^0.0.1-beta.83":
+  version "0.0.1-beta.83"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/controller/-/controller-0.0.1-beta.83.tgz#288138a4ed7f62036de257de8c8c4c2fc321ee8e"
+  integrity sha512-14JbTt0umNewN2RPDRG+bfyE9J+9QsPOucl8u5+hnDoIYmMuzGzT757sR7gJdqCDJtghHV6y7fX7vke0h0dZ5g==
   dependencies:
     async-validator "^4.2.5"
     dayjs "^1.11.5"
 
-"@ibiz-template/core@^0.0.1-beta.82":
-  version "0.0.1-beta.82"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/core/-/core-0.0.1-beta.82.tgz#9ee90429b3100b462f43900001a28988446604f4"
-  integrity sha512-WnPe2FBZ5DUhrhVoI6JrhSl6sjkGLVn/7OVj0g4dmp1DhXwoOrbWjW+Ogr/p7kSV/LyRC4g1sRXk/tb9V4dPAA==
+"@ibiz-template/core@^0.0.1-beta.83":
+  version "0.0.1-beta.83"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/core/-/core-0.0.1-beta.83.tgz#2ab42d82373e101d59129684b5b8a6a4253d78f7"
+  integrity sha512-+i17EBwu4Og4TyvGPpJdlWiabpVI0mJs0YV8N1U2ajx+VGi6VVzOD3FgleyFEYIYxJPBVsz0ZE15xukwOr6L3Q==
   dependencies:
     axios "^1.2.1"
     loglevel "^1.8.0"
     pluralize "^8.0.0"
     qs "^6.11.0"
 
-"@ibiz-template/model@^0.0.1-beta.82":
-  version "0.0.1-beta.82"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/model/-/model-0.0.1-beta.82.tgz#3bebf980965d237da02251d3181c1bafbe467d2a"
-  integrity sha512-Zn8pvpi/fq8qo1p/0NjMmu0D7nojCH3EAjifybdLe/+h700UTT0bfPOI6vlk8csVkYgkzI8Ds/RC6kb+EcDhXw==
+"@ibiz-template/model@^0.0.1-beta.83":
+  version "0.0.1-beta.83"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/model/-/model-0.0.1-beta.83.tgz#7aa1c55fb062c5720018e0377df012968e62e262"
+  integrity sha512-VQg+yz5ypJNNRfm96Dkfvz3di8VvMDY/NwXNqQC177nMzUSLj81PKQ1T+S08lNqMPxB79ySxPcNgNfSEXMD8zg==
   dependencies:
     "@ibiz/dynamic-model-api" "^2.1.17"
     pluralize "^8.0.0"
 
-"@ibiz-template/runtime@^0.0.1-beta.82":
-  version "0.0.1-beta.82"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/runtime/-/runtime-0.0.1-beta.82.tgz#b0591f99ae6c77946f885695304468cce29af23a"
-  integrity sha512-Tx50eIcsliwh0x4C1DIjY4VEu8gmXFzmfDxVQxA9oWyB+I3sQA0Cn+G87NjgCnDWWQsV/iGXnC9430hO4X264g==
+"@ibiz-template/runtime@^0.0.1-beta.83":
+  version "0.0.1-beta.83"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/runtime/-/runtime-0.0.1-beta.83.tgz#203495f0764432790f29acf96a2f25b0a02884ba"
+  integrity sha512-3A1YAqn+Qu5WaZTMtTea51eDGTWS7pcZuXOVB8UdofnOAxNFOQdYw7dlWQsvuy9tyvqLfa6XLoypkI+XWEV58g==
   dependencies:
     "@ibiz-template/command" "^0.0.1-beta.50"
     qs "^6.11.0"
 
-"@ibiz-template/service@^0.0.1-beta.82":
-  version "0.0.1-beta.82"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/service/-/service-0.0.1-beta.82.tgz#f55458d818cbfb3691444f718e10c8486322e7ea"
-  integrity sha512-gd5Okom1MwfTClItV4ekECu6bPZq3HV3fsfmM/R6Qe6KD4VDEqwORca8r1VRYP1eE1s/mTonXnoyy154vC9aIg==
+"@ibiz-template/service@^0.0.1-beta.83":
+  version "0.0.1-beta.83"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/service/-/service-0.0.1-beta.83.tgz#569b19f51a5282db286879a388d70889ad113682"
+  integrity sha512-xvM7gdNgQC//6+D39maykDr4WPEW+bjqIUFXo0sw7MfA98GoneGQ5VLdtT+QRVpO92DicO/Do4NXWOe9tuu4uA==
 
-"@ibiz-template/theme@^0.0.1-beta.82":
-  version "0.0.1-beta.82"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/theme/-/theme-0.0.1-beta.82.tgz#e3ec9371d833ddc79d0b2cff43fe2ba15bc8ff97"
-  integrity sha512-PAvZkfgtD+AVSIXaLywhhpErMbW6eRkcBGnJIdlQSj52C3dgRgXkDkRW9DTRPInntMTe4LGUMMytYdjV4216QA==
+"@ibiz-template/theme@^0.0.1-beta.83":
+  version "0.0.1-beta.83"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/theme/-/theme-0.0.1-beta.83.tgz#26bbe29c2e9b98be90322e358b4154a327cbc0ef"
+  integrity sha512-ye2ff9y/vFp70vcNlYLofhaT/R3F3cLx8pZ9OpWr4UPwsuWhbSy0B5MKxjSIK7nXMAXKXH/jSZvzCElAXKKc7Q==
 
-"@ibiz-template/vue-util@^0.0.1-beta.82":
-  version "0.0.1-beta.82"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/vue-util/-/vue-util-0.0.1-beta.82.tgz#cd8bf58d5c5d836d64d610d44612cfa868f36541"
-  integrity sha512-L2IqYp/LQCPLpi5N870l+1phRQKXx2flxEObyKON0HtoBSvh99HrYPsJJb1AtrOEIagVVVVGBSLVx+cnIb7Bjw==
+"@ibiz-template/vue-util@^0.0.1-beta.83":
+  version "0.0.1-beta.83"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/vue-util/-/vue-util-0.0.1-beta.83.tgz#ec56809608c2f879d537a25946352a2a19972369"
+  integrity sha512-5PR8nVY28I+7jjm+OS6fit7xNeJrfTmi625zRVjjfOQsvrRYMCbJRm7zvwlPEn9mG+mqOeXCpqIpOVR3jt0g6w==
 
 "@ibiz/dynamic-model-api@^2.1.17":
   version "2.1.17"