From 2e2ec72bdefad3ff51c786721f11b0d8b82d8b1b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 20 八月 2024 15:04:07 +0800
Subject: [PATCH] 打印模板更新
---
src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_TEMP.ts | 4 +-
vite.config.ts.timestamp-1724137429068-211eea5bebdb6.mjs | 59 +++++++++++++++++++++++++++++
src/views/tigerprojects/system/lowcode/normal/mainTable.vue | 33 +++++++++-------
src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_VAR.ts | 4 -
4 files changed, 81 insertions(+), 19 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_TEMP.ts b/src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_TEMP.ts
index 703ef20..cd589bf 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_TEMP.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_TEMP.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-08-05 15:44:22
+ * @LastEditTime: 2024-08-20 15:03:44
*/
import { DeleteLabelTemplate } from '/@/api/tigerapi/mes/label';
@@ -100,7 +100,7 @@
*/
CustFunc: (param: CustModalParams) => {
const webSocketStore = useWebSocketStore();
- if (webSocketStore.GetSocketState == 1) {
+ if (webSocketStore.GetSocketState == 1 && param.values['TEMP_TYPE'] == 0) {
webSocketStore.sendMessage(
`wsSubStrings ${param.values['ID']}_#_${param.values['TEMP_PATH']}`,
);
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_VAR.ts b/src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_VAR.ts
index 7c6f308..b669e72 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_VAR.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BAS_LABEL_VAR.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-08-06 22:41:33
+ * @LastEditTime: 2024-08-20 14:59:13
*/
import { Tag, Tooltip } from 'ant-design-vue';
@@ -26,8 +26,6 @@
BasLabelTempInput,
} from '/@/api/tigerapi/model/mesModel';
import { useUserStore } from '/@/store/modules/user';
-import { uploadApi } from '/@/api/sys/upload';
-import { useWebSocketStore } from '/@/store/modules/websocket';
const { getLocale } = useLocale();
diff --git a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
index 0828e5b..07c2365 100644
--- a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
@@ -2,6 +2,7 @@
<div>
<BasicTable @register="registerTable">
<template #toolbar>
+ <!-- 鏍规嵁鑿滃崟璁剧疆鐨勬寜閽紝鑷姩鐢熸垚 -->
<a-button
type="primary"
v-for="item in buttons.filter((m) => m['BUTTON_TYPE'] == 0)"
@@ -264,10 +265,12 @@
ifSave: true,
};
+ /* 鏍规嵁鑿滃崟璁剧疆鐨勬寜閽嚜鍔ㄧ敓鎴愭搷浣滃垪涓殑鎸夐挳 */
const actionItem = GenerateActionButton(params, buttons, openDrawer, reload);
if (isNullOrUnDef(custImport.value['default'])) {
return actionItem;
}
+ /* 鏍规嵁鍔ㄦ�佸姞杞界殑瀹炰綋绫诲悕.ts涓殑ActionItem鏂规硶锛屾覆鏌撴搷浣滃垪涓殑鎸夐挳鏂规硶 */
return nActionItem(
params,
actionItem,
@@ -301,19 +304,21 @@
*/
function handleCreate(fnName: string) {
if (isNullOrUnDef(custImport.value['default'])) {
+ /* 濡傛灉鍔ㄦ�佸姞杞界殑瀹炰綋绫�.ts涓嶅瓨鍦紝鍒欑洿鎺ユ墦寮�渚ц竟妗� */
openDrawer(true, {
- isUpdate: false,
- entityName: entityName.value,
- formJson: _crudFormSchema.value,
- crudColSlots: objParams.value['crudColSlots'],
- isExistSql: isExistSql.value,
- ifSave: true,
+ isUpdate: false, //鏄柊澧炶繕鏄紪杈戯紝false-鏂板|true-缂栬緫
+ entityName: entityName.value, //瀹炰綋绫诲悕
+ formJson: _crudFormSchema.value, //鏂板缂栬緫鐨勮〃鍗曠粨鏋�
+ crudColSlots: objParams.value['crudColSlots'], //鏂板缂栬緫鐨勮〃鍗曚腑鐨勬彃妲藉垪琛�
+ isExistSql: isExistSql.value, //鏄惁瀛樺湪妫�鏌ql锛屾瘮濡�: XXX_CODE = '12345'
+ ifSave: true, //鏄惁鎻愪氦琛ㄥ崟鏃朵繚瀛樺埌鏁版嵁搴擄紝鍚�-鏆傚瓨|鏄�-淇濆瓨
});
} else {
+ /* 濡傛灉鍔ㄦ�佸姞杞界殑瀹炰綋绫�.ts瀛樺湪锛屾牴鎹�.ts鏂囦欢涓殑鏂规硶鏉ユ墽琛屾搷浣� */
const [{ CreateAction }] = custImport.value['default']();
const result = CreateAction(entityName.value, colSlots.value);
switch (result.action) {
- case 'go':
+ case 'go': /* 璺宠浆椤甸潰 */
// 灏嗗璞¤浆鎹负JSON瀛楃涓插苟淇濆瓨鍒皊essionStorage
sessionStorage.setItem(
`${result.params.Name}_params`,
@@ -323,14 +328,14 @@
`/${result.url}/${encodeURI(JSON.stringify({ sName: result.params.Name, Name: result.params.Name }))}`,
);
break;
- case 'drawer':
+ case 'drawer': /* 鎵撳紑渚ц竟妗� */
openDrawer(true, {
- isUpdate: false,
- entityName: entityName.value,
- formJson: _crudFormSchema.value,
- crudColSlots: objParams.value['crudColSlots'],
- isExistSql: isExistSql.value,
- ifSave: true,
+ isUpdate: false, //鏄柊澧炶繕鏄紪杈戯紝false-鏂板|true-缂栬緫
+ entityName: entityName.value, //瀹炰綋绫诲悕
+ formJson: _crudFormSchema.value, //鏂板缂栬緫鐨勮〃鍗曠粨鏋�
+ crudColSlots: objParams.value['crudColSlots'], //鏂板缂栬緫鐨勮〃鍗曚腑鐨勬彃妲藉垪琛�
+ isExistSql: isExistSql.value, //鏄惁瀛樺湪妫�鏌ql锛屾瘮濡�: XXX_CODE = '12345'
+ ifSave: true, //鏄惁鎻愪氦琛ㄥ崟鏃朵繚瀛樺埌鏁版嵁搴擄紝鍚�-鏆傚瓨|鏄�-淇濆瓨
});
break;
}
diff --git a/vite.config.ts.timestamp-1724137429068-211eea5bebdb6.mjs b/vite.config.ts.timestamp-1724137429068-211eea5bebdb6.mjs
new file mode 100644
index 0000000..08bf2da
--- /dev/null
+++ b/vite.config.ts.timestamp-1724137429068-211eea5bebdb6.mjs
@@ -0,0 +1,59 @@
+// vite.config.ts
+import { defineApplicationConfig } from "file:///D:/Git/TigerClouds-Tech/BS/TigerAdmin_2024/internal/vite-config/dist/index.mjs";
+var vite_config_default = defineApplicationConfig({
+ overrides: {
+ optimizeDeps: {
+ esbuildOptions: {
+ target: "esnext"
+ },
+ include: [
+ "echarts/core",
+ "echarts/charts",
+ "echarts/components",
+ "echarts/renderers",
+ "qrcode",
+ "@iconify/iconify",
+ "ant-design-vue/es/locale/zh_CN",
+ "ant-design-vue/es/locale/en_US"
+ ]
+ },
+ server: {
+ port: 3100,
+ proxy: {
+ "/basic-api": {
+ target: "http://localhost:3000",
+ changeOrigin: true,
+ ws: true,
+ rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "")
+ // only https
+ // secure: false
+ },
+ "/upload": {
+ target: "http://localhost:3300/upload",
+ changeOrigin: true,
+ ws: true,
+ rewrite: (path) => path.replace(new RegExp(`^/upload`), "")
+ }
+ },
+ open: true,
+ // 椤圭洰鍚姩鍚庯紝鑷姩鎵撳紑
+ warmup: {
+ clientFiles: ["./index.html", "./src/{views,components}/*"]
+ }
+ },
+ build: {
+ target: "esnext",
+ rollupOptions: {
+ output: {
+ manualChunks: {
+ echarts: ["echarts"]
+ }
+ }
+ }
+ }
+ }
+});
+export {
+ vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJEOlxcXFxHaXRcXFxcVGlnZXJDbG91ZHMtVGVjaFxcXFxCU1xcXFxUaWdlckFkbWluXzIwMjRcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIkQ6XFxcXEdpdFxcXFxUaWdlckNsb3Vkcy1UZWNoXFxcXEJTXFxcXFRpZ2VyQWRtaW5fMjAyNFxcXFx2aXRlLmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vRDovR2l0L1RpZ2VyQ2xvdWRzLVRlY2gvQlMvVGlnZXJBZG1pbl8yMDI0L3ZpdGUuY29uZmlnLnRzXCI7LypcbiAqIEBEZXNjcmlwdGlvbjogZmlsZSBjb250ZW50XG4gKiBAQXV0aG9yOiB5b3VyIG5hbWVcbiAqIEB2ZXJzaW9uOiBcbiAqIEBEYXRlOiAyMDI0LTA2LTE3IDE0OjUxOjI2XG4gKiBATGFzdEVkaXRvcnM6IEJlbiBMaW5cbiAqIEBMYXN0RWRpdFRpbWU6IDIwMjQtMDYtMTggMTg6MDY6MjlcbiAqL1xuaW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUFwcGxpY2F0aW9uQ29uZmlnKHtcbiAgb3ZlcnJpZGVzOiB7XG4gICAgb3B0aW1pemVEZXBzOiB7XG4gICAgICBlc2J1aWxkT3B0aW9uczoge1xuICAgICAgICB0YXJnZXQ6ICdlc25leHQnLFxuICAgICAgfSxcbiAgICAgIGluY2x1ZGU6IFtcbiAgICAgICAgJ2VjaGFydHMvY29yZScsXG4gICAgICAgICdlY2hhcnRzL2NoYXJ0cycsXG4gICAgICAgICdlY2hhcnRzL2NvbXBvbmVudHMnLFxuICAgICAgICAnZWNoYXJ0cy9yZW5kZXJlcnMnLFxuICAgICAgICAncXJjb2RlJyxcbiAgICAgICAgJ0BpY29uaWZ5L2ljb25pZnknLFxuICAgICAgICAnYW50LWRlc2lnbi12dWUvZXMvbG9jYWxlL3poX0NOJyxcbiAgICAgICAgJ2FudC1kZXNpZ24tdnVlL2VzL2xvY2FsZS9lbl9VUycsXG4gICAgICBdLFxuICAgIH0sXG4gICAgc2VydmVyOiB7XG4gICAgICBwb3J0OiAzMTAwLFxuICAgICAgcHJveHk6IHtcbiAgICAgICAgJy9iYXNpYy1hcGknOiB7XG4gICAgICAgICAgdGFyZ2V0OiAnaHR0cDovL2xvY2FsaG9zdDozMDAwJyxcbiAgICAgICAgICBjaGFuZ2VPcmlnaW46IHRydWUsXG4gICAgICAgICAgd3M6IHRydWUsXG4gICAgICAgICAgcmV3cml0ZTogKHBhdGgpID0+IHBhdGgucmVwbGFjZShuZXcgUmVnRXhwKGBeL2Jhc2ljLWFwaWApLCAnJyksXG4gICAgICAgICAgLy8gb25seSBodHRwc1xuICAgICAgICAgIC8vIHNlY3VyZTogZmFsc2VcbiAgICAgICAgfSxcbiAgICAgICAgJy91cGxvYWQnOiB7XG4gICAgICAgICAgdGFyZ2V0OiAnaHR0cDovL2xvY2FsaG9zdDozMzAwL3VwbG9hZCcsXG4gICAgICAgICAgY2hhbmdlT3JpZ2luOiB0cnVlLFxuICAgICAgICAgIHdzOiB0cnVlLFxuICAgICAgICAgIHJld3JpdGU6IChwYXRoKSA9PiBwYXRoLnJlcGxhY2UobmV3IFJlZ0V4cChgXi91cGxvYWRgKSwgJycpLFxuICAgICAgICB9LFxuICAgICAgfSxcbiAgICAgIG9wZW46IHRydWUsIC8vIFx1OTg3OVx1NzZFRVx1NTQyRlx1NTJBOFx1NTQwRVx1RkYwQ1x1ODFFQVx1NTJBOFx1NjI1M1x1NUYwMFxuICAgICAgd2FybXVwOiB7XG4gICAgICAgIGNsaWVudEZpbGVzOiBbJy4vaW5kZXguaHRtbCcsICcuL3NyYy97dmlld3MsY29tcG9uZW50c30vKiddLFxuICAgICAgfSxcbiAgICB9LFxuICAgIGJ1aWxkOiB7XG4gICAgICB0YXJnZXQ6ICdlc25leHQnLFxuICAgICAgcm9sbHVwT3B0aW9uczoge1xuICAgICAgICBvdXRwdXQ6IHtcbiAgICAgICAgICBtYW51YWxDaHVua3M6IHtcbiAgICAgICAgICAgIGVjaGFydHM6IFsnZWNoYXJ0cyddLFxuICAgICAgICAgIH0sXG4gICAgICAgIH0sXG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLCtCQUErQjtBQUV4QyxJQUFPLHNCQUFRLHdCQUF3QjtBQUFBLEVBQ3JDLFdBQVc7QUFBQSxJQUNULGNBQWM7QUFBQSxNQUNaLGdCQUFnQjtBQUFBLFFBQ2QsUUFBUTtBQUFBLE1BQ1Y7QUFBQSxNQUNBLFNBQVM7QUFBQSxRQUNQO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLE1BQ0Y7QUFBQSxJQUNGO0FBQUEsSUFDQSxRQUFRO0FBQUEsTUFDTixNQUFNO0FBQUEsTUFDTixPQUFPO0FBQUEsUUFDTCxjQUFjO0FBQUEsVUFDWixRQUFRO0FBQUEsVUFDUixjQUFjO0FBQUEsVUFDZCxJQUFJO0FBQUEsVUFDSixTQUFTLENBQUMsU0FBUyxLQUFLLFFBQVEsSUFBSSxPQUFPLGFBQWEsR0FBRyxFQUFFO0FBQUE7QUFBQTtBQUFBLFFBRy9EO0FBQUEsUUFDQSxXQUFXO0FBQUEsVUFDVCxRQUFRO0FBQUEsVUFDUixjQUFjO0FBQUEsVUFDZCxJQUFJO0FBQUEsVUFDSixTQUFTLENBQUMsU0FBUyxLQUFLLFFBQVEsSUFBSSxPQUFPLFVBQVUsR0FBRyxFQUFFO0FBQUEsUUFDNUQ7QUFBQSxNQUNGO0FBQUEsTUFDQSxNQUFNO0FBQUE7QUFBQSxNQUNOLFFBQVE7QUFBQSxRQUNOLGFBQWEsQ0FBQyxnQkFBZ0IsNEJBQTRCO0FBQUEsTUFDNUQ7QUFBQSxJQUNGO0FBQUEsSUFDQSxPQUFPO0FBQUEsTUFDTCxRQUFRO0FBQUEsTUFDUixlQUFlO0FBQUEsUUFDYixRQUFRO0FBQUEsVUFDTixjQUFjO0FBQUEsWUFDWixTQUFTLENBQUMsU0FBUztBQUFBLFVBQ3JCO0FBQUEsUUFDRjtBQUFBLE1BQ0Y7QUFBQSxJQUNGO0FBQUEsRUFDRjtBQUNGLENBQUM7IiwKICAibmFtZXMiOiBbXQp9Cg==
--
Gitblit v1.9.3