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

# Conflicts:
#	package-lock.json

.gitignore

@@ -1,2 +1,5 @@
 node_modules
 /dist
+yarn.lock
+package-lock.json
+package-lock.json

.vscode/settings.json

@@ -3,12 +3,10 @@
       "files.exclude": {
             "**/node_modules": false,
             "**/build": true,
-            "**/package-lock.json": true
       },
       "search.exclude": {
             "**/node_modules": true,
             "**/build": true,
-            "**/package-lock.json": true
       },
       // 保存后自动修复格式  
       "editor.codeActionsOnSave": {

bat/install.sh

@@ -1,5 +1,2 @@
-set current_path="%~dp0"
-cd %current_path%
 cd ..
-npm install --registry http://wuzhixin.vip:4873
-pause
+npm install --registry http://wuzhixin.vip:4873

package.json

@@ -45,7 +45,8 @@
     "mini-css-extract-plugin": "^2.6.0",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.6",
-    "vue-loader": "^17.0.0",
+    "vue-loader": "^17.3.1",
+    "vue": "^3.5.4",
     "webpack": "^5.70.0",
     "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "^4.9.2",

src/api/system/UserMenuClickCountResource.js

@@ -7,34 +7,6 @@
  */
 export default {
 
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询用户常用的菜单 
-	 */
-  queryAutoMenus: function(){
-    var requestUrl = 'MenuResource/queryAutoMenus';
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiURL(requestUrl),
-        type: 'get',
-        contentType: 'application/x-www-form-urlencoded',
-        dataType: 'json',
-				
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
 
   /**
 	 * 工具类自动生成的方法

src/main.js

@@ -8,6 +8,7 @@ import { createApp, defineAsyncComponent } from 'vue';
 
 import Antd from 'ant-design-vue';
 // import 'ant-design-vue/dist/antd.css';
+import 'ant-design-vue/dist/reset.css';
 
 import './assets/common.css';
 import './assets/common1.css';
@@ -44,6 +45,12 @@ import langEnUs from './locales/en-US.json';
 import { Notify } from 'pc-component-v3/dist/pc-component-v3.js';
 window.Notify = Notify;
 
+
+
+import * as AntDesignIconsVue from '@ant-design/icons-vue';
+window.AntDesignIconsVue = AntDesignIconsVue;
+
+
 const i18n = createI18n({
   locale: 'zh-CN',
   messages: {

src/routes/main_routes.js

@@ -4,7 +4,7 @@ const Dashboard = () => import(/* webpackChunkName: "component-1" */ '../dashboa
 const Window = () => import(/* webpackChunkName: "component-2" */ '../window/Window.vue');
 
 const Window1 = () => import(/* webpackChunkName: "component-2" */ '../window1/Window.vue');
-const TabFormEdit1 = () => import(/* webpackChunkName: "component-4" */ '../window1/tabFormView/TabFormEdit.vue');
+const TabFormEdit1 = () => import(/* webpackChunkName: "component-4" */ '../window1/tabFormEdit/TabFormEdit.vue');
 const TabFormView1 = () => import(/* webpackChunkName: "component-5" */ '../window1/tabFormView/TabFormView.vue');
 
 

src/window1/tabFormView/FormFieldDef.vue → src/window1/tab-form-common/FormFieldDef.vue

@@ -43,7 +43,7 @@
 
 import Common from '../../common/Common.js';
 
-import TabFormView from './TabFormView.js';
+import TabFormView from '../tabFormView/TabFormView.js';
 import Language from '../../common/Language.js';
 
 

src/window1/tabFormView/TabFormEdit.vue → src/window1/tabFormEdit/TabFormEdit.vue

@@ -263,7 +263,7 @@ import Common from '../../common/Common.js';
 
 import WindowServerUtil from '../../resource/dictionary/WindowServerUtil.js';
 import WindowClientUtil from '../../resource/dictionary/WindowClientUtil.js';
-import TabFormView from './TabFormView.js';
+import TabFormView from '../tabFormView/TabFormView.js';
 import FieldUtil from '../../resource/dictionary/FieldUtil.js';
 
 import Context from '../common/Context.js';
@@ -275,7 +275,7 @@ import Language from '../../common/Language.js';
 import SubTabGridEdit from '../tabGridView/SubTabGridEdit.vue';
 import FieldEditView from './TabFormFieldEdit.vue';
 import TabButton from '../tabView/TabButton.vue';
-import FormFieldDef from './FormFieldDef.vue';
+import FormFieldDef from '../tab-form-common/FormFieldDef.vue';
 import AttachmentPanel from '../attachment/AttachmentPanel.vue';
 
 import AttributePanel from '../attribute/AttributePanel.vue';

src/window1/tabFormView/TabFormView.vue

@@ -357,7 +357,7 @@ import CurdWindowResource from '../../api/dic/CurdWindowResource.js';
 import SubTabGridEdit from '../tabGridView/SubTabGridEdit.vue';
 import TabFormFieldView from './TabFormFieldView.vue';
 import TabButton from '../tabView/TabButton.vue';
-import FormFieldDef from './FormFieldDef.vue';
+import FormFieldDef from '../tab-form-common/FormFieldDef.vue';
 import AttachmentPanel from '../attachment/AttachmentPanel.vue';
 
 import AttributeViewPanel from '../attribute/AttributeViewPanel.vue';