ui库合并版本完成

.gitignore

@@ -25,4 +25,4 @@ yarn-error.log*
 /oms/dist/
 /project/*/index.js
 /project/*/dist
-/ui/lib/
+/ui/package-lock.json

babel.config.js

@@ -2,6 +2,7 @@ module.exports = {
   presets: [
     '@vue/app',
   ],
+  sourceType: 'unambiguous',
   plugins: [
     // 可选链插件, 其他babel插件也是一样的安装方式
     "@babel/plugin-proposal-optional-chaining",

bin/ui.js

@@ -1,5 +0,0 @@
-const {copyFiles, chalkTag} = require("./tools");
-const start = () => {
-  copyFiles('lib', 'meta').then(() => chalkTag.done("转移成功!"))
-}
-start()

examples/main.js

@@ -6,7 +6,6 @@ import axios from './router/axios';
 import utils from './utils';
 import vcUI from 'dui';
 import 'dui/lib/styles/common.scss';
-import 'dui/lib/dui.css';
 import store from './store';
 import dataV from '@jiaminghi/data-view';
 import appComps from '../components'

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "lib": "npm unpublish --force&&npm publish",
-    "ui": "npm run build -w ui&&npm i dui@latest",
+    "ui": "npm run lib -w ui&&npm i dui@latest",
     "sync": "node bin/appsSync.js"
   },
   "workspaces": [

ui/.npmrc

@@ -0,0 +1,5 @@
+registry=http://cli.sinoecare.net/
+always-auth=true
+_auth="YWRtaW46YWRtaW4xMjM="
+email=aixianling@sinoecare.com
+package-lock=false

ui/lib/js/encryption.js

@@ -1,4 +1,4 @@
-import CryptoJs from  "../cdn/crypto-js";
+import CryptoJs from  "crypto-js";
 
 /**
  * 密码加密工具

ui/lib/js/regular.js

@@ -0,0 +1,15 @@
+export default {
+  phone: /^((0\d{2,3}-\d{7,8})|((13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}))$/,
+  password: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*,.?_-])[\da-zA-Z~!@#$%^&*,.?_-]{8,16}$/,
+  money: /^([1-9]\d*|0)(\.\d{1,2})?$/,
+  area: {
+    village: /^\d{9}[^0]0{0,2}$/,
+    town: /^\d{6}[^0]0{0,2}000$/,
+    country: /^\d{4}[^0]0?0{6}$/,
+    city: /^\d{2}[^0]0?0{8}$/,
+    province: /^[^0]0?0{10}$/,
+  },
+  zh: /^[\u4e00-\u9fa5]+$/,
+  email: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
+  ip: /((?:(?:25[0-5]|2[0-4]\\d|[01]?\\d?\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d?\\d))/
+}

ui/lib/js/utils.js

@@ -5,6 +5,7 @@ import $encryption from './encryption'
 import $coin from './coin'
 import Area from "./area"
 import ID from "./identity"
+import $reg from "./regular"
 
 /**
  * 生成子节点的递归方法
@@ -207,5 +208,8 @@ export default {
   $debounce,
   $checkJson,
   $arr2tree,
-  $load
+  $load,
+  $reg,
+  Area,
+  ID
 }

ui/meta/cdn/mode-ecb.js

@@ -1,7 +0,0 @@
-/*
-CryptoJS v3.1.2
-code.google.com/p/crypto-js
-(c) 2009-2013 by Jeff Mott. All rights reserved.
-code.google.com/p/crypto-js/wiki/License
-*/
-CryptoJS.mode.ECB = (function () { var a = CryptoJS.lib.BlockCipherMode.extend(); a.Encryptor = a.extend({ processBlock: function (a, b) { this._cipher.encryptBlock(a, b) } }); a.Decryptor = a.extend({ processBlock: function (a, b) { this._cipher.decryptBlock(a, b) } }); return a }())

ui/meta/cdn/pad-zeropadding.js

@@ -1,25 +0,0 @@
-/**
- * Zero padding strategy.
- */
-CryptoJS.pad.ZeroPadding = {
-  pad: function (data, blockSize) {
-    // Shortcut
-    var blockSizeBytes = blockSize * 4
-
-    // Pad
-    data.clamp()
-    data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes)
-  },
-
-  unpad: function (data) {
-    // Shortcut
-    var dataWords = data.words
-
-    // Unpad
-    var i = data.sigBytes - 1
-    while (!((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
-      i--
-    }
-    data.sigBytes = i + 1
-  }
-}

ui/package.json

@@ -4,19 +4,21 @@
   "private": false,
   "author": "kubbo",
   "scripts": {
-    "build": "node ../bin/ui.js&&vue-cli-service build --no-clean --target lib --dest lib packages/index.js",
+    "build": "vue-cli-service build --no-clean --target lib --dest lib packages/index.js",
-    "lib": "npm run build&&npm unpublish --force&&npm publish"
+    "lib": "npm unpublish --force&&npm publish"
   },
   "files": [
     "lib"
   ],
-  "main": "lib/dui.common.js",
+  "main": "packages/index.js",
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@ckeditor/ckeditor5-vue2": "^3.0.1",
     "@jiaminghi/data-view": "^2.10.0",
-    "axios": "^0.19.2",
+    "axios": "^1.2.0",
+    "crypto-js": "^4.1.1",
     "dayjs": "^1.8.35",
+    "dui": "^0.0.14",
     "echarts": "^5.1.2",
     "v-viewer": "^1.5.1",
     "vue-cropper": "^0.5.5",
@@ -27,25 +29,6 @@
     "element-ui": "^2.13.2",
     "vue": "^2.6.11"
   },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "rules": {},
-    "parserOptions": {
-      "parser": "babel-eslint"
-    }
-  },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
-  },
   "browserslist": [
     "> 1%",
     "last 2 versions",

ui/packages/basic/AiIcon.vue

@@ -9,9 +9,9 @@
 </template>
 
 <script>
-import "../../meta/styles/iconfont/iconfont";
+import "../../lib/styles/iconfont/iconfont";
-import "../../meta/styles/iconfont/iconfont.css";
+import "../../lib/styles/iconfont/iconfont.css";
-import "../../meta/styles/iconfont/logofont.css";
+import "../../lib/styles/iconfont/logofont.css";
 
 export default {
   name: "AiIcon",

ui/packages/basic/AiTable.vue

@@ -89,7 +89,7 @@
 
 <script>
 import moment from 'dayjs'
-import dict from "../../meta/js/dict"
+import dict from "../../lib/js/dict"
 
 let renderSlot = {
   functional: true,

ui/packages/common/AiArea.vue

@@ -37,8 +37,8 @@
 </template>
 <script>
 import AiHighlight from "../layout/AiHighlight";
-import instance from "../../meta/js/request";
+import instance from "../../lib/js/request";
-import Area from "../../meta/js/area";
+import Area from "../../lib/js/area";
 
 export default {
   name: 'AiArea',

ui/packages/common/AiEvaluation.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import instance from "../../meta/js/request";
+import instance from "../../lib/js/request";
 import AiCard from "../layout/AiCard";
 import AiWrapper from "../basic/AiWrapper";
 import AiInfoItem from "../basic/AiInfoItem";

ui/packages/common/AiId.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import tools from '../../meta/js/utils'
+import tools from '../../lib/js/utils'
 
 export default {
   name: "AiId",

ui/packages/common/AiPartyTree.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import request from "../../meta/js/request";
+import request from "../../lib/js/request";
 import AiEmpty from "../basic/AiEmpty";
 
 export default {

ui/packages/tools/AiProcess.vue

@@ -27,7 +27,7 @@
 
 <script>
 import AiFlow from "./AiFlow";
-import request from "../../meta/js/request";
+import request from "../../lib/js/request";
 import AiWrapper from "../basic/AiWrapper";
 import AiInfoItem from "../basic/AiInfoItem";
 import {mapState, mapActions} from "vuex"

vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
       filename: 'index.html'
     }
   },
-  transpileDependencies: [/node_modules[\\\/]dvcp-ui[\\\/]lib[\\\/]js/],
+  transpileDependencies: [/dui[\\\/]lib[\\\/]js/],
   chainWebpack: (config) => {
     config.module
     .rule('js')
@@ -25,7 +25,7 @@ module.exports = {
     .add(path.resolve(__dirname, 'components'))
     .add(path.resolve(__dirname, 'project'))
     .add(path.resolve(__dirname, 'examples'))
-    .add(path.resolve(__dirname, 'node_modules/dvcp-ui'))
+    .add(path.resolve(__dirname, 'ui'))
     .end()
     .use('babel')
     .loader('babel-loader')